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

Merge Dev into Master
dfe-analytical-services · Dec 19, 2024 · df9513a · df9513a
2 parents 645ca95 + f467ba9
commit df9513a
Show file tree

Hide file tree

Showing 70 changed files with 3,436 additions and 2,129 deletions.
diff --git a/...tion.ExploreEducationStatistics.Admin.Tests/Services/DataArchiveValidationServiceTests.cs b/...tion.ExploreEducationStatistics.Admin.Tests/Services/DataArchiveValidationServiceTests.cs
@@ -238,8 +238,8 @@ public async Task ValidateBulkDataArchiveFiles_IndexFileMissing_ReturnsValidatio
                     .AssertBadRequestWithValidationErrors([
                         new ErrorViewModel
                         {
-                            Code = ValidationMessages.BulkDataZipMustContainDatasetNamesCsv.Code,
-                            Message = ValidationMessages.BulkDataZipMustContainDatasetNamesCsv.Message,
+                            Code = ValidationMessages.BulkDataZipMustContainDataSetNamesCsv.Code,
+                            Message = ValidationMessages.BulkDataZipMustContainDataSetNamesCsv.Message,
                         }
                     ]);
             }
@@ -267,8 +267,8 @@ public async Task ValidateBulkDataArchiveFiles_IndexFileHasIncorrectHeaders_Retu
                     .AssertBadRequestWithValidationErrors([
                         new ErrorViewModel
                         {
-                            Code = ValidationMessages.DatasetNamesCsvIncorrectHeaders.Code,
-                            Message = ValidationMessages.DatasetNamesCsvIncorrectHeaders.Message,
+                            Code = ValidationMessages.DataSetNamesCsvIncorrectHeaders.Code,
+                            Message = ValidationMessages.DataSetNamesCsvIncorrectHeaders.Message,
                         },
                     ]);
             }
@@ -319,7 +319,7 @@ public async Task ValidateBulkDataArchiveFiles_DuplicateDataSetTitlesAndFileName
                     .AssertLeft()
                     .AssertBadRequestWithValidationErrors([
                         ValidationMessages.GenerateErrorDataSetTitleShouldBeUnique("Duplicate title"),
-                        ValidationMessages.GenerateErrorDatasetNamesCsvFilenamesShouldBeUnique("one"),
+                        ValidationMessages.GenerateErrorDataSetNamesCsvFilenamesShouldBeUnique("one"),
                     ]);
             }
         }
@@ -342,7 +342,7 @@ public async Task ValidateBulkDataArchiveFiles_Fail_DataSetNamesCsvFilesnamesSho
                 result
                     .AssertLeft()
                     .AssertBadRequestWithValidationErrors([
-                        ValidationMessages.GenerateErrorDatasetNamesCsvFilenamesShouldNotEndDotCsv("one.csv")
+                        ValidationMessages.GenerateErrorDataSetNamesCsvFilenamesShouldNotEndDotCsv("one.csv")
                     ]);
             }
         }

