Nullable refernce types refactoring

This commit is contained in:
Mikhail Shabanov committed 2020-12-27 12:39:25 +01:00
1 parent e5c90e03d3
commit e12734981b
85 files changed
+509 -351

No files matched your search

@@ -11,7 +11,7 @@ namespace WotBlitzStatisticsPro.Logic.Mappers
CreateMap<WotAccountListResponse, AccountsSearchResponseItem>()
.ForMember(
d => d.AccountId,
o => o.MapFrom(s => s.AccountId.Value));
o => o.MapFrom(s => s.AccountId ?? -1));
}
}
}
@@ -11,7 +11,7 @@ namespace WotBlitzStatisticsPro.Logic.Mappers
CreateMap<WotClanListResponse, ClanSearchResponseItem>()
.ForMember(
d => d.ClanId,
o => o.MapFrom(s => s.ClanId.Value));
o => o.MapFrom(s => s.ClanId ?? -1));
}
}
@@ -12,11 +12,11 @@ namespace WotBlitzStatisticsPro.Logic.Mappers
.ForMember(d => d.LastBattleTime,
o => o.MapFrom(s => s.LastBattleTime.ToDateTime()))
.ForMember(d => d.AvgDamage,
o => o.MapFrom(s => s.Battles.HasValue && s.Battles > 0 ? ((decimal)s.DamageDealt / s.Battles) : 0m))
o => o.MapFrom(s => s.Battles.HasValue && s.DamageDealt.HasValue && s.Battles > 0 ? ((decimal)s.DamageDealt / s.Battles) : 0m))
.ForMember(d => d.AvgXp,
o => o.MapFrom(s => s.Battles.HasValue && s.Battles > 0 ? ((decimal)s.Xp / s.Battles) : 0m))
o => o.MapFrom(s => s.Battles.HasValue && s.Xp.HasValue && s.Battles > 0 ? ((decimal)s.Xp / s.Battles) : 0m))
.ForMember(d => d.WinRate,
o => o.MapFrom(s => s.Battles.HasValue && s.Battles > 0 ? (100 * (decimal)s.Wins / s.Battles) : 0m))
o => o.MapFrom(s => s.Battles.HasValue && s.Wins.HasValue && s.Battles > 0 ? (100 * (decimal)s.Wins / s.Battles) : 0m))
;
}
}
@@ -22,13 +22,13 @@ namespace WotBlitzStatisticsPro.Logic.Mappers
.ForMember(d => d.Tier,
o => o.MapFrom(s => s.Tier))
.ForMember(d => d.PreviewImage,
o => o.MapFrom(s => s.Images["preview"]))
o => o.MapFrom(s => s.Images == null ? string.Empty : s.Images["preview"]))
.ForMember(d => d.NormalImage,
o => o.MapFrom(s => s.Images["normal"]))
o => o.MapFrom(s => s.Images == null ? string.Empty : s.Images["normal"]))
.ForMember(d => d.PriceCredit,
o => o.MapFrom(s => s.Cost["price_credit"]))
o => o.MapFrom(s => s.Cost == null ? string.Empty : s.Cost["price_credit"]))
.ForMember(d => d.PriceGold,
o => o.MapFrom(s => s.Cost["price_gold"]))
o => o.MapFrom(s => s.Cost == null ? string.Empty : s.Cost["price_gold"]))
.ForMember(d => d.NexTanksInTree,
o =>
o.MapFrom(s => s.NextTanks))