Changed the path that files are expected to be for schools

DFE-Digital · Mar 3, 2023 · 06e838c · 06e838c
1 parent d38853d
commit 06e838c
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 33 deletions.
diff --git a/Dfe.Academies.External.Web/Helpers/FileUploadConstants.cs b/Dfe.Academies.External.Web/Helpers/FileUploadConstants.cs
@@ -2,7 +2,8 @@
 
 public static class FileUploadConstants
 {
-	public const string TopLevelFolderName = "sip_application";
+	public const string TopLevelApplicationFolderName = "sip_application";
+	public const string TopLevelSchoolFolderName = "sip_applyingschools";
 	public const string DioceseFilePrefixFieldName = "sip_adschoolfaithschoolfile";
 	public const string FoundationConsentFilePrefixFieldName = "sip_adschoolsupportedfoundationfile";
 	public const string ResolutionConsentfilePrefixFieldName = "sip_adschoolgoverningbodyconsent";

diff --git a/Dfe.Academies.External.Web/Pages/School/AdditionalDetails.cshtml.cs b/Dfe.Academies.External.Web/Pages/School/AdditionalDetails.cshtml.cs
@@ -181,7 +181,7 @@ public bool HasError
 
 		public async Task<IActionResult> OnGetRemoveFileAsync(int appId, int urn, string entityId, string applicationReference, string section, string fileName)
 		{
-			await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelFolderName, entityId, applicationReference, section, fileName);
+			await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelSchoolFolderName, entityId, applicationReference, section, fileName);
 			return RedirectToPage("AdditionalDetails", new { Urn = urn, AppId = appId });
 		}
 		public override async Task<ActionResult> OnGetAsync(int urn, int appId)
@@ -201,11 +201,11 @@ public override async Task<ActionResult> OnGetAsync(int urn, int appId)
 			}
 			ApplicationReference = applicationDetails.ApplicationReference;
 			OfstedInspected = !string.IsNullOrWhiteSpace(OfstedInspectionDetails) ? SelectOption.Yes : SelectOption.No;
-			DioceseFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.DioceseFilePrefixFieldName);
+			DioceseFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.DioceseFilePrefixFieldName);
 			TempDataHelper.StoreSerialisedValue($"{EntityId}-dioceseFiles", TempData, DioceseFileNames);
-			FoundationConsentFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.FoundationConsentFilePrefixFieldName);
+			FoundationConsentFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.FoundationConsentFilePrefixFieldName);
 			TempDataHelper.StoreSerialisedValue($"{EntityId}-foundationConsentFiles", TempData, FoundationConsentFileNames);
-			ResolutionConsentFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.ResolutionConsentfilePrefixFieldName);
+			ResolutionConsentFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.ResolutionConsentfilePrefixFieldName);
 			TempDataHelper.StoreSerialisedValue($"{EntityId}-resolutionConsentFiles", TempData, ResolutionConsentFileNames);
 			return Page();
 		}
@@ -478,7 +478,7 @@ private async Task<bool> UploadFiles()
 			{
 				foreach (var file in DioceseFiles)
 				{
-					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, EntityId.ToString(),
+					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(),
 						ApplicationReference, FileUploadConstants.DioceseFilePrefixFieldName, file);
 				}
 			}
@@ -494,7 +494,7 @@ await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, Enti
 			{
 				foreach (var file in FoundationConsentFiles)
 				{
-					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, EntityId.ToString(),
+					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(),
 						ApplicationReference, FileUploadConstants.FoundationConsentFilePrefixFieldName, file);
 				}
 			}
@@ -509,7 +509,7 @@ await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, Enti
 			{
 				foreach (var file in ResolutionConsentFiles)
 				{
-					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, EntityId.ToString(),
+					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(),
 						ApplicationReference, FileUploadConstants.ResolutionConsentfilePrefixFieldName, file);
 				}
 			}

diff --git a/Dfe.Academies.External.Web/Pages/School/CurrentFinancialYear.cshtml.cs b/Dfe.Academies.External.Web/Pages/School/CurrentFinancialYear.cshtml.cs
@@ -147,8 +147,8 @@ public override async Task<ActionResult> OnGetAsync(int urn, int appId)
 		}
 		ApplicationType = applicationDetails.ApplicationType;
 		ApplicationReference = applicationDetails.ApplicationReference;
-		SchoolCFYRevenueStatusFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.SchoolCFYRevenueStatusFile);
-		SchoolCFYCapitalForwardFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.SchoolCFYCapitalForwardFile);
+		SchoolCFYRevenueStatusFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.SchoolCFYRevenueStatusFile);
+		SchoolCFYCapitalForwardFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.SchoolCFYCapitalForwardFile);
 
 		TempDataHelper.StoreSerialisedValue($"{EntityId}-SchoolCFYRevenueStatusFileNames", TempData, SchoolCFYRevenueStatusFileNames);
 		TempDataHelper.StoreSerialisedValue($"{EntityId}-SchoolCFYCapitalForwardFileNames", TempData, SchoolCFYCapitalForwardFileNames);
