Merge pull request #685 from PathfinderHonorManager/develop

Moved reduntant items from PA to A

Author: brian-cummings

PathfinderHonorManager.Tests/Controllers/PathfinderAchievementsControllerTests.cs

@@ -49,8 +49,7 @@ public async Task GetPathfinderAchievements_WithValidData_ReturnsOkResult()
                     AchievementID = Guid.NewGuid(),
                     IsAchieved = true,
                     Level = 1,
-                    Grade = 5,
-                    Description = "Test Achievement"
+                    Grade = 5
                 }
             };
 
@@ -77,8 +76,7 @@ public async Task GetPathfinderAchievements_WithShowAllAchievementsTrue_ReturnsO
                     AchievementID = Guid.NewGuid(),
                     IsAchieved = true,
                     Level = 1,
-                    Grade = 5,
-                    Description = "Test Achievement"
+                    Grade = 5
                 }
             };
 
@@ -117,8 +115,7 @@ public async Task GetPathfinderAchievementById_WithValidIds_ReturnsOkResult()
                 AchievementID = achievementId,
                 IsAchieved = true,
                 Level = 1,
-                Grade = 5,
-                Description = "Test Achievement"
+                Grade = 5
             };
 
             _pathfinderAchievementServiceMock
@@ -164,8 +161,7 @@ public async Task PostAsync_WithValidData_ReturnsCreatedResult()
                 AchievementID = achievementId,
                 IsAchieved = false,
                 Level = 1,
-                Grade = 5,
-                Description = "Test Achievement"
+                Grade = 5
             };
 
             _pathfinderAchievementServiceMock
@@ -219,8 +215,7 @@ public async Task UpdatePathfinderAchievement_WithValidData_ReturnsOkResult()
                 AchievementID = achievementId,
                 IsAchieved = true,
                 Level = 1,
-                Grade = 5,
-                Description = "Test Achievement"
+                Grade = 5
             };
 
             _pathfinderAchievementServiceMock
@@ -266,8 +261,7 @@ public async Task GetAllAchievementsForPathfinder_WithValidId_ReturnsOkResult()
                     AchievementID = Guid.NewGuid(),
                     IsAchieved = true,
                     Level = 1,
-                    Grade = 5,
-                    Description = "Test Achievement 1"
+                    Grade = 5
                 },
                 new Outgoing.PathfinderAchievementDto
                 {
@@ -276,8 +270,7 @@ public async Task GetAllAchievementsForPathfinder_WithValidId_ReturnsOkResult()
                     AchievementID = Guid.NewGuid(),
                     IsAchieved = false,
                     Level = 2,
-                    Grade = 5,
-                    Description = "Test Achievement 2"
+                    Grade = 5
                 }
             };
 
@@ -305,8 +298,7 @@ public async Task GetAllAchievementsForPathfinder_WithShowAllAchievementsTrue_Re
                     AchievementID = Guid.NewGuid(),
                     IsAchieved = true,
                     Level = 1,
-                    Grade = 5,
-                    Description = "Test Achievement 1"
+                    Grade = 5
                 },
                 new Outgoing.PathfinderAchievementDto
                 {
@@ -315,8 +307,7 @@ public async Task GetAllAchievementsForPathfinder_WithShowAllAchievementsTrue_Re
                     AchievementID = Guid.NewGuid(),
                     IsAchieved = false,
                     Level = 2,
-                    Grade = 6,
-                    Description = "Test Achievement 2"
+                    Grade = 6
                 }
             };
 
@@ -363,8 +354,7 @@ public async Task AddAchievementsForGrade_WithValidData_ReturnsMultiStatus()
                     AchievementID = Guid.NewGuid(),
                     IsAchieved = false,
                     Level = 1,
-                    Grade = 5,
-                    Description = "Test Achievement"
+                    Grade = 5
                 }
             };
 

PathfinderHonorManager/Dto/Outgoing/PathfinderAchievementDto.cs

@@ -1,27 +1,25 @@
-using System;
-using Newtonsoft.Json;
-using PathfinderHonorManager.Converters;
-using System.Diagnostics.CodeAnalysis;
-
-namespace PathfinderHonorManager.Dto.Outgoing
-{
-    [ExcludeFromCodeCoverage]
-    public class PathfinderAchievementDto
-    {
-        public Guid PathfinderAchievementID { get; set; }
-        public Guid PathfinderID { get; set; }
-        public Guid AchievementID { get; set; }
-        public bool IsAchieved { get; set; }
-        public DateTime CreateTimestamp { get; set; }
-        [JsonConverter(typeof(NullableDateTimeConverter))]
-        public DateTime? AchieveTimestamp { get; set; }
-        public int Level { get; set; }
-        public string LevelName { get; set; }
-        public int AchievementSequenceOrder { get; set; }
-        public int Grade { get; set; }
-        public string ClassName { get; set; }
-        public string Description { get; set; }
-        public string CategoryName { get; set; }
-        public int CategorySequenceOrder { get; set; }
-    }
-}
+using System;
+using Newtonsoft.Json;
+using PathfinderHonorManager.Converters;
+using System.Diagnostics.CodeAnalysis;
+
+namespace PathfinderHonorManager.Dto.Outgoing
+{
+    [ExcludeFromCodeCoverage]
+    public class PathfinderAchievementDto
+    {
+        public Guid PathfinderAchievementID { get; set; }
+        public Guid PathfinderID { get; set; }
+        public Guid AchievementID { get; set; }
+        public bool IsAchieved { get; set; }
+        public DateTime CreateTimestamp { get; set; }
+        [JsonConverter(typeof(NullableDateTimeConverter))]
+        public DateTime? AchieveTimestamp { get; set; }
+        public int Level { get; set; }
+        public string LevelName { get; set; }
+        public int AchievementSequenceOrder { get; set; }
+        public int Grade { get; set; }
+        public string ClassName { get; set; }
+        public int CategorySequenceOrder { get; set; }
+    }
+}

PathfinderHonorManager/Mapping/AutoMapperConfig.cs

@@ -89,9 +89,8 @@ private void RegisterPathfinderAchievementMappings()
                 .ForMember(dest => dest.LevelName, opt => opt.MapFrom(src => Enum.GetName(typeof(LevelName), src.Achievement.Level)))
                 .ForMember(dest => dest.Grade, opt => opt.MapFrom(src => src.Achievement.Grade))
                 .ForMember(dest => dest.ClassName, opt => opt.MapFrom(src => src.Achievement.PathfinderClass.ClassName))
-                .IncludeMembers(src => src.Achievement)
-                .IncludeMembers(src => src.Achievement.PathfinderClass)
-                .IncludeMembers(src => src.Achievement.Category);
+                .ForMember(dest => dest.AchievementSequenceOrder, opt => opt.MapFrom(src => src.Achievement.AchievementSequenceOrder))
+                .ForMember(dest => dest.CategorySequenceOrder, opt => opt.MapFrom(src => src.Achievement.Category.CategorySequenceOrder));
             CreateMap<Category, Outgoing.PathfinderAchievementDto>();
             CreateMap<Outgoing.PathfinderAchievementDto, PathfinderAchievement>();
             CreateMap<Incoming.PostPathfinderAchievementDto, PathfinderAchievement>();