Revize 3b734676

User filtration for Goal Definitions

src/Core/Domain/Leuze.Core.Domain/Repositories/IDomainUserRepository.cs

@@ -78 +78 @@
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        Task<List<UserShortDto>> GetAllMAUsersFromTL(Guid id);
+        Task<List<UserShortDto>> GetAllDirectUsersForTL(Guid id);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<List<UserShortDto>> GetAllUsersForTL(Guid id);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<UserShortDto> GetDtoByIdAsync(Guid id);
 
     }
 }

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

@@ -93 +93 @@
                 .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)
+        public async Task<List<UserShortDto>> GetAllDirectUsersForTL(Guid id)
             => 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"))
+                .Where(o => o.SeniorUserId.HasValue && o.SeniorUserId.Value == id && o.User.Roles.Any(a => a.NormalizedName == "MA" || a.NormalizedName == "TL"))
                 .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>> GetAllUsersForTL(Guid id)
+        {
+            HashSet<UserShortDto> result = new();
+            Stack<UserShortDto> todoList = new();
+
+            var user = await GetDtoByIdAsync(id);
+            if (user != null)
+            {
+                todoList.Push(user);
+
+                var current = todoList.Pop();
+                bool stackNotEmpty = true;
+                while (stackNotEmpty)
+                {
+                    if (!result.Contains(current))
+                    {
+                        result.Add(current);
+                        var tempList = await GetAllDirectUsersForTL(current.Id);
+                        foreach (var item in tempList)
+                        {
+                            if (item.RoleName == "MA")
+                            {
+                                result.Add(item);
+                            }
+                            else if (item.RoleName == "TL")
+                            {
+                                todoList.Push(item);
+                            }
+                        }
+                    }
+                    stackNotEmpty = todoList.TryPop(out current);
+                }
+            }
+            return result.ToList();
+        }
+
+        /// <inheritdoc/>
+        public async Task<UserShortDto> GetDtoByIdAsync(Guid id)
+        {
+            return await dbSet.Where(o => o.UserId == id)
+                .Include(o => o.SeniorUser).Include(o => o.User).ThenInclude(o => o.Roles)
+                .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))
+                .FirstOrDefaultAsync();
+            
+        }
     }
 }

src/Core/Infrastructure/Leuze.Core.Infrastructure.Persistence/Seeds/ApplicationSeed.cs

@@ -29 +29 @@
             var role2 = CreateRole("TL", false, roleManager, permissions);
             var role3 = CreateRole("MA", true, roleManager, permissions);
             CreateUser("Testovací admin", "[e-mail]", role1, context, userManager);
-            CreateUser("Testovací TL", "[e-mail]", role2, context, userManager);
-            CreateUser("Testovací MA", "[e-mail]", role3, context, userManager);
+            var silentUser = CreateUser("Pan Silent", "[e-mail]", role2, context, userManager);
+            var uzuUser = CreateUser("Jan Hošek", "[e-mail]", role2, context, userManager, silentUser);
+            var chloubicUser = CreateUser("Dominik Chlouba", "[e-mail]", role2, context, userManager, silentUser);
+            CreateUser("Tomáš Orlovský", "[e-mail]", role3, context, userManager, uzuUser);
+            CreateUser("Dominik Frolík", "[e-mail]", role3, context, userManager, chloubicUser);
         }
 
-        private static void CreateUser(string name, string email, ApplicationRole role, DbContext context, UserManager<ApplicationUser> userManager)
+        private static DomainUser CreateUser(string name, string email, ApplicationRole role, DbContext context, UserManager<ApplicationUser> userManager, DomainUser? senior = null)
         {
             ApplicationUser user = new(email, email, false);
             userManager.CreateAsync(user).Wait();
             userManager.AddPasswordAsync(user, "Test123*").Wait();
             userManager.AddToRoleAsync(user, role.Name).Wait();
             user = context.Set<ApplicationUser>().Single(o => o.Id == user.Id);
-            DomainUser domainUser = new(user, new(name), new(email), null!);
+            DomainUser domainUser = new(user, new(name), new(email), senior);
             context.Add(domainUser);
             context.SaveChanges();
+            return domainUser;
         }
 
         private static ApplicationRole CreateRole(string name, bool isDefault, RoleManager<ApplicationRole> roleManager, List<ApplicationPermission> permissions)

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

