From 804286245c96c184241d611d5f63775c422d60aa Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Tue, 23 Jan 2024 14:55:34 +0000
Subject: [PATCH] bugfix: download was not using local authority or advisory
 board date filters

---
 .../AcademyConversionProjectRepository.cs       | 17 +++++++++--------
 .../IAcademyConversionProjectRepository.cs      |  3 ++-
 .../Pages/ProjectList/Index.cshtml.cs           |  2 +-
 ...ademyConversionProjectItemsCacheDecorator.cs |  5 +++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/AcademyConversionProjectRepository.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/AcademyConversionProjectRepository.cs
index 678027f19..28764374a 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/AcademyConversionProjectRepository.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/AcademyConversionProjectRepository.cs
@@ -134,17 +134,18 @@ public async Task<ApiResponse<ProjectNote>> AddProjectNote(int id, AddProjectNot
          : new ApiResponse<ProjectNote>(response.StatusCode, null);
    }
    public async Task<ApiResponse<FileStreamResult>> DownloadProjectExport(
-     int page,
-     int count,
-     string titleFilter = "",
-     IEnumerable<string> statusFilters = default,
-     IEnumerable<string> deliveryOfficerFilter = default,
-     IEnumerable<string> regionsFilter = default,
-     IEnumerable<string> applicationReferences = default)
+      int page,
+      int count,
+      string titleFilter = "",
+      IEnumerable<string> statusFilters = default,
+      IEnumerable<string> deliveryOfficerFilter = default,
+      IEnumerable<string> regionsFilter = default,
+      IEnumerable<string> localAuthoritiesFilter = default,
+      IEnumerable<string> advisoryBoardDatesFilter = default)
    {
       AcademyConversionSearchModelV2 searchModel = new() { TitleFilter = titleFilter, Page = page, Count = count };
 
-      ProcessFiltersV2(statusFilters, deliveryOfficerFilter, searchModel, regionsFilter, applicationReferences);
+      ProcessFiltersV2(statusFilters, deliveryOfficerFilter, searchModel, regionsFilter, localAuthoritiesFilter, advisoryBoardDatesFilter);
 
       HttpResponseMessage response = await _apiClient.DownloadProjectExport(searchModel);
       if (!response.IsSuccessStatusCode)
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/IAcademyConversionProjectRepository.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/IAcademyConversionProjectRepository.cs
index aec6ab943..3c2971e03 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/IAcademyConversionProjectRepository.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Services/IAcademyConversionProjectRepository.cs
@@ -24,7 +24,8 @@ Task<ApiResponse<FileStreamResult>> DownloadProjectExport(
    IEnumerable<string> statusFilters = default,
    IEnumerable<string> deliveryOfficerFilter = default,
    IEnumerable<string> regionsFilter = default,
-   IEnumerable<string> applicationReferences = default
+   IEnumerable<string> localAuthoritiesFilter = default,
+   IEnumerable<string> advisoryBoardDatesFilter = default
 );
 
    Task<ApiResponse<ApiV2Wrapper<IEnumerable<AcademyConversionProject>>>> GetAllProjectsV2(
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml.cs
index 1058cd602..b2d98642b 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml.cs
@@ -57,7 +57,7 @@ public async Task OnGetAsync()
    public async Task<FileStreamResult> OnGetDownload()
    {
       Filters.PersistUsing(TempData).PopulateFrom(Request.Query);
-      ApiResponse<FileStreamResult> response = await _repository.DownloadProjectExport(CurrentPage, PageSize, Filters.Title, Filters.SelectedStatuses, Filters.SelectedOfficers, Filters.SelectedRegions);
+      ApiResponse<FileStreamResult> response = await _repository.DownloadProjectExport(CurrentPage, PageSize, Filters.Title, Filters.SelectedStatuses, Filters.SelectedOfficers, Filters.SelectedRegions, Filters.SelectedLocalAuthorities, Filters.SelectedAdvisoryBoardDates);
 
       if (response.Success)
       {
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/AcademyConversionProjectItemsCacheDecorator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/AcademyConversionProjectItemsCacheDecorator.cs
index 916d64f02..ce96a2631 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/AcademyConversionProjectItemsCacheDecorator.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/AcademyConversionProjectItemsCacheDecorator.cs
@@ -34,10 +34,11 @@ public async Task<ApiResponse<FileStreamResult>> DownloadProjectExport(
    IEnumerable<string> statusFilters = default,
    IEnumerable<string> deliveryOfficerFilter = default,
    IEnumerable<string> regionsFilter = default,
-   IEnumerable<string> applicationReferences = default
+   IEnumerable<string> localAuthoritiesFilter = default,
+   IEnumerable<string> advisoryBoardDatesFilter = default
 )
    {
-      return await _innerRepository.DownloadProjectExport(page, count, titleFilter, statusFilters, deliveryOfficerFilter, regionsFilter, applicationReferences);
+      return await _innerRepository.DownloadProjectExport(page, count, titleFilter, statusFilters, deliveryOfficerFilter, regionsFilter, localAuthoritiesFilter, advisoryBoardDatesFilter);
    }
    public async Task<ApiResponse<AcademyConversionProject>> GetProjectById(int id)
    {