Переработать загрузку списка проектов, разрешить копировать закрытые проекты (#3374)

Author: leotsarev

src/JoinRpg.Blazor.Client/ApiClients/ProjectClient.cs

@@ -5,9 +5,9 @@ namespace JoinRpg.Blazor.Client.ApiClients;
 
 public class ProjectListClient(HttpClient httpClient) : IProjectListClient
 {
-    public async Task<ProjectDto[]> GetProjectsWithMyMasterAccess()
+    public async Task<ProjectDto[]> GetProjects(ProjectSelectionCriteria projectSelectionCriteria)
     {
-        return await httpClient.GetFromJsonAsync<ProjectDto[]>($"webapi/projects/GetProjectsWithMyMasterAccess") ?? throw new Exception("Couldn't get result from server");
+        return await httpClient.GetFromJsonAsync<ProjectDto[]>($"webapi/projects/GetProjects?criteria={projectSelectionCriteria}") ?? throw new Exception("Couldn't get result from server");
     }
 }
 

src/JoinRpg.Dal.Impl/Repositories/ProjectPredicates.cs

@@ -1,7 +1,10 @@
 using System.Linq.Expressions;
+using JoinRpg.Data.Interfaces;
+using JoinRpg.Data.Interfaces.Claims;
 using JoinRpg.DataModel;
 using JoinRpg.PrimitiveTypes;
 using JoinRpg.PrimitiveTypes.ProjectMetadata;
+using LinqKit;
 
 namespace JoinRpg.Dal.Impl.Repositories;
 
@@ -20,6 +23,36 @@ public static Expression<Func<Project, bool>> Status(ProjectLifecycleStatus stat
 
     public static Expression<Func<Project, bool>> Active() => project => project.Active;
 
-    public static Expression<Func<Project, bool>> MyProjectPredicate(UserIdentification userInfoId)
+    public static Expression<Func<Project, bool>> MasterAccess(UserIdentification userInfoId)
         => project => project.ProjectAcls.Any(projectAcl => projectAcl.UserId == userInfoId.Value);
+
+    public static Expression<Func<Project, bool>> HasActiveClaim(UserIdentification userInfoId)
+    {
+        var claimPredicate = ClaimPredicates.GetClaimStatusPredicate(ClaimStatusSpec.Active);
+        return project => project.Claims.Where(c => c.PlayerUserId == userInfoId.Value).Any(claimPredicate.Compile());
+    }
+
+    public static Expression<Func<Project, bool>> BySpecification(UserIdentification userInfoId, ProjectListSpecification projectListSpecification)
+    {
+        var predicate = PredicateBuilder.New<Project>();
+        if (!projectListSpecification.LoadArchived)
+        {
+            predicate = predicate.And(p => p.Active);
+        }
+
+        predicate = projectListSpecification.Criteria switch
+        {
+            ProjectListCriteria.MasterAccess => predicate.And(MasterAccess(userInfoId)),
+            ProjectListCriteria.MasterOrActiveClaim => predicate.And(PredicateBuilder.New<Project>().Or(HasActiveClaim(userInfoId)).Or(MasterAccess(userInfoId))),
+            ProjectListCriteria.ForCloning => predicate.And(ForCloning(userInfoId)),
+            ProjectListCriteria.HasSchedule => predicate.And(project => project.Details.ScheduleEnabled),
+            _ => throw new NotImplementedException(),
+        };
+        return predicate;
+    }
+
+    private static Expression<Func<Project, bool>> ForCloning(UserIdentification userInfoId)
+    {
+        return project => MasterAccess(userInfoId).Compile()(project);
+    }
 }

src/JoinRpg.Dal.Impl/Repositories/ProjectRepository.cs

@@ -59,13 +59,6 @@ public async Task<IReadOnlyCollection<ProjectWithClaimCount>> GetAllProjectsWith
     private IQueryable<Project> ActiveProjects => AllProjects.Where(project => project.Active);
     private IQueryable<Project> AllProjects => Ctx.ProjectsSet.Include(p => p.ProjectAcls);
 
-    public async Task<IEnumerable<Project>> GetMyActiveProjectsAsync(int userInfoId) => await
-      ActiveProjects.Where(ProjectPredicates.MyProjectPredicate(new(userInfoId))).ToListAsync();
-
-    public async Task<IEnumerable<Project>> GetActiveProjectsWithSchedule()
-        => await ActiveProjects.Where(project => project.Details.ScheduleEnabled)
-            .ToListAsync();
-
     public Task<Project> GetProjectAsync(int project) => AllProjects.SingleOrDefaultAsync(p => p.ProjectId == project);
 
     public Task<Project> GetProjectWithDetailsAsync(int project)
@@ -430,20 +423,19 @@ async Task<ProjectMastersListInfo> IProjectMetadataRepository.GetMastersList(Pro
 
         return new ProjectMastersListInfo(projectId, project.ProjectName, masters.ToArray());
     }
-
-    async Task<ProjectHeaderDto[]> IProjectRepository.GetMyProjects(UserIdentification userIdentification)
+    async Task<ProjectHeaderDto[]> IProjectRepository.GetProjectsBySpecification(UserIdentification userIdentification, ProjectListSpecification projectListSpecification)
     {
-        var predicate = ClaimPredicates.GetClaimStatusPredicate(ClaimStatusSpec.Active);
-        var query = from project in ActiveProjects.AsExpandable()
-                    let master = project.ProjectAcls.Any(a => a.UserId == userIdentification.Value)
-                    let claims = project.Claims.Where(c => c.PlayerUserId == userIdentification.Value).Any(predicate.Compile())
-                    where master || claims
+        var filterPredicate = ProjectPredicates.BySpecification(userIdentification, projectListSpecification);
+        var masterPredicate = ProjectPredicates.MasterAccess(userIdentification);
+        var claimPredicate = ProjectPredicates.HasActiveClaim(userIdentification);
+        var query = from project in AllProjects.AsExpandable()
+                    where filterPredicate.Compile()(project)
                     select new
                     {
                         project.ProjectId,
                         project.ProjectName,
-                        IAmMaster = master,
-                        HasActiveClaims = claims,
+                        IAmMaster = masterPredicate.Compile()(project),
+                        HasActiveClaims = claimPredicate.Compile()(project),
                     };
 
         var result = await query.ToListAsync();

src/JoinRpg.Data.Interfaces/IProjectRepository.cs

@@ -12,9 +12,6 @@ Task<IReadOnlyCollection<ProjectWithClaimCount>> GetArchivedProjectsWithClaimCou
 
     Task<IReadOnlyCollection<ProjectWithClaimCount>> GetAllProjectsWithClaimCount(int? userId);
 
-    Task<IEnumerable<Project>> GetMyActiveProjectsAsync(int userInfoId);
-
-    Task<IEnumerable<Project>> GetActiveProjectsWithSchedule();
     Task<Project> GetProjectAsync(int project);
     Task<Project> GetProjectWithDetailsAsync(int project);
     Task<Project?> GetProjectWithFieldsAsync(int project);
@@ -55,11 +52,21 @@ Task<ProjectFieldDropdownValue> GetFieldValue(ProjectFieldIdentification project
     /// <returns></returns>
     Task<IReadOnlyCollection<ProjectWithUpdateDateDto>> GetStaleProjects(DateTime inActiveSince);
 
-    Task<ProjectHeaderDto[]> GetMyProjects(UserIdentification userIdentification);
+    Task<ProjectHeaderDto[]> GetProjectsBySpecification(UserIdentification userIdentification, ProjectListSpecification projectListSpecification);
 
     Task<CharacterGroupHeaderDto[]> LoadDirectChildGroupHeaders(CharacterGroupIdentification characterGroupId);
 }
 
+public record ProjectListSpecification(ProjectListCriteria Criteria, bool LoadArchived)
+{
+    public static ProjectListSpecification MyActiveProjects { get; } = new ProjectListSpecification(ProjectListCriteria.MasterOrActiveClaim, LoadArchived: false);
+    public static ProjectListSpecification ForCloning { get; } = new ProjectListSpecification(ProjectListCriteria.ForCloning, LoadArchived: true);
+    public static ProjectListSpecification ActiveWithMyMasterAccess { get; } = new ProjectListSpecification(ProjectListCriteria.MasterAccess, LoadArchived: false);
+    public static ProjectListSpecification ActiveProjectsWithSchedule { get; } = new ProjectListSpecification(ProjectListCriteria.HasSchedule, LoadArchived: false);
+}
+
+public enum ProjectListCriteria { MasterAccess, MasterOrActiveClaim, ForCloning, HasSchedule };
+
 public record ProjectHeaderDto(ProjectIdentification ProjectId, string ProjectName, bool IAmMaster, bool HasActiveClaims) : ILinkableWithName
 {
     string ILinkableWithName.Name => ProjectName;

src/JoinRpg.Portal/Controllers/WebApi/ProjectListController.cs

@@ -8,5 +8,5 @@ namespace JoinRpg.Portal.Controllers.WebApi;
 public class ProjectListController(IProjectListClient client) : ControllerBase
 {
     [HttpGet]
-    public async Task<ProjectDto[]> GetProjectsWithMyMasterAccess() => await client.GetProjectsWithMyMasterAccess();
+    public async Task<ProjectDto[]> GetProjects(ProjectSelectionCriteria criteria) => await client.GetProjects(criteria);
 }

src/JoinRpg.Portal/Controllers/XGameApi/GlobalScheduleController.cs

@@ -1,20 +1,21 @@
 using JoinRpg.Data.Interfaces;
+using JoinRpg.Interfaces;
 using JoinRpg.XGameApi.Contract;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace JoinRpg.Portal.Controllers.XGameApi;
 
 [Route("x-game-api/schedule")]
-public class GlobalScheduleController(IProjectRepository projectRepository) : XGameApiController
+public class GlobalScheduleController(IProjectRepository projectRepository, ICurrentUserAccessor currentUserAccessor) : XGameApiController
 {
     /// <summary>
     /// All active projects with schedules
     /// </summary>
     [HttpGet, Authorize, Route("projects/active")]
     public async Task<IEnumerable<ProjectHeader>> GetActiveProjects()
     {
-        return (await projectRepository.GetActiveProjectsWithSchedule())
+        return (await projectRepository.GetProjectsBySpecification(currentUserAccessor.UserIdentification, ProjectListSpecification.ActiveProjectsWithSchedule))
             .Select(p => new ProjectHeader { ProjectId = p.ProjectId, ProjectName = p.ProjectName });
     }
 }

src/JoinRpg.Portal/Controllers/XGameApi/MyProfileController.cs

@@ -16,8 +16,7 @@ public class MyProfileController(IProjectRepository projectRepository, ICurrentU
     [HttpGet, Authorize, Route("projects/active")]
     public async Task<IEnumerable<ProjectHeader>> GetActiveProjects()
     {
-        var userId = currentUserAccessor.UserId;
-        return (await projectRepository.GetMyActiveProjectsAsync(userId)).Select(
+        return (await projectRepository.GetProjectsBySpecification(currentUserAccessor.UserIdentification, ProjectListSpecification.MyActiveProjects)).Select(
             p => new ProjectHeader { ProjectId = p.ProjectId, ProjectName = p.ProjectName });
     }
 }

src/JoinRpg.Portal/Menu/MainMenuViewComponent.cs

@@ -53,6 +53,6 @@ private async Task<ProjectHeaderDto[]> GetProjectLinks()
         {
             return [];
         }
-        return await projectRepository.GetMyProjects(currentUserAccessor.UserIdentification);
+        return await projectRepository.GetProjectsBySpecification(currentUserAccessor.UserIdentification, ProjectListSpecification.MyActiveProjects);
     }
 }

src/JoinRpg.Web.ProjectCommon/Projects/CreateProjectPanel.razor

@@ -48,7 +48,7 @@
                     <JoinAlert Variation="VariationStyleEnum.Info">Все настройки можно будет изменить после создания проекта.</JoinAlert>
                 </FormRowFor>
                 <FormRowFor For="@(() => Model.CopyFromProjectId)" hidden="@(Model.ProjectType != ProjectTypeViewModel.CopyFromAnother)">
-                    <ProjectSelector @bind-ProjectId="Model.CopyFromProjectId" />
+                    <ProjectSelector @bind-ProjectId="Model.CopyFromProjectId" Criteria="ProjectSelectionCriteria.ForCloning" />
                 </FormRowFor>
                 <FormRowFor For="@(() => Model.CopySettings)" hidden="@(Model.ProjectType != ProjectTypeViewModel.CopyFromAnother)">
                     <EnumRadioButtonGroup @bind-SelectedValue="Model.CopySettings" />

src/JoinRpg.Web.ProjectCommon/Projects/IProjectListClient.cs

@@ -1,5 +1,5 @@
 namespace JoinRpg.Web.ProjectCommon.Projects;
 public interface IProjectListClient
 {
-    Task<ProjectDto[]> GetProjectsWithMyMasterAccess();
+    Task<ProjectDto[]> GetProjects(ProjectSelectionCriteria projectSelectionCriteria);
 }