Revize e951f8f9

Added senior name to DTO

src/Core/Domain/Leuze.Core.Domain/Domains/Users/DTOs/UserShortDto.cs

@@ -5 +5 @@
     /// <summary>
     /// 
     /// </summary>
-    public record UserShortDto(Guid Id, string Name, Guid? SeniorId, Guid RoleId, string RoleName);
+    public record UserShortDto(Guid Id, string Name, Guid? SeniorId, string SeniorName, Guid RoleId, string RoleName);
 }

src/Core/Infrastructure/Leuze.Core.Infrastructure.Persistence/Repository/DomainUserRepository.cs

@@ -73 +73 @@
         /// <inheritdoc/>
         public async Task<List<UserShortDto>> GetListAsync(string? limitForRole)
         {
-            var query = dbSet.Include(o => o.User).ThenInclude(o => o.Roles).AsQueryable();
+            var query = dbSet.Include(o => o.SeniorUser).Include(o => o.User).ThenInclude(o => o.Roles).AsQueryable();
 
             if (limitForRole is not null) query = query.Where(o => o.User.Roles.Any(a => a.NormalizedName == limitForRole.ToUpper()));
 
-            return await query.Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
+            return await query.Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.SeniorUser != null ? o.SeniorUser.Name.FullName : "", o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
         }
 
         /// <inheritdoc/>
         public async Task<List<UserShortDto>> GetAllNonAdminUsers()
-            => await dbSet.Include(o => o.User).ThenInclude(o => o.Roles)
+            => await dbSet.Include(o => o.SeniorUser).Include(o => o.User).ThenInclude(o => o.Roles)
                 .Where(o => o.User.Roles.Any(a => a.NormalizedName != "ADMIN"))
-                .Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
+                .Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.SeniorUser != null ? o.SeniorUser.Name.FullName : "", o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
 
         /// <inheritdoc/>
         public async Task<List<UserShortDto>> GetAllTLUsers()
-            => await dbSet.Include(o => o.User).ThenInclude(o => o.Roles)
+            => await dbSet.Include(o => o.SeniorUser).Include(o => o.User).ThenInclude(o => o.Roles)
                 .Where(o => o.User.Roles.Any(a => a.NormalizedName == "TL"))
-                .Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
+                .Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.SeniorUser != null ? o.SeniorUser.Name.FullName : "", o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
 
         /// <inheritdoc/>
         public async Task<List<UserShortDto>> GetAllMAUsersFromTL(Guid id)
-            => await dbSet.Include(o => o.User).ThenInclude(o => o.Roles)
+            => await dbSet.Include(o => o.SeniorUser).Include(o => o.User).ThenInclude(o => o.Roles)
                 .Where(o => o.SeniorUserId.HasValue && o.SeniorUserId.Value == id && o.User.Roles.Any(a => a.NormalizedName == "MA"))
-                .Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
+                .Select(o => new UserShortDto(o.UserId, o.Name.FullName, o.SeniorUserId, o.SeniorUser != null ? o.SeniorUser.Name.FullName : "", o.User.Roles.First().Id, o.User.Roles.First().Name)).ToListAsync();
     }
 }

src/Modules/Goal/Application/Leuze.Modules.Goal.Application/CQRS/GoalDefinitions/Queries/GetAllUnassignedInArea.cs

@@ -40 +40 @@
                 var id = Guid.Parse(state.User!.FindFirst(ClaimTypes.NameIdentifier)!.Value);
                 var user = await _domainUserRepo.GetByIdAsync(id);
 
-                //TODO: Change with list of TL and MA only
                 //var goalDefs = await _goalDefinitionRepo.GetAllForAreaAsync(request.areaId);
-                var allUsers = await _domainUserRepo.GetListAsync(id);
+                var allUsers = await _domainUserRepo.GetAllNonAdminUsers();
                 //allUsers = allUsers.Where(o => o.) //Remove admins
                 var areaDefs = await _goalDefinitionRepo.GetAllForAreaAsync(request.areaId);
-                var assignedList = areaDefs.Select(o => new UserShortDto(o.Owner.UserId, o.Owner.Name.FullName)).ToList();
+                var assignedList = areaDefs.Select(o => new UserShortDto(o.Owner.UserId, o.Owner.Name.FullName, o.Owner.SeniorUserId, o.Owner.SeniorUser?.Name.FullName ?? "", o.Owner.User.Roles.First().Id, o.Owner.User.Roles.First().Name)).ToList();
 
 
                 var unassignedUsers = allUsers.Except(assignedList).ToList();

src/Modules/Goal/Infrastructure/Leuze.Modules.Goal.Infrastructure.Persistence/Repositories/GoalDefinitionRepository.cs

@@ -42 +42 @@
 
         public async Task<List<GoalDefinition>> GetAllForAreaAsync(Guid areaId)
         {
-            return await dbSet.Include(item => item.Creator).Include(item => item.Owner).Where(item => item.GDAreaId == areaId).ToListAsync();
+            return await dbSet.Where(item => item.GDAreaId == areaId).Include(item => item.Creator).Include(item => item.Owner).ThenInclude(item => item.SeniorUser).Include(item => item.Owner.User.Roles).ToListAsync();
         }
 
         public async Task<List<GoalDefinition>> GetAllForUserAsync(Guid userId)