Combine query

Author: pcatkins

src/ECER.Managers.Registry/ApplicationHandlers.cs

@@ -47,7 +47,6 @@ public class ApplicationHandlers(
     if (request.Application.Id == null)
     {
       // Check if a draft application already exists for the current user
-
       var applications = await applicationRepository.Query(new ApplicationQuery
       {
         ByApplicantId = request.Application.RegistrantId,
@@ -139,18 +138,12 @@ public async Task<ApplicationSubmissionResult> Handle(SubmitApplicationCommand r
   {
     ArgumentNullException.ThrowIfNull(request);
 
-    var draftApplications = await applicationRepository.Query(new ApplicationQuery
-    {
-      ById = request.applicationId,
-      ByApplicantId = request.userId,
-      ByStatus = [Resources.Documents.Applications.ApplicationStatus.Draft]
-    }, cancellationToken);
-
-    var submittedApplications = await applicationRepository.Query(new ApplicationQuery
+    var applications = await applicationRepository.Query(new ApplicationQuery
     {
       ByApplicantId = request.userId,
       ByStatus = new List<Resources.Documents.Applications.ApplicationStatus>
       {
+        Resources.Documents.Applications.ApplicationStatus.Draft,
         Resources.Documents.Applications.ApplicationStatus.Submitted,
         Resources.Documents.Applications.ApplicationStatus.Ready,
         Resources.Documents.Applications.ApplicationStatus.Escalated,
@@ -161,15 +154,14 @@ public async Task<ApplicationSubmissionResult> Handle(SubmitApplicationCommand r
       }
     }, cancellationToken);
 
-    var draftApplicationResults = new ApplicationsQueryResults(mapper.Map<IEnumerable<Contract.Applications.Application>>(draftApplications)!);
-    var submittedApplicationResults = new ApplicationsQueryResults(mapper.Map<IEnumerable<Contract.Applications.Application>>(submittedApplications)!);
+    var draftApplication = mapper.Map<Contract.Applications.Application>(applications.SingleOrDefault(dst =>
+      dst.Id == request.applicationId && dst.Status == Resources.Documents.Applications.ApplicationStatus.Draft));
+    var submittedApplications = mapper.Map<IEnumerable<Contract.Applications.Application>>(applications.Where(dst => dst.Status != Resources.Documents.Applications.ApplicationStatus.Draft));
 
-    if (!draftApplicationResults.Items.Any())
+    if (draftApplication == null)
     {
       return new ApplicationSubmissionResult() { Application = null, Error = SubmissionError.DraftApplicationNotFound, ValidationErrors = new List<string>() { "draft application does not exist" } };
     }
-    var draftApplication = draftApplicationResults.Items.First();
-
     var validationEngine = validationResolver?.Resolve(draftApplication.ApplicationType);
     var validationErrors = await validationEngine?.Validate(draftApplication)!;
     if (validationErrors.ValidationErrors.Any())
@@ -187,7 +179,7 @@ public async Task<ApplicationSubmissionResult> Handle(SubmitApplicationCommand r
       return new ApplicationSubmissionResult() { Application = null, Error = SubmissionError.DraftApplicationNotFound, ValidationErrors = new List<string>() { "draft application does not exist" } };
     }
 
-    if (submittedApplicationResults.Items.Any())
+    if (submittedApplications.Any())
     {
       return new ApplicationSubmissionResult() { Application = null, Error = SubmissionError.SubmittedApplicationAlreadyExists, ValidationErrors = new List<string>() { "submitted application already exists" } };
     }

src/ECER.Tests/Integration/RegistryApi/ApplicationTests.cs

@@ -338,7 +338,7 @@ await Host.Scenario(_ =>
 
     // Create and attempt to submit a second application for the same user
     var secondApplication = CreateDraftApplication();
-    firstApplication.Id = Fixture.draftTestApplicationId3;
+    secondApplication.Id = Fixture.draftTestApplicationId3;
 
 
     // Save second draft