Merge pull request #4748 from dfe-analytical-services/dev

Merge Dev into Master

.gitignore

@@ -91,3 +91,6 @@ src/GovUk.Education.ExploreEducationStatistics.Admin/appsettings.IdpBootstrapUse
 
 ## IdentityServer Developer Signing key
 **/*/tempkey.rsa
+
+## IDE Files (e.g. local Visual Studio configuration)
+*.csproj.user

.husky/pre-commit

@@ -1,4 +1,6 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-./node_modules/.bin/lint-staged
+if [ -d "./node_modules/.bin/lint-staged" ]; then
+    ./node_modules/.bin/lint-staged
+fi

package.json

@@ -48,7 +48,7 @@
   "scripts": {
     "prepare": "husky install",
     "preinstall": "pnpm check:node",
-    "clean": "pnpm -r --parallel exec rm -rf node_modules && rm -rf node_modules",
+    "clean": "pnpm -r --parallel exec rm -rf node_modules && rm -rf node_modules && rm -rf src/explore-education-statistics-frontend/.next",
     "check:node": "check-node-version --package",
     "fix": "pnpm fix:js && pnpm fix:style",
     "fix:js": "eslint --fix --ext .ts,.tsx,.js,.jsx .",

src/GovUk.Education.ExploreEducationStatistics.Admin.Tests/Controllers/Api/ReleasesControllerTests.cs

@@ -195,7 +195,7 @@ public async Task UpdateRelease_Returns_Ok()
             var releaseService = new Mock<IReleaseService>(Strict);
 
             releaseService
-                .Setup(s => s.UpdateRelease(
+                .Setup(s => s.UpdateReleaseVersion(
                     It.Is<Guid>(id => id.Equals(_releaseVersionId)),
                     It.IsAny<ReleaseUpdateRequest>())
                 )

src/GovUk.Education.ExploreEducationStatistics.Admin.Tests/Security/AuthorizationHandlers/PublicationReleaseSeriesAuthorizationHandlersTests.cs

@@ -0,0 +1,53 @@
+#nullable enable
+using System.Threading.Tasks;
+using GovUk.Education.ExploreEducationStatistics.Admin.Security.AuthorizationHandlers;
+using GovUk.Education.ExploreEducationStatistics.Admin.Services;
+using GovUk.Education.ExploreEducationStatistics.Admin.Services.Interfaces;
+using GovUk.Education.ExploreEducationStatistics.Content.Model;
+using GovUk.Education.ExploreEducationStatistics.Content.Model.Database;
+using Moq;
+using Xunit;
+using static GovUk.Education.ExploreEducationStatistics.Admin.Security.SecurityClaimTypes;
+using static GovUk.Education.ExploreEducationStatistics.Admin.Tests.Security.AuthorizationHandlers.Utils.
+    AuthorizationHandlersTestUtil;
+using static GovUk.Education.ExploreEducationStatistics.Admin.Tests.Security.AuthorizationHandlers.Utils.
+    PublicationAuthorizationHandlersTestUtil;
+using static GovUk.Education.ExploreEducationStatistics.Content.Model.PublicationRole;
+using static Moq.MockBehavior;
+using ReleaseVersionRepository = GovUk.Education.ExploreEducationStatistics.Content.Model.Repository.ReleaseVersionRepository;
+
+namespace GovUk.Education.ExploreEducationStatistics.Admin.Tests.Security.AuthorizationHandlers;
+
+// ReSharper disable once ClassNeverInstantiated.Global
+public class PublicationReleaseSeriesAuthorizationHandlersTests
+{
+    public class ManagePublicationReleaseSeriesAuthorizationHandlerTests
+    {
+        [Fact]
+        public async Task ManagePublicationReleaseSeries_Claims()
+        {
+            await AssertHandlerSucceedsWithCorrectClaims<Publication, ManagePublicationReleaseSeriesRequirement>(
+                CreateHandler,
+                new Publication(),
+                UpdateAllPublications
+            );
+        }
+
+        [Fact]
+        public async Task ManagePublicationReleaseSeries_PublicationRoles()
+        {
+            await AssertPublicationHandlerSucceedsWithPublicationRoles<ManagePublicationReleaseSeriesRequirement>(
+                CreateHandler, Owner);
+        }
+
+        private static ManagePublicationReleaseSeriesAuthorizationHandler CreateHandler(ContentDbContext contentDbContext)
+        {
+            return new ManagePublicationReleaseSeriesAuthorizationHandler(
+                new AuthorizationHandlerService(
+                    new ReleaseVersionRepository(contentDbContext),
+                    Mock.Of<IUserReleaseRoleRepository>(Strict),
+                    new UserPublicationRoleRepository(contentDbContext),
+                    Mock.Of<IPreReleaseService>(Strict)));
+        }
+    }
+}