feat: load owner degree name

CarlosPavajeau · Sep 21, 2021 · 3ba6422 · 3ba6422
1 parent b02b857
commit 3ba6422
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/src/Armory/Fireteams/Infrastructure/Persistence/MySqlFireteamsRepository.cs b/src/Armory/Fireteams/Infrastructure/Persistence/MySqlFireteamsRepository.cs
@@ -30,6 +30,8 @@ public async Task<Fireteam> Find(string code, bool noTracking)
 
             return await query
                 .Include(s => s.Owner)
+                .ThenInclude(o => o.Degree)
+                .ThenInclude(d => d.Rank)
                 .Include(s => s.Flight)
                 .FirstOrDefaultAsync(s => s.Code == code);
         }
@@ -50,6 +52,7 @@ public async Task<IEnumerable<Fireteam>> SearchAll(bool noTracking)
 
             return await query
                 .Include(s => s.Owner)
+                .ThenInclude(o => o.Degree)
                 .Include(s => s.Flight)
                 .ToListAsync();
         }

diff --git a/src/Armory/Flights/Infrastructure/Persistence/MySqlFlightsRepository.cs b/src/Armory/Flights/Infrastructure/Persistence/MySqlFlightsRepository.cs
@@ -29,6 +29,7 @@ public async Task<Flight> Find(string code, bool noTracking)
 
             return await query
                 .Include(s => s.Owner)
+                .ThenInclude(o => o.Degree)
                 .FirstOrDefaultAsync(s => s.Code == code);
         }
 
@@ -48,6 +49,7 @@ public async Task<IEnumerable<Flight>> SearchAll(bool noTracking)
 
             return await query
                 .Include(s => s.Owner)
+                .ThenInclude(o => o.Degree)
                 .ToListAsync();
         }
 

diff --git a/src/Armory/Shared/Infrastructure/AutoMapper/Profiles/Fireteams/FireteamsProfile.cs b/src/Armory/Shared/Infrastructure/AutoMapper/Profiles/Fireteams/FireteamsProfile.cs
@@ -14,7 +14,10 @@ public FireteamsProfile()
                     flightName =>
                         flightName.MapFrom(src => src.Flight == null ? string.Empty : src.Flight.Name))
                 .ForMember(s => s.OwnerName,
-                    ownerName => ownerName.MapFrom(src => src.Owner == null ? string.Empty : src.Owner.FullName));
+                    ownerName => ownerName.MapFrom(src =>
+                        src.Owner == null
+                            ? string.Empty
+                            : $"{src.Owner.FullName} - {src.Owner.Degree.Name}"));
             CreateMap<CreateFireteamCommand, Fireteam>();
         }
     }

diff --git a/src/Armory/Shared/Infrastructure/AutoMapper/Profiles/Flights/FlightsProfile.cs b/src/Armory/Shared/Infrastructure/AutoMapper/Profiles/Flights/FlightsProfile.cs
@@ -11,7 +11,8 @@ public FlightsProfile()
         {
             CreateMap<Flight, FlightResponse>()
                 .ForMember(s => s.OwnerName,
-                    ownerName => ownerName.MapFrom(src => src.Owner == null ? string.Empty : src.Owner.FullName));
+                    ownerName => ownerName.MapFrom(src =>
+                        src.Owner == null ? string.Empty : $"{src.Owner.FullName} - {src.Owner.Degree.Name}"));
             CreateMap<CreateFlightCommand, Flight>();
         }
     }

diff --git a/src/Armory/Shared/Infrastructure/AutoMapper/Profiles/Squads/SquadsProfile.cs b/src/Armory/Shared/Infrastructure/AutoMapper/Profiles/Squads/SquadsProfile.cs
@@ -12,7 +12,8 @@ public SquadsProfile()
             CreateMap<CreateSquadCommand, Squad>();
             CreateMap<Squad, SquadResponse>()
                 .ForMember(s => s.OwnerName,
-                    ownerName => ownerName.MapFrom(src => src.Owner == null ? string.Empty : src.Owner.FullName));
+                    ownerName => ownerName.MapFrom(src =>
+                        src.Owner == null ? string.Empty : $"{src.Owner.FullName} - {src.Owner.Degree.Name}"));
         }
     }
 }
diff --git a/src/Armory/Squads/Infrastructure/Persistence/MySqlSquadsRepository.cs b/src/Armory/Squads/Infrastructure/Persistence/MySqlSquadsRepository.cs
@@ -29,6 +29,7 @@ public async Task<Squad> Find(string code, bool noTracking)
 
             return await query
                 .Include(s => s.Owner)
+                .ThenInclude(o => o.Degree)
                 .FirstOrDefaultAsync(s => s.Code == code);
         }
 
@@ -47,6 +48,7 @@ public async Task<IEnumerable<Squad>> SearchAll()
             return await _context.Squads
                 .AsNoTracking()
                 .Include(s => s.Owner)
+                .ThenInclude(o => o.Degree)
                 .ToListAsync();
         }
     }