@@ -213,7 +213,7 @@ private async Task<bool> UploadFiles()
 		{
 			foreach (var file in SchoolCfyRevenueStatusFiles)
 			{
-				await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, EntityId.ToString(),
+				await _fileUploadService.UploadFile(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(),
 					ApplicationReference, FileUploadConstants.SchoolCFYRevenueStatusFile,
 					file);
 			}
@@ -229,7 +229,7 @@ await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, Enti
 		{
 			foreach (var file in SchoolCFYCapitalForwardFiles)
 			{
-				await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, EntityId.ToString(),
+				await _fileUploadService.UploadFile(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(),
 					ApplicationReference, FileUploadConstants.SchoolCFYCapitalForwardFile, file);
 			}
 		}
@@ -296,7 +296,7 @@ public override bool RunUiValidation()
 	}
 	public async Task<IActionResult> OnGetRemoveFileAsync(int appId, int urn, string entityId, string applicationReference, string section, string fileName)
 	{
-		await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelFolderName, entityId, applicationReference, section, fileName);
+		await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelSchoolFolderName, entityId, applicationReference, section, fileName);
 		return RedirectToPage("CurrentFinancialYear", new { Urn = urn, AppId = appId });
 	}
 

diff --git a/Dfe.Academies.External.Web/Pages/School/FurtherInformationSummary.cshtml.cs b/Dfe.Academies.External.Web/Pages/School/FurtherInformationSummary.cshtml.cs
@@ -122,7 +122,7 @@ private FurtherInformationSummaryViewModel PopulateFurtherInformation(SchoolAppl
 					selectedSchool.MainFeederSchools : QuestionAndAnswerConstants.NoInfoAnswer)
 			);
 
-			var fileNames = _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.ResolutionConsentfilePrefixFieldName).Result;
+			var fileNames = _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.ResolutionConsentfilePrefixFieldName).Result;
 
 
 			FISheading.Sections.Add(new(

diff --git a/Dfe.Academies.External.Web/Pages/School/NextFinancialYear.cshtml.cs b/Dfe.Academies.External.Web/Pages/School/NextFinancialYear.cshtml.cs
@@ -153,15 +153,15 @@ public override async Task<ActionResult> OnGetAsync(int urn, int appId)
 		ApplicationReference = applicationDetails.ApplicationReference;
 
 		ForecastedRevenueFileNames = await _fileUploadService.GetFiles(
-			FileUploadConstants.TopLevelFolderName,
+			FileUploadConstants.TopLevelSchoolFolderName,
 			EntityId.ToString(), 
 			ApplicationReference,
 			FileUploadConstants.NFYForecastedRevenueFilePrefixFieldName);
 
 		TempDataHelper.StoreSerialisedValue($"{EntityId}-NFYforecastedRevenueFiles", TempData, ForecastedRevenueFileNames);
 
 		ForecastedCapitalFileNames = await _fileUploadService.GetFiles(
-			FileUploadConstants.TopLevelFolderName,
+			FileUploadConstants.TopLevelSchoolFolderName,
 			EntityId.ToString(), 
 			ApplicationReference,
 			FileUploadConstants.NFYForecastedCapitalFilePrefixFieldName);
@@ -176,7 +176,7 @@ private async Task<bool> UploadFiles()
 		{
 			foreach (var file in ForecastedRevenueFiles)
 			{
-				await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, EntityId.ToString(),
+				await _fileUploadService.UploadFile(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(),
 					ApplicationReference, FileUploadConstants.NFYForecastedRevenueFilePrefixFieldName,
 					file);
 			}
@@ -192,7 +192,7 @@ await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, Enti
 		{
 			foreach (var file in ForecastedCapitalFiles)
 			{
-				await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, EntityId.ToString(),
+				await _fileUploadService.UploadFile(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(),
 					ApplicationReference, FileUploadConstants.NFYForecastedCapitalFilePrefixFieldName, file);
 			}
 		}
@@ -299,7 +299,7 @@ public override bool RunUiValidation()
 
     public async Task<IActionResult> OnGetRemoveFileAsync(int appId, int urn, string entityId, string applicationReference, string section, string fileName)
     {
-	    await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelFolderName, entityId, applicationReference, section, fileName);
+	    await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelSchoolFolderName, entityId, applicationReference, section, fileName);
 	    return RedirectToPage("NextFinancialYear", new {Urn = urn, AppId = appId});
     }
 

diff --git a/Dfe.Academies.External.Web/Pages/School/PreviousFinancialYear.cshtml.cs b/Dfe.Academies.External.Web/Pages/School/PreviousFinancialYear.cshtml.cs
@@ -135,7 +135,7 @@ public PreviousFinancialYearModel(IFileUploadService fileUploadService,
 
 		public async Task<IActionResult> OnGetRemoveFileAsync(int appId, int urn, string entityId, string applicationReference, string section, string fileName)
 		{
-			await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelFolderName, entityId, applicationReference, section, fileName);
+			await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelSchoolFolderName, entityId, applicationReference, section, fileName);
 			return RedirectToPage("PreviousFinancialYear", new { Urn = urn, AppId = appId });
 		}
 
