feat: achievements queries added

WotBlitzStatisticsPro.Logic/IWargamingAchievements.cs

@@ -0,0 +1,15 @@
+using System.Threading.Tasks;
+using WotBlitzStatisticsPro.Common.Model;
+
+namespace WotBlitzStatisticsPro.Logic
+{
+    public interface IWargamingAchievements
+    {
+        Task<AccountAchievementsResponse> GetAccountAchievements(RealmType realm, long accountId,
+            RequestLanguage requestLanguage);
+
+        Task<AccountAchievementsResponse> GetTankAchievements(RealmType realm, long accountId,
+            long tankId,
+            RequestLanguage requestLanguage);
+    }
+}

WotBlitzStatisticsPro.Logic/Mappers/AchievementDictionaryProfile.cs

@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using AutoMapper;
-using WotBlitzStatisticsPro.Common.Dictionaries;
-using WotBlitzStatisticsPro.DataAccess.Model;
-using WotBlitzStatisticsPro.WgApiClient.Model;
-
-namespace WotBlitzStatisticsPro.Logic.Mappers
-{
-    public class AchievementDictionaryProfile : Profile
-    {
-        public AchievementDictionaryProfile()
-        {
-            CreateMap<WotEncyclopediaAchievementsResponse, AchievementDictionary>()
-                .ForMember(d => d.Name, o => o.MapFrom(_ => new List<LocalizableString>()))
-                .ForMember(d => d.Condition, o => o.MapFrom(_ => new List<LocalizableString>()))
-                .ForMember(d => d.Description, o => o.MapFrom(_ => new List<LocalizableString>()))
-                .ForMember(d => d.HeroInfo, o => o.MapFrom(_ => new List<LocalizableString>()))
-                .ForMember(d => d.SectionId, o => o.MapFrom(s => s.Section))
-                .ForMember(d => d.Options, o => o.Ignore());
-
-        }
-    }
-}

WotBlitzStatisticsPro.Logic/Mappers/AchievementOptionProfile.cs

@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using AutoMapper;
-using WotBlitzStatisticsPro.Common.Dictionaries;
-using WotBlitzStatisticsPro.WgApiClient.Model;
-
-namespace WotBlitzStatisticsPro.Logic.Mappers
-{
-    public class AchievementOptionProfile : Profile
-    {
-        public AchievementOptionProfile()
-        {
-            CreateMap<WotEncyclopediaAchievementsOptions, AchievementOption>()
-                .ForMember(d => d.Name, o => o.MapFrom(_ => new List<LocalizableString>()))
-                .ForMember(d => d.Description, o => o.MapFrom(_ => new List<LocalizableString>()));
-        }
-    }
-}

WotBlitzStatisticsPro.Logic/Mappers/AchievementsProfile.cs

@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using System.Linq;
+using AutoMapper;
+using WotBlitzStatisticsPro.Common.Dictionaries;
+using WotBlitzStatisticsPro.Common.Model;
+using WotBlitzStatisticsPro.Common.Model.Achievements;
+using WotBlitzStatisticsPro.DataAccess.Model;
+using WotBlitzStatisticsPro.WgApiClient.Model;
+
+namespace WotBlitzStatisticsPro.Logic.Mappers
+{
+    public class AchievementsProfile: Profile
+    {
+        public AchievementsProfile()
+        {
+            CreateMap<WotEncyclopediaAchievementsOptions, AchievementOption>()
+                .ForMember(d => d.Name, o => o.MapFrom(_ => new List<LocalizableString>()))
+                .ForMember(d => d.Description, o => o.MapFrom(_ => new List<LocalizableString>()));
+
+
+            CreateMap<WotEncyclopediaAchievementsResponse, AchievementDictionary>()
+                .ForMember(d => d.Name, o => o.MapFrom(_ => new List<LocalizableString>()))
+                .ForMember(d => d.Condition, o => o.MapFrom(_ => new List<LocalizableString>()))
+                .ForMember(d => d.Description, o => o.MapFrom(_ => new List<LocalizableString>()))
+                .ForMember(d => d.HeroInfo, o => o.MapFrom(_ => new List<LocalizableString>()))
+                .ForMember(d => d.SectionId, o => o.MapFrom(s => s.Section))
+                .ForMember(d => d.Options, o => o.Ignore());
+
+            CreateMap<AchievementSectionDictionary, AchievementSection>()
+                .ForMember(s => s.SectionId,
+                    o => o.MapFrom(d => d.AchievementSectionId))
+                .ForMember(d => d.Name,
+                    o => o.MapFrom((src, dest, destMember, context) =>
+                        src.AchievementSectionNames
+                            .FirstOrDefault(l => l.Language == (RequestLanguage) context.Items["language"])?.Value));
+
+            CreateMap<KeyValuePair<string, int>, Achievement>()
+                .ForMember(d => d.Id, o => o.MapFrom(s => s.Key))
+                .ForMember(d => d.AchievementValue, o => o.MapFrom(s => s.Value));
+
+            CreateMap<AchievementDictionary, Achievement>()
+                .ForMember(d => d.Condition,
+                    o => o.MapFrom((src, dest, destMember, context) =>
+                        src.Condition
+                            .FirstOrDefault(l => l.Language == (RequestLanguage) context.Items["language"])?.Value))
+                .ForMember(d => d.Description,
+                    o => o.MapFrom((src, dest, destMember, context) =>
+                        src.Description
+                            .FirstOrDefault(l => l.Language == (RequestLanguage) context.Items["language"])?.Value))
+                .ForMember(d => d.Name,
+                    o => o.MapFrom((src, dest, destMember, context) =>
+                        src.Name
+                            .FirstOrDefault(l => l.Language == (RequestLanguage) context.Items["language"])?.Value))
+                .ForMember(d => d.Id, o => o.Ignore())
+                .ForMember(d => d.AchievementValue, o => o.Ignore())
+                .ForMember(d => d.MaxSeriesValue, s => s.Ignore())
+                ;
+        }
+    }
+}

