Update QueryTests.cs

* fix broken integration tests

Author: edward-miller-lcg

DotNet/ServiceTests/IntegrationTests/Census/QueryTests.cs

@@ -7,6 +7,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.EntityFrameworkCore;
 using Task = System.Threading.Tasks.Task;
+using LantanaGroup.Link.Census.Application.Factories;
 
 namespace IntegrationTests.Census;
 
@@ -212,9 +213,12 @@ public async Task GetPatientEncounterByCorrelationIdAsync_ReturnsCorrectEncounte
         var facilityId = "TestFacility" + Guid.NewGuid().ToString();
         var patientId = Guid.NewGuid().ToString();
 
+        var encounterId = Guid.NewGuid().ToString();
+        var patientIdentifierId = Guid.NewGuid().ToString();
+
         var encounter = new PatientEncounter
         {
-            Id = Guid.NewGuid().ToString(),
+            Id = encounterId,
             FacilityId = facilityId,
             CorrelationId = correlationId,
             AdmitDate = DateTime.UtcNow.AddDays(-5),
@@ -223,9 +227,10 @@ public async Task GetPatientEncounterByCorrelationIdAsync_ReturnsCorrectEncounte
             {
                 new PatientIdentifier
                 {
-                    Id = Guid.NewGuid().ToString(),
+                    Id = patientIdentifierId,
                     Identifier = patientId,
-                    SourceType = SourceType.FHIR.ToString()
+                    SourceType = SourceType.FHIR.ToString(),
+                    PatientEncounterId = encounterId
                 }
             }
         };