diff --git a/...EducationStatistics.Admin.Tests/Services/Methodologies/MethodologyApprovalServiceTests.cs b/...EducationStatistics.Admin.Tests/Services/Methodologies/MethodologyApprovalServiceTests.cs
@@ -681,9 +681,9 @@ public async Task UpdateApprovalStatus_ApprovingUsingImmediateStrategy()
 
             redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                 .ReturnsAsync(new RedirectsViewModel(
-                    Publications: [], 
-                    Methodologies: [], 
-                    Releases: []));
+                    PublicationRedirects: [],
+                    MethodologyRedirects: [],
+                    ReleaseRedirectsByPublicationSlug: []));
 
             await using (var context = InMemoryApplicationDbContext(contentDbContextId))
             {

diff --git a/....ExploreEducationStatistics.Admin.Tests/Services/Methodologies/MethodologyServiceTests.cs b/....ExploreEducationStatistics.Admin.Tests/Services/Methodologies/MethodologyServiceTests.cs
@@ -3600,9 +3600,9 @@ public async Task PublicationTitleOrSlugChanged()
                 var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var service = SetupMethodologyService(contentDbContext,
                     redirectsCacheService: redirectsCacheService.Object);
@@ -3662,9 +3662,9 @@ public async Task PublicationTitleOrSlugChanged_NoMethodologyRedirectAsMethodolo
                 var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var service = SetupMethodologyService(contentDbContext,
                     redirectsCacheService: redirectsCacheService.Object);
@@ -3745,9 +3745,9 @@ await contentDbContext.PublicationMethodologies.AddRangeAsync(
                 var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var service = SetupMethodologyService(contentDbContext,
                     redirectsCacheService: redirectsCacheService.Object);
@@ -3847,9 +3847,9 @@ public async Task PublicationTitleOrSlugChanged_MethodologySlugIsAlternativeSlug
                 var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var service = SetupMethodologyService(contentDbContext,
                     redirectsCacheService: redirectsCacheService.Object);
@@ -3917,9 +3917,9 @@ public async Task PublicationTitleOrSlugChanged_MethodologyIsLive()
                 var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var service = SetupMethodologyService(contentDbContext,
                     redirectsCacheService: redirectsCacheService.Object);
@@ -4004,9 +4004,9 @@ public async Task
                 var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var service = SetupMethodologyService(contentDbContext,
                     redirectsCacheService: redirectsCacheService.Object);
@@ -4110,9 +4110,9 @@ public async Task
                 var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var service = SetupMethodologyService(contentDbContext,
                     redirectsCacheService: redirectsCacheService.Object);

diff --git a/...ovUk.Education.ExploreEducationStatistics.Admin.Tests/Services/PublicationServiceTests.cs b/...ovUk.Education.ExploreEducationStatistics.Admin.Tests/Services/PublicationServiceTests.cs
@@ -1127,9 +1127,9 @@ public async Task UpdatePublication_AlreadyPublished()
 
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var publicationService = BuildPublicationService(context,
                     methodologyService: methodologyService.Object,
@@ -1272,9 +1272,9 @@ public async Task UpdatePublication_TitleChangesPublicationAndMethodologySlug()
 
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var publicationService = BuildPublicationService(context,
                     methodologyService: methodologyService.Object,
@@ -1579,9 +1579,9 @@ public async Task UpdatePublication_CreateRedirectIfLiveSlugChanged()
                 var redirectsCacheService = new Mock<IRedirectsCacheService>(Strict);
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var publicationService = BuildPublicationService(context,
                     methodologyService: methodologyService.Object,
@@ -1678,9 +1678,9 @@ public async Task UpdatePublication_ChangeBackToPreviousLiveSlug()
                 var redirectsCacheService = new Mock<IRedirectsCacheService>(Strict);
                 redirectsCacheService.Setup(mock => mock.UpdateRedirects())
                     .ReturnsAsync(new RedirectsViewModel(
-                        Publications: [],
-                        Methodologies: [],
-                        Releases: []));
+                        PublicationRedirects: [],
+                        MethodologyRedirects: [],
+                        ReleaseRedirectsByPublicationSlug: []));
 
                 var publicationService = BuildPublicationService(context,
                     methodologyService: methodologyService.Object,

diff --git a/...ducation.ExploreEducationStatistics.Admin/Controllers/Api/DataBlockQuerySizeController.cs b/...ducation.ExploreEducationStatistics.Admin/Controllers/Api/DataBlockQuerySizeController.cs
diff --git a/src/GovUk.Education.ExploreEducationStatistics.Admin/Controllers/Api/ReleasesController.cs b/src/GovUk.Education.ExploreEducationStatistics.Admin/Controllers/Api/ReleasesController.cs
@@ -107,7 +107,9 @@ public async Task<ActionResult<List<DataFileInfo>>> ReorderDataFiles(Guid releas
         [RequestFormLimits(ValueLengthLimit = int.MaxValue, MultipartBodyLengthLimit = int.MaxValue)]
         public async Task<ActionResult<DataFileInfo>> UploadDataSet(Guid releaseVersionId,
             [FromQuery(Name = "replacingFileId")] Guid? replacingFileId,
-            [FromQuery(Name = "title")] string title,
+            [FromQuery(Name = "title")]
+            [MaxLength(120)]
+            string title,
             IFormFile file,
             IFormFile metaFile)
         {
@@ -125,7 +127,9 @@ public async Task<ActionResult<DataFileInfo>> UploadDataSet(Guid releaseVersionI
         [RequestFormLimits(ValueLengthLimit = int.MaxValue, MultipartBodyLengthLimit = int.MaxValue)]
         public async Task<ActionResult<DataFileInfo>> UploadDataSetAsZip(Guid releaseVersionId,
             [FromQuery(Name = "replacingFileId")] Guid? replacingFileId,
-            [FromQuery(Name = "title")] string title,
+            [FromQuery(Name = "title")]
+            [MaxLength(120)]
+            string title,
             IFormFile zipFile)
         {
             return await _releaseDataFileService