@@ -156,8 +156,8 @@ public override async Task<ActionResult> OnGetAsync(int urn, int appId)
 				PopulateUiModel(selectedSchool);
 			}
 			ApplicationReference = applicationDetails?.ApplicationReference;
-			SchoolPFYRevenueStatusFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.SchoolPFYRevenueStatusFile);
-			SchoolPFYCapitalForwardStatusFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.SchoolPFYCapitalForwardStatusFile);
+			SchoolPFYRevenueStatusFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.SchoolPFYRevenueStatusFile);
+			SchoolPFYCapitalForwardStatusFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.SchoolPFYCapitalForwardStatusFile);
 
 			TempDataHelper.StoreSerialisedValue($"{appId}-SchoolPFYRevenueStatusFileNames", TempData, SchoolPFYRevenueStatusFileNames);
 			TempDataHelper.StoreSerialisedValue($"{appId}-SchoolPFYCapitalForwardStatusFileNames", TempData, SchoolPFYCapitalForwardStatusFileNames);
@@ -171,7 +171,7 @@ private async Task<bool> UploadFiles()
 			{
 				foreach (var file in SchoolPFYRevenueStatusFiles)
 				{
-					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, EntityId.ToString(),
+					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(),
 						ApplicationReference, FileUploadConstants.SchoolPFYRevenueStatusFile,
 						file);
 				}
@@ -187,7 +187,7 @@ await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, Enti
 			{
 				foreach (var file in SchoolPFYCapitalForwardStatusFiles)
 				{
-					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName, EntityId.ToString(),
+					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(),
 						ApplicationReference, FileUploadConstants.SchoolPFYCapitalForwardStatusFile, file);
 				}
 			}

diff --git a/...External.Web/Pages/Trust/FormAMat/ApplicationNewTrustGovernanceStructureDetails.cshtml.cs b/...External.Web/Pages/Trust/FormAMat/ApplicationNewTrustGovernanceStructureDetails.cshtml.cs
@@ -67,7 +67,7 @@ public override async Task<ActionResult> OnGetAsync(int appId)
 			if (applicationDetails?.ApplicationReference != null)
 			{
 				GovernanceStructureDetailsFileNames = await _fileUploadService.GetFiles(
-					FileUploadConstants.TopLevelFolderName, EntityId.ToString(), ApplicationReference,
+					FileUploadConstants.TopLevelApplicationFolderName, EntityId.ToString(), ApplicationReference,
 					FileUploadConstants.JoinAMatTrustGovernanceFilePrefixFieldName);
 				TempDataHelper.StoreSerialisedValue($"{EntityId}-governanceStructureDetailsFiles", TempData,
 					GovernanceStructureDetailsFileNames);
@@ -114,7 +114,7 @@ private async Task<bool> UploadFiles()
 			{
 				foreach (var file in GovernanceStructureDetailsFiles)
 				{
-					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName,
+					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelApplicationFolderName,
 						EntityId.ToString(), ApplicationReference,
 						FileUploadConstants.JoinAMatTrustGovernanceFilePrefixFieldName, file);
 				}
@@ -168,7 +168,7 @@ public override Dictionary<string, dynamic> PopulateUpdateDictionary()
 
 		public async Task<IActionResult> OnGetRemoveFileAsync(int appId, int urn, string entityId, string applicationReference, string section, string fileName)
 		{
-			await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelFolderName, entityId, applicationReference, section, fileName);
+			await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelApplicationFolderName, entityId, applicationReference, section, fileName);
 			return RedirectToPage("ApplicationNewTrustGovernanceStructureDetails", new { Urn = urn, AppId = appId });
 		}
 	}

