Merge pull request #332 from DFE-Digital/bugfix-122901-further-inform…

…ation-status-file-upload

Changed status calculation for further information to retrieve files …

Dfe.Academies.External.Web/Pages/Terms.cshtml

@@ -8,92 +8,92 @@
 	<h2 class="govuk-heading-l">All Users</h2>
 
 	<h3 class="govuk-heading-m">Using the Apply to become an Academy service</h3>
-	<p>
+	<p class="govuk-body">
 		Please read these Terms of Use (“General Terms”) carefully before using this service (the “Service”).
 	</p>
-	<p>
+	<p class="govuk-body">
 		This Service is maintained for your personal use and viewing. Access and use by you of this Service constitutes your acceptance of these General Terms.
 		This takes effect from the date on which you first use this website. If you do not agree to these terms, you must not use this website.
 	</p>
-	<p>
+	<p class="govuk-body">
 		If we change these General Terms we will post the revised document here with an updated effective date.
 		If we make significant changes to these terms, we may notify you by other means such as sending an email or posting a notice on our home page.
 	</p>
 
 	<h3 class="govuk-heading-m">Information About Us</h3>
-	<p>
+	<p class="govuk-body">
 		This Service is operated by the Department for Education (“we”, “our”, or “us”).
 		We are a central government department and have our registered office at Sanctuary Buildings, 20 Great Smith Street, London, SW1P 3BT.
 	</p>
-	<p>
+	<p class="govuk-body">
 		You can email us at:
 		<a href="mailto: [email protected]" class="govuk-link">regionalservices.rg@education.gov.uk</a>
 	</p>
 
 	<h3 class="govuk-heading-m">Access to the Service</h3>
-	<p>
+	<p class="govuk-body">
 		We shall not be liable if for any reason the Service is unavailable at any time or for any period.
 		From time to time, we may restrict access to all or some parts of the Service to users who have registered with us.
 	</p>
-	<p>
+	<p class="govuk-body">
 		If you choose, or are provided with, a user identification code, password or any other piece of information as part of our security procedures,
 		you must treat such information as confidential, and you must not disclose it to any third party.
 	</p>
-	<p>
+	<p class="govuk-body">
 		We reserve the right to restrict or deny you access to all or some part of the Service if in our opinion, you have failed to comply with these General Terms.
 	</p>
 
 	<h3 class="govuk-heading-m">Linking to the Service</h3>
-	<p>
+	<p class="govuk-body">
 		We do not object to you linking directly to the Service's home pages and you do not need to ask permission to do so.
 		However, we do not permit our pages to be loaded into frames on your site. The Service pages must be displayed in the user’s entire browser window.
 	</p>
 
 	<h3 class="govuk-heading-m">Third Party content and links from the Service</h3>
-	<p>
+	<p class="govuk-body">
 		Where the Service contains links to other sites and resources, we are not liable or responsible for the content or reliability of those
 		websites and resources and do not necessarily endorse the views expressed within them.
 	</p>
-	<p>
+	<p class="govuk-body">
 		We aim to replace broken links to other sites but cannot guarantee that these links will always work as we have no control over the availability of other sites.
 	</p>
 
 	<h3 class="govuk-heading-m">Virus protection</h3>
-	<p>
+	<p class="govuk-body">
 		We make every effort to check and test material at all stages of production.
 		It is always wise for you to run an anti-virus program on all material downloaded from the Internet as we do not guarantee our service will be secure or free from bugs or viruses.
 		We cannot accept any responsibility for any loss, disruption or damage to your data or your computer system which may occur whilst using material derived from this website.
 	</p>
-	<p>
+	<p class="govuk-body">
 		You must not misuse our service by knowingly introducing viruses, trojans, worms, logic bombs or other material that is malicious or technologically harmful.
 		You must not attempt to gain unauthorised access to our service, the server on which our service is stored or any server, computer or database connected to our service.
 		You must not attack our site via a denial-of-service attack or a distributed denial-of service attack. Each of these acts is a criminal offence.
 		We will report any such offence to the relevant law enforcement authorities and co-operate with them to determine your identity.
 	</p>
 
 	<h3 class="govuk-heading-m">Disclaimer and liability</h3>
-	<p>
+	<p class="govuk-body">
 		The content of this Service includes both content created by us (included but not limited to content that helps you use the Service) and third-party content. We do not:
 	</p>
 	<ul class="govuk-list govuk-list--bullet">
 		<li>endorse third-party content</li>
 		<li>vouch for its accuracy</li>
 		<li>guarantee that the views, instructions and/or assertions expressed in it are our own</li>
 	</ul>
-	<p>
+	<p class="govuk-body">
 		The content we create for the Service is not advice. You should verify any information on the Service yourself and use your own judgement before doing or
 		not doing anything on the basis of the content.
 	</p>