@@ -23 +23 @@
         public class Handler : IBaseRequestHandler<Query, Response>
         {
             private readonly IGoalDefinitionRepository _goalDefinitionRepo;
+            private readonly AuthenticationStateProvider _authenticationStateProvider;
+            private readonly IDomainUserRepository _domainUserRepo;
 
-            public Handler(IGoalDefinitionRepository goalDefinitionRepo)
+            public Handler(IDomainUserRepository domainUserRepo, AuthenticationStateProvider authStateProvider, IGoalDefinitionRepository goalDefinitionRepo)
             {
                 _goalDefinitionRepo = goalDefinitionRepo;
+                _domainUserRepo = domainUserRepo;
+                _authenticationStateProvider = authStateProvider;
             }
 
             public async Task<RequestResponse<Response>> Handle(Query request, CancellationToken cancellationToken)
             {
+                var state = await _authenticationStateProvider.GetAuthenticationStateAsync();
+                var id = Guid.Parse(state.User!.FindFirst(ClaimTypes.NameIdentifier)!.Value);
+                var userShortDto = await _domainUserRepo.GetDtoByIdAsync(id);
+
+                if(userShortDto == null)
+                {
+                    return RequestResponse<Response>.CreateErrorResponse($"Nelze načíst definice pro uživatele: {id}!");
+                }
+
                 var goalDefs = await _goalDefinitionRepo.GetAllForAreaAsync(request.areaId);
 
                 if (goalDefs == null)
@@ -38 +51 @@
                     return RequestResponse<Response>.CreateErrorResponse($"Nelze načíst definice pro oblast: {request.areaId}!");
                 }
 
+                if(userShortDto.RoleName != "Admin")
+                {
+                    var allMaUsers = await _domainUserRepo.GetAllUsersForTL(id);
+
+                    goalDefs = goalDefs.Where(o => allMaUsers.Exists(item => item.Id == o.OwnerId)).ToList();
+                }
+
                 return RequestResponse<Response>.CreateSuccessResponse(new(goalDefs));
             }
         }

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

@@ -38 +38 @@
             {
                 var state = await _authenticationStateProvider.GetAuthenticationStateAsync();
                 var id = Guid.Parse(state.User!.FindFirst(ClaimTypes.NameIdentifier)!.Value);
-                var user = await _domainUserRepo.GetByIdAsync(id);
+                var userShortDto = await _domainUserRepo.GetDtoByIdAsync(id);
 
-                //var goalDefs = await _goalDefinitionRepo.GetAllForAreaAsync(request.areaId);
-                var allUsers = await _domainUserRepo.GetAllNonAdminUsers();
-                //allUsers = allUsers.Where(o => o.) //Remove admins
+                if (userShortDto == null)
+                {
+                    return RequestResponse<Response>.CreateErrorResponse($"Nelze načíst definice pro uživatele: {id}!");
+                }
+
+                List<UserShortDto> allUsers = null;
+                if (userShortDto.RoleName != "Admin")
+                {
+                    allUsers = await _domainUserRepo.GetAllUsersForTL(id);
+                }
+                else
+                {
+                    allUsers = await _domainUserRepo.GetAllNonAdminUsers();
+                }
                 var areaDefs = await _goalDefinitionRepo.GetAllForAreaAsync(request.areaId);
                 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();
 

src/Modules/Goal/Infrastructure/Leuze.Modules.Goal.Infrastructure.Persistence/DependencyInjection.cs

@@ -56 +56 @@
                 var appSettings = serviceScope.ServiceProvider.GetRequiredService<IOptions<AppSettings>>().Value;
                 
                 //TODO: This is debug delet this
+                /*
                 var user = context.Set<DomainUser>().Where(item => item.EmailAddress.Email == "[e-mail]").FirstOrDefault();
                 GlobalDefinitionArea area = new GlobalDefinitionArea(user, DateTime.Now, DateTime.Now.AddDays(10));
                 context.Add(area);
                 GoalDefinition gd = new GoalDefinition(user, user, area, "Test Goal definition");
                 context.Add(gd);
-                context.SaveChanges();
+                context.SaveChanges();*/
             }
         }
     }