diff --git a/...cademies.External.Web/Pages/Trust/FormAMat/ApplicationNewTrustGovernanceSummary.cshtml.cs b/...cademies.External.Web/Pages/Trust/FormAMat/ApplicationNewTrustGovernanceSummary.cshtml.cs
@@ -57,7 +57,7 @@ public override void PopulateUiModel(ConversionApplication? conversionApplicatio
 
 				try
 				{
-					result = _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, conversionApplication.EntityId.ToString(), conversionApplication.ApplicationReference, FileUploadConstants.JoinAMatTrustGovernanceFilePrefixFieldName).Result;
+					result = _fileUploadService.GetFiles(FileUploadConstants.TopLevelApplicationFolderName, conversionApplication.EntityId.ToString(), conversionApplication.ApplicationReference, FileUploadConstants.JoinAMatTrustGovernanceFilePrefixFieldName).Result;
 					files = result.Aggregate(string.Empty, (current, fileName) => current + (fileName + "\n"));
 				}
 				catch (Exception ex)

diff --git a/...ademies.External.Web/Pages/Trust/JoinAMat/ApplicationSchoolJoinAMatTrustSummary.cshtml.cs b/...ademies.External.Web/Pages/Trust/JoinAMat/ApplicationSchoolJoinAMatTrustSummary.cshtml.cs
@@ -75,7 +75,7 @@ ApplicationSchoolJoinAMatTrustSummaryHeadingViewModel headingChangeTrustDetails
 				List<string> trustConsentFileNames = new List<string>();
 				try
 				{
-					trustConsentFileNames = _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, conversionApplication.EntityId.ToString(), conversionApplication.ApplicationReference, FileUploadConstants.JoinAMatTrustConsentFilePrefixFieldName).Result;
+					trustConsentFileNames = _fileUploadService.GetFiles(FileUploadConstants.TopLevelApplicationFolderName, conversionApplication.EntityId.ToString(), conversionApplication.ApplicationReference, FileUploadConstants.JoinAMatTrustConsentFilePrefixFieldName).Result;
 				}
 				catch (Exception ex)
 				{

diff --git a/Dfe.Academies.External.Web/Pages/Trust/JoinAMat/ApplicationSchoolTrustConsent.cshtml.cs b/Dfe.Academies.External.Web/Pages/Trust/JoinAMat/ApplicationSchoolTrustConsent.cshtml.cs
@@ -84,7 +84,7 @@ public override bool RunUiValidation()
 		}
 		public async Task<IActionResult> OnGetRemoveFileAsync(int appId, int urn, string entityId, string applicationReference, string section, string fileName)
 		{
-			await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelFolderName, entityId, applicationReference, section, fileName);
+			await _fileUploadService.DeleteFile(FileUploadConstants.TopLevelApplicationFolderName, entityId, applicationReference, section, fileName);
 			return RedirectToPage("ApplicationSchoolTrustConsent", new {Urn = urn, AppId = appId});
 		}
 
@@ -115,7 +115,7 @@ public override async Task<ActionResult> OnGetAsync(int urn, int appId)
 
 			EntityId = applicationDetails.EntityId;
 			ApplicationReference = applicationDetails.ApplicationReference;
-			TrustConsentFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.JoinAMatTrustConsentFilePrefixFieldName);
+			TrustConsentFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelApplicationFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.JoinAMatTrustConsentFilePrefixFieldName);
 			TempDataHelper.StoreSerialisedValue($"{EntityId}-trustConsentFiles", TempData, TrustConsentFileNames);
 			return Page();
 		}
@@ -153,7 +153,7 @@ private async Task<bool> UploadFiles()
 			{
 				foreach (var file in TrustConsentFiles)
 				{
-					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelFolderName,
+					await _fileUploadService.UploadFile(FileUploadConstants.TopLevelApplicationFolderName,
 						EntityId.ToString(), ApplicationReference,
 						FileUploadConstants.JoinAMatTrustConsentFilePrefixFieldName, file);
 				}

diff --git a/Dfe.Academies.External.Web/Services/ConversionApplicationRetrievalService.cs b/Dfe.Academies.External.Web/Services/ConversionApplicationRetrievalService.cs
@@ -190,7 +190,7 @@ private Status CalculateGovernanceStructureSectionStatus(ConversionApplication a
 	{
 		try
 		{
-			var result = _fileUploadService.GetFiles(FileUploadConstants.TopLevelFolderName, application.EntityId.ToString(), application.ApplicationReference, FileUploadConstants.JoinAMatTrustGovernanceFilePrefixFieldName).Result;
+			var result = _fileUploadService.GetFiles(FileUploadConstants.TopLevelApplicationFolderName, application.EntityId.ToString(), application.ApplicationReference, FileUploadConstants.JoinAMatTrustGovernanceFilePrefixFieldName).Result;
 			return result.Any() ? Status.Completed : Status.NotStarted;
 		}
 		catch (Exception e)