-	<p>
+	<p class="govuk-body">
 		Unless expressly stated in writing by us, the Service and material relating to government information, products and services (or to third party information, products and services),
 		is provided ‘as is’, without any representation or endorsement made and without warranty of any kind whether express or implied,
 		including but not limited to the implied warranties of satisfactory quality, fitness for a particular purpose, non-infringement, compatibility, security and accuracy.
 	</p>
-	<p>
+	<p class="govuk-body">
 		We do not warrant that the functions contained in the material contained in this site will be uninterrupted or error free, that defects will be corrected,
 		or that this site or the server that makes it available are free of viruses or represent the full functionality, accuracy, reliability of the materials.
 	</p>
-	<p>
+	<p class="govuk-body">
 		In no event will we be liable for:
 	</p>
 	<ul class="govuk-list govuk-list--bullet">
@@ -102,12 +102,12 @@
 	</ul>
 
 	<h3 class="govuk-heading-m">Validity of these General Terms</h3>
-	<p>
+	<p class="govuk-body">
 		If any of these terms and conditions are held to be invalid, unenforceable or illegal for any reason, the remaining terms and conditions will still apply.
 	</p>
 
 	<h3 class="govuk-heading-m">Applicable Law and jurisdiction</h3>
-	<p>
+	<p class="govuk-body">
 		These General Terms are governed by the laws of England and Wales. Any dispute arising under these General Terms will be subject to the exclusive jurisdiction of the courts of England and Wales.
 	</p>
 

Dfe.Academies.External.Web/Services/ConversionApplicationRetrievalService.cs

@@ -131,7 +131,7 @@ public async Task<List<ApplicationComponentViewModel>> GetSchoolApplicationCompo
 			List<ApplicationComponentViewModel> conversionApplicationComponents = new()
 			{
 			    new("About the conversion", UriFormatter.SetSchoolApplicationComponentUriFromName("About the conversion"), CalculateAboutTheConversionSectionStatus(school)),
-				new("Further information", UriFormatter.SetSchoolApplicationComponentUriFromName("Further information"), CalculateFurtherInformationSectionStatus(school)),
+				new("Further information", UriFormatter.SetSchoolApplicationComponentUriFromName("Further information"), CalculateFurtherInformationSectionStatus(school, application.ApplicationReference)),
 				new("Finances", UriFormatter.SetSchoolApplicationComponentUriFromName("Finances"), CalculateFinanceSectionStatus(school)),
 			    new("Future pupil numbers", UriFormatter.SetSchoolApplicationComponentUriFromName("Future pupil numbers"), CalculateFuturePupilNumbersSectionStatus(school)),
 				new("Land and buildings", UriFormatter.SetSchoolApplicationComponentUriFromName("Land and buildings"),CalculateLandAndBuildingsSectionStatus(school)),
@@ -332,16 +332,19 @@ private Status CalculateAboutTheConversionSectionStatus(SchoolApplyingToConvert?
 	/// </summary>
 	/// <param name="selectedSchool"></param>
 	/// <returns></returns>
-	private Status CalculateFurtherInformationSectionStatus(SchoolApplyingToConvert? selectedSchool)
+	private Status CalculateFurtherInformationSectionStatus(SchoolApplyingToConvert? selectedSchool, string applicationReference)
 	{
+		var dioceseFileNames = _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, selectedSchool.EntityId.ToString(),  applicationReference, FileUploadConstants.DioceseFilePrefixFieldName).Result ?? new();
+		var foundationConsentFileNames = _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, selectedSchool.EntityId.ToString(),  applicationReference, FileUploadConstants.FoundationConsentFilePrefixFieldName).Result ?? new();
+		var resolutionConsentFileNames = _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, selectedSchool.EntityId.ToString(),  applicationReference, FileUploadConstants.ResolutionConsentfilePrefixFieldName).Result ?? new();
 		if (!string.IsNullOrEmpty(selectedSchool?.TrustBenefitDetails) &&
-		    ((selectedSchool?.DioceseName == null) == (string.IsNullOrWhiteSpace(selectedSchool?.DioceseFolderIdentifier)) &&
-		     (selectedSchool?.FoundationTrustOrBodyName == null) == (string.IsNullOrWhiteSpace(selectedSchool?.FoundationConsentFolderIdentifier))) &&
-		    !string.IsNullOrWhiteSpace(selectedSchool?.ResolutionConsentFolderIdentifier))
+		    ((selectedSchool?.DioceseName == null) == (!dioceseFileNames.Any()) &&
+		     (selectedSchool?.FoundationTrustOrBodyName == null) == (!foundationConsentFileNames.Any())) &&
+		    resolutionConsentFileNames.Any())
 			return Status.Completed;
 
 		if (!string.IsNullOrEmpty(selectedSchool?.TrustBenefitDetails) ||
-		    !string.IsNullOrWhiteSpace(selectedSchool?.ResolutionConsentFolderIdentifier))
+		    resolutionConsentFileNames.Any())
 			return Status.InProgress;
 
 		return Status.NotStarted;