@@ -269,7 +274,7 @@ public async Task GetAdmittedPatientEventModelsByDateRange_ReturnsCorrectEvents(
     {
         // Arrange
         var db = _fixture.DbContext;
-        var queries = _fixture.ServiceProvider.GetRequiredService<IPatientEventQueries>();
+        var queries = _fixture.ServiceProvider.GetRequiredService<IPatientEncounterQueries>();
 
         var facilityId = "TestFacility" + Guid.NewGuid().ToString();
         var patientId1 = Guid.NewGuid().ToString();
@@ -281,12 +286,17 @@ public async Task GetAdmittedPatientEventModelsByDateRange_ReturnsCorrectEvents(
 
         // Create the events and their payloads
         var events = new List<PatientEvent>();
+        var encounters = new List<PatientEncounter>();
         // Within date range, admit event, patient 1
         var admitCorrelationId1 = Guid.NewGuid().ToString();
         var patient1AdmitPayload = new FHIRListAdmitPayload(patientId1, DateTime.UtcNow.AddDays(-3));
         var patient1AdmitEvent = patient1AdmitPayload.CreatePatientEvent(facilityId, admitCorrelationId1);
+        var patient1Encounter = new PatientEncounterBuilder(facilityId,null,patient1AdmitEvent.EventDate, null, admitCorrelationId1).AddPatientIdentifier(patientId1, SourceType.FHIR).GetPatientEncounter();
         events.Add(patient1AdmitEvent);
 
+        patient1Encounter.PatientIdentifiers.FirstOrDefault().Id = Guid.NewGuid().ToString();
+        db.PatientEncounters.Add(patient1Encounter);
+
         // Within date range, discharge event, patient 1 (latest for patient 1)
         //var dischargeCorrelationId1 = Guid.NewGuid().ToString();
         //var patient1DischargePayload = new FHIRListDischargePayload(patientId1, DateTime.UtcNow.AddDays(-1));
@@ -297,28 +307,40 @@ public async Task GetAdmittedPatientEventModelsByDateRange_ReturnsCorrectEvents(
         var admitCorrelationId2 = Guid.NewGuid().ToString();
         var patient2AdmitPayload = new FHIRListAdmitPayload(patientId2, DateTime.UtcNow.AddDays(-2));
         var patient2AdmitEvent = patient2AdmitPayload.CreatePatientEvent(facilityId, admitCorrelationId2);
+        var patient2Encounter = new PatientEncounterBuilder(facilityId, null, patient2AdmitEvent.EventDate, null, admitCorrelationId2).AddPatientIdentifier(patientId2, SourceType.FHIR).GetPatientEncounter();
         events.Add(patient2AdmitEvent);
 
+        patient2Encounter.PatientIdentifiers.FirstOrDefault().Id = Guid.NewGuid().ToString();
+        db.PatientEncounters.Add(patient2Encounter);
+
         // Outside date range, admit event
         var outsidePatientId = Guid.NewGuid().ToString();
         var outsideCorrelationId = Guid.NewGuid().ToString();
-        var outsideAdmitPayload = new FHIRListAdmitPayload(outsidePatientId, DateTime.UtcNow.AddDays(-10));
+        var outsideAdmitPayload = new FHIRListAdmitPayload(outsidePatientId, DateTime.UtcNow.AddDays(1));
         var outsideAdmitEvent = outsideAdmitPayload.CreatePatientEvent(facilityId, outsideCorrelationId);
+        var outsideEncounter = new PatientEncounterBuilder(facilityId, null, outsideAdmitEvent.EventDate, null, outsideCorrelationId).AddPatientIdentifier(outsidePatientId, SourceType.FHIR).GetPatientEncounter();
         events.Add(outsideAdmitEvent);
 
+        outsideEncounter.PatientIdentifiers.FirstOrDefault().Id = Guid.NewGuid().ToString();
+        db.PatientEncounters.Add(outsideEncounter);
+
         // Different facility, within date range
         var otherFacilityPatientId = Guid.NewGuid().ToString();
         var otherFacilityCorrelationId = Guid.NewGuid().ToString();
         var otherFacilityPayload = new FHIRListAdmitPayload(otherFacilityPatientId, DateTime.UtcNow.AddDays(-3));
         var otherFacilityEvent = otherFacilityPayload.CreatePatientEvent("OtherFacility", otherFacilityCorrelationId);
+        var otherFacilityEncounter = new PatientEncounterBuilder("OtherFacility", null, otherFacilityEvent.EventDate, null, otherFacilityCorrelationId).AddPatientIdentifier(otherFacilityPatientId, SourceType.FHIR).GetPatientEncounter();
         events.Add(otherFacilityEvent);
 
+        otherFacilityEncounter.PatientIdentifiers.FirstOrDefault().Id = Guid.NewGuid().ToString();
+        db.PatientEncounters.Add(otherFacilityEncounter);
+
         await db.PatientEvents.AddRangeAsync(events);
         await db.SaveChangesAsync();
 
         // Act
         var results =
-            await queries.GetAdmittedPatientEventModelsByDateRange(facilityId, startDate, endDate,
+            await queries.GetAdmittedPatientEncounterModelsByDateRange(facilityId, startDate, endDate,
                 CancellationToken.None);
 
         // Assert
@@ -327,19 +349,17 @@ await queries.GetAdmittedPatientEventModelsByDateRange(facilityId, startDate, en
         Assert.Equal(2, results?.Count() ?? 0);
 
         // Verify both admitted patients are in the results
-        Assert.Contains(results, e => e.SourcePatientId == patientId1);
-        Assert.Contains(results, e => e.SourcePatientId == patientId2);
+        Assert.Contains(results, e => e.PatientIdentifiers.FirstOrDefault().Identifier == patientId1);
+        Assert.Contains(results, e => e.PatientIdentifiers.FirstOrDefault().Identifier == patientId2);
 
         foreach (var result in results)
         {
             // Extract the date from the payload
-            var eventDate = GetDateFromPayload(result.Payload);
+            //var eventDate = GetDateFromPayload(result.Payload);
 
-            Assert.True(eventDate >= startDate && eventDate <= endDate,
-                $"Event date {eventDate} for event {result.Id} should be between {startDate} and {endDate}");
+            Assert.True(result.AdmitDate >= startDate && result.AdmitDate <= endDate,
+                $"Event date {result.AdmitDate} for event {result.Id} should be between {startDate} and {endDate}");
         }
-
-
     }
 
     private DateTime GetDateFromPayload(IPayload payload)
@@ -359,23 +379,15 @@ public async Task GetAdmittedPatientEventModelsByDateRange_WithInvalidParameters
     {
         // Arrange
         var db = _fixture.DbContext;
-        var queries = _fixture.ServiceProvider.GetRequiredService<IPatientEventQueries>();
+        var queries = _fixture.ServiceProvider.GetRequiredService<IPatientEncounterQueries>();
 
         var facilityId = "TestFacility" + Guid.NewGuid().ToString();
         var startDate = DateTime.UtcNow.AddDays(-5);
         var endDate = DateTime.UtcNow;
 
         // Act & Assert - Invalid facility ID
         await Assert.ThrowsAsync<ArgumentException>(() =>
-            queries.GetAdmittedPatientEventModelsByDateRange(null, startDate, endDate, CancellationToken.None));
-
-        // Act & Assert - Default start date
-        await Assert.ThrowsAsync<ArgumentException>(() =>
-            queries.GetAdmittedPatientEventModelsByDateRange(facilityId, default, endDate, CancellationToken.None));
-
-        // Act & Assert - Default end date
-        await Assert.ThrowsAsync<ArgumentException>(() =>
-            queries.GetAdmittedPatientEventModelsByDateRange(facilityId, startDate, default, CancellationToken.None));
+            queries.GetAdmittedPatientEncounterModelsByDateRange(null, startDate, endDate, CancellationToken.None));
     }
 
     [Fact]