Проверять на уровне сервиса что нельзя менять сюжет в архивных проектах (#3371)

Author: leotsarev

src/JoinRpg.Portal/Views/Shared/Components/ProjectMenu/MasterMenu.cshtml

@@ -104,9 +104,12 @@
                         <li>@Html.ActionLink("Готовые", "Ready", "PlotList", new { Model.ProjectId }, null)</li>
                         <li>@Html.ActionLink("Одним списком", "FlatList", "PlotList", new { Model.ProjectId }, null)</li>
                         <li>@Html.ActionLink("Одним списком — доделать", "FlatListUnready", "PlotList", new { Model.ProjectId }, null)</li>
-                        <li>
-                            <a asp-controller="Plot" asp-action="CreateElement" asp-route-projectId="@Model.ProjectId"><i class="glyphicon glyphicon-plus"></i>Добавить вводную</a>
-                        </li>
+                        @if (Model.ProjectStatus != ProjectLifecycleStatus.Archived)
+                        {
+                            <li>
+                                <a asp-controller="Plot" asp-action="CreateElement" asp-route-projectId="@Model.ProjectId"><i class="glyphicon glyphicon-plus"></i>Добавить вводную</a>
+                            </li>
+                        }
                     </ul>
                 </li>
                 <li class="dropdown">

src/JoinRpg.Services.Impl/PlotServiceImpl.cs

@@ -1,5 +1,4 @@
 using System.Data.Entity;
-using System.Data.Entity.Validation;
 using JoinRpg.Data.Interfaces;
 using JoinRpg.Data.Write.Interfaces;
 using JoinRpg.DataModel;
@@ -24,7 +23,7 @@ public async Task<PlotFolderIdentification> CreatePlotFolder(ProjectIdentificati
         }
 
         var project = await UnitOfWork.GetDbSet<Project>().FindAsync(projectId.Value);
-        _ = project.RequestMasterAccess(CurrentUserId, acl => acl.CanManagePlots);
+        _ = project.RequestMasterAccess(CurrentUserId, acl => acl.CanManagePlots).EnsureProjectActive();
         var startTimeUtc = DateTime.UtcNow;
         var plotFolder = new PlotFolder
         {
@@ -64,7 +63,7 @@ public async Task EditPlotFolder(int projectId, int plotFolderId, string plotFol
     {
         var folder = await LoadProjectSubEntityAsync<PlotFolder>(projectId, plotFolderId);
 
-        _ = folder.RequestMasterAccess(CurrentUserId, acl => acl.CanManagePlots);
+        _ = folder.RequestMasterAccess(CurrentUserId, acl => acl.CanManagePlots).EnsureProjectActive();
 
         folder.TodoField = todoField;
         folder.IsActive = true; //Restore if deleted
@@ -81,7 +80,7 @@ public async Task<PlotVersionIdentification> CreatePlotElement(PlotFolderIdentif
     {
         var folder = await LoadProjectSubEntityAsync<PlotFolder>(plotFolderId);
 
-        _ = folder.RequestMasterAccess(CurrentUserId);
+        _ = folder.RequestMasterAccess(CurrentUserId).EnsureProjectActive();
 
         var now = DateTime.UtcNow;
         var characterGroups = await ProjectRepository.LoadGroups(targetGroups);
@@ -123,18 +122,15 @@ public async Task<PlotVersionIdentification> CreatePlotElement(PlotFolderIdentif
     public async Task DeleteFolder(int projectId, int plotFolderId)
     {
         var folder = await LoadProjectSubEntityAsync<PlotFolder>(projectId, plotFolderId);
-        if (!folder.HasMasterAccess(CurrentUserId, acl => acl.CanManagePlots))
-        {
-            throw new DbEntityValidationException();
-        }
-        var now = DateTime.UtcNow;
+        _ = folder.RequestMasterAccess(CurrentUserId, Permission.CanManagePlots).EnsureProjectActive();
+
         _ = SmartDelete(folder);
         foreach (var element in folder.Elements)
         {
             element.IsActive = false;
-            element.ModifiedDateTime = now;
+            element.ModifiedDateTime = Now;
         }
-        folder.ModifiedDateTime = now;
+        folder.ModifiedDateTime = Now;
         await UnitOfWork.SaveChangesAsync();
     }
 
@@ -150,14 +146,14 @@ public async Task DeleteElement(PlotElementIdentification plotElementId)
     private async Task<PlotElement> LoadElement(PlotElementIdentification plotElementId)
     {
         var folder = await LoadProjectSubEntityAsync<PlotFolder>(plotElementId.PlotFolderId);
-        _ = folder.RequestMasterAccess(CurrentUserId);
+        _ = folder.RequestMasterAccess(CurrentUserId).EnsureProjectActive();
         return folder.Elements.Single(e => e.PlotElementId == plotElementId.PlotElementId);
     }
 
     private async Task<PlotElement> LoadElementForManage(PlotElementIdentification plotElementId)
     {
         var folder = await LoadProjectSubEntityAsync<PlotFolder>(plotElementId.PlotFolderId);
-        _ = folder.RequestMasterAccess(CurrentUserId, Permission.CanManagePlots);
+        _ = folder.RequestMasterAccess(CurrentUserId, Permission.CanManagePlots).EnsureProjectActive();
         return folder.Elements.Single(e => e.PlotElementId == plotElementId.PlotElementId);
     }
 
@@ -228,7 +224,7 @@ public async Task EditPlotElementText(PlotElementIdentification plotelementid, s
     public async Task MoveElement(int projectId, int plotElementId, int parentCharacterId, int direction)
     {
         var character = await LoadProjectSubEntityAsync<Character>(projectId, parentCharacterId);
-        _ = character.RequestMasterAccess(CurrentUserId, acl => acl.CanEditRoles);
+        _ = character.RequestMasterAccess(CurrentUserId, acl => acl.CanEditRoles).EnsureProjectActive();
 
         var plots = await PlotRepository.GetPlotsForCharacter(character);
 
@@ -314,6 +310,8 @@ public async Task UnPublishElement(PlotElementIdentification plotElementId)
     public async Task ReorderPlots(PlotFolderIdentification plotFolderId, PlotFolderIdentification? afterPlotFolderId)
     {
         var targetFolder = await LoadProjectSubEntityAsync<PlotFolder>(plotFolderId);
+        _ = targetFolder.RequestMasterAccess(CurrentUserId, Permission.CanManagePlots).EnsureProjectActive();
+
         var afterFolder = afterPlotFolderId is not null ? await LoadProjectSubEntityAsync<PlotFolder>(afterPlotFolderId) : null;
 
         targetFolder.Project.Details.PlotFoldersOrdering
@@ -326,6 +324,8 @@ public async Task ReorderPlotElements(PlotElementIdentification plotElementId, P
     {
         var targetFolder = await LoadProjectSubEntityAsync<PlotFolder>(plotElementId.PlotFolderId);
 
+        _ = targetFolder.RequestMasterAccess(CurrentUserId, Permission.CanManagePlots).EnsureProjectActive();
+
         targetFolder.ElementsOrdering = DomainMoveHelper.MoveAfter(plotElementId,
             afterPlotElementId,
             targetFolder.ElementsOrdering,
@@ -337,8 +337,11 @@ public async Task ReorderPlotElements(PlotElementIdentification plotElementId, P
 
     public async Task ReorderPlotByChar(CharacterIdentification characterId, PlotElementIdentification targetId, PlotElementIdentification? afterId)
     {
+
         var character = await CharactersRepository.GetCharacterAsync(characterId);
 
+        _ = character.RequestMasterAccess(CurrentUserId, Permission.CanManagePlots).EnsureProjectActive();
+
         var plotTarget = ToTarget(character);
 
         var plots = await PlotRepository.GetPlotsBySpecification(new PlotSpecification(plotTarget, PlotVersionFilter.PublishedVersion, PlotElementType.RegularPlot));