WotBlitzStatisticsPro.Logic/Mappers/ClansProfile.cs

@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using AutoMapper;
-using WotBlitzStatisticsPro.Common.Dictionaries;
 using WotBlitzStatisticsPro.Common.Model;
-using WotBlitzStatisticsPro.DataAccess.Model;
 using WotBlitzStatisticsPro.WgApiClient.Model;
 using WotBlitzStatisticsPro.Logic.Calculations;
 
@@ -18,7 +15,7 @@ namespace WotBlitzStatisticsPro.Logic.Mappers
             CreateMap<ClanAccountInfo, ClanInfoResponse>()
                 .ForMember(d => d.JoinedAt,
                     o => o.MapFrom(s => s.JoinedAt.HasValue ? s.JoinedAt.Value.ToDateTime() : new DateTime(1970, 1, 1)))
-                .ForMember(d => d.Role, 
+                .ForMember(d => d.RoleLocalized, 
                     o => o.MapFrom((src, dest, destMember, context) =>
                     {
                         var dictionary = context.Items["roles"] as Dictionary<string, string>;

WotBlitzStatisticsPro.Logic/WargamingAchievements.cs

@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using AutoMapper;
+using Microsoft.Extensions.Logging;
+using WotBlitzStatisticsPro.Common.Model;
+using WotBlitzStatisticsPro.Common.Model.Achievements;
+using WotBlitzStatisticsPro.DataAccess;
+using WotBlitzStatisticsPro.DataAccess.Model;
+using WotBlitzStatisticsPro.WgApiClient;
+using WotBlitzStatisticsPro.WgApiClient.Model;
+
+namespace WotBlitzStatisticsPro.Logic
+{
+    public class WargamingAchievements: IWargamingAchievements
+    {
+        private readonly IDictionariesDataAccessor _dictionariesDataAccessor;
+        private readonly IWargamingAchievementsApiClient _wargamingAchievementsService;
+        private readonly IMapper _mapper;
+        private readonly ILogger<WargamingAchievements> _logger;
+
+        public WargamingAchievements(
+            IDictionariesDataAccessor dictionariesDataAccessor,
+            IWargamingAchievementsApiClient wargamingAchievementsService,
+            IMapper mapper,
+            ILogger<WargamingAchievements> logger)
+        {
+            _dictionariesDataAccessor = dictionariesDataAccessor;
+            _wargamingAchievementsService = wargamingAchievementsService;
+            _mapper = mapper;
+            _logger = logger;
+        }
+
+        public async Task<AccountAchievementsResponse> GetAccountAchievements(RealmType realm, long accountId, RequestLanguage requestLanguage)
+        {
+            try
+            {
+                // Get account achievements from WG API
+                var wgAchievements =
+                    await _wargamingAchievementsService.GetAccountAchievements(accountId, realm, requestLanguage);
+
+                return await FillAchievements(accountId, wgAchievements, requestLanguage);
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "GetAccountAchievements error");
+
+                throw;
+            }
+        }
+
+        public async Task<AccountAchievementsResponse> GetTankAchievements(RealmType realm, long accountId, long tankId, RequestLanguage requestLanguage)
+        {
+            try
+            {
+                // Get account achievements from WG API
+                var wgAchievements =
+                    await _wargamingAchievementsService.GetTankAchievements(accountId, tankId, realm, requestLanguage);
+
+                return await FillAchievements(accountId, wgAchievements, requestLanguage);
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "GetTankAchievements error");
+
+                throw;
+            }
+        }
+
+        private async Task<AccountAchievementsResponse> FillAchievements(long accountId, WotAccountAchievementResponse? wgAchievements,
+            RequestLanguage requestLanguage)
+        {
+            // Read achievement sections from DB
+            var sectionsDictionary = await _dictionariesDataAccessor.GetAchievementSections();
+            var sections =
+                _mapper.Map<List<AchievementSectionDictionary>, List<AchievementSection>>(sectionsDictionary,
+                    context => context.Items["language"] = requestLanguage);
+
+            var response = new AccountAchievementsResponse
+            {
+                AccountId = accountId,
+                AchievementSections = sections
+            };
+
+            if (wgAchievements?.Achievements == null)
+            {
+                return response;
+            }
+
+            // Map ID And value
+            var achievements = _mapper.Map<Dictionary<string, int>, List<Achievement>>(wgAchievements.Achievements);
+
+            // Add Max series
+            if (wgAchievements.MaxSeries != null)
+            {
+                foreach (var achievementsMaxSeries in wgAchievements.MaxSeries)
+                {
+                    if (achievementsMaxSeries.Value == 0)
+                    {
+                        continue;
+                    }
+                    var existing = achievements.FirstOrDefault(a => a.Id == achievementsMaxSeries.Key);
+                    if (existing == null)
+                    {
+                        achievements.Add(new Achievement
+                        { Id = achievementsMaxSeries.Key, MaxSeriesValue = achievementsMaxSeries.Value });
+                    }
+                    else
+                    {
+                        existing.MaxSeriesValue = achievementsMaxSeries.Value;
+                    }
+                }
+            }
+
+            // Read achievements dictionaries from DB
+            var achievementDictionaries =
+                await _dictionariesDataAccessor.GetAchievements(achievements.Select(a => a.Id).ToArray());
+
+            // Map achievements dictionaries
+            foreach (var achievement in achievements)
+            {
+                _mapper.Map(achievementDictionaries[achievement.Id], achievement,
+                    context => context.Items["language"] = requestLanguage);
+
+                // Map achievement option if exists
+                if (achievementDictionaries[achievement.Id].Options.Count > 0)
+                {
+                    if (achievement.AchievementValue < achievementDictionaries[achievement.Id].Options.Count)
+                    {
+                        achievement.Image = achievementDictionaries[achievement.Id]
+                            .Options[achievement.AchievementValue - 1].Image;
+                        achievement.ImageBig = achievementDictionaries[achievement.Id]
+                            .Options[achievement.AchievementValue - 1].ImageBig;
+                    }
+                }
+            }
+
+            // Sort achievements by sections
+            foreach (var section in response.AchievementSections)
+            {
+                section.Achievements = achievements.Where(a => a.SectionId == section.SectionId).ToList();
+            }
+
+            return response;
+        }
+    }
+}

WotBlitzStatisticsPro.Logic/WotBlitzStatisticsLogicInstaller.cs

@@ -26,10 +26,12 @@ namespace WotBlitzStatisticsPro.Logic
             services.AddHttpClient<IWargamingApiClient, WargamingApiClient>();
             services.AddHttpClient<IWargamingDictionariesApiClient, WargamingApiClient>();
             services.AddHttpClient<IWargamingTanksApiClient, WargamingApiClient>();
+            services.AddHttpClient<IWargamingAchievementsApiClient, WargamingAchievementsApiClient>();
             services.AddTransient<IWargamingSearch, WargamingSearch>();
             services.AddTransient<IWargamingDictionaries, WargamingDictionaries>();
             services.AddTransient<IWargamingAccounts, WargamingAccounts>();
             services.AddTransient<IWargamingClans, WargamingClans>();
+            services.AddTransient<IWargamingAchievements, WargamingAchievements>();
         }
 
         private static void ConfigureDictionariesFactory(IServiceCollection services)