Merge remote-tracking branch 'origin/LNK-4524-fix-LogOutInAdminUi' into LNK-4524-fix-LogOutInAdminUi

Author: arianamihailescu

DotNet/Census/Application/Factories/PatientEncounterBuilder.cs

@@ -13,7 +13,7 @@ public PatientEncounterBuilder(string facilityId, string MRN, DateTime admitDate
         _patientEncounter.MedicalRecordNumber = MRN;
         _patientEncounter.AdmitDate = admitDate;
 
-        if (dischargeDate != null)
+        if (dischargeDate != default)
         {
             _patientEncounter.DischargeDate = dischargeDate;
         }

DotNet/Census/Controllers/PatientEncountersController.cs

@@ -155,7 +155,7 @@ public async Task<ActionResult<PagedConfigModel<PatientEncounterModel>>> GetHist
     [HttpPost("rebuild")]
     public async Task<IActionResult> RebuildMaterializedView(
         string facilityId,
-        string? correlationId = null,
+        string? correlationId = default,
         CancellationToken cancellationToken = default)
     {
         facilityId = HtmlInputSanitizer.SanitizeAndRemove(facilityId ?? string.Empty);
@@ -166,7 +166,7 @@ public async Task<IActionResult> RebuildMaterializedView(
 
         try
         {
-            await _patientEncounterQueries.RebuildPatientEncounterTable(cancellationToken);
+            await _patientEncounterQueries.RebuildPatientEncounterTable(facilityId, correlationId,cancellationToken: cancellationToken);
         }
         catch (Exception ex)
         {

DotNet/Census/Controllers/PatientEventsController.cs

@@ -17,16 +17,19 @@ public class PatientEventsController : Controller
     private readonly ILogger<PatientEventsController> _logger;
     private readonly IPatientEventManager _patientEventManager;
     private readonly IPatientEventQueries _patientEventQueries;
+    private readonly IPatientEncounterQueries _patientEncounterQueries;
 
     public PatientEventsController(
         ILogger<PatientEventsController> logger,
         IPatientEventManager patientEventManager,
-        IPatientEventQueries patientEventQueries
+        IPatientEventQueries patientEventQueries,
+        IPatientEncounterQueries patientEncounterQueries
     )
     {
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         _patientEventManager = patientEventManager ?? throw new ArgumentNullException(nameof(patientEventManager));
         _patientEventQueries = patientEventQueries ?? throw new ArgumentNullException(nameof(patientEventQueries));
+        _patientEncounterQueries = patientEncounterQueries ?? throw new ArgumentNullException(nameof(patientEncounterQueries));
     }
 
     /// <summary>
@@ -88,7 +91,7 @@ public async Task<ActionResult<PagedConfigModel<PatientEventModel>>> GetPatientE
     }
 
     /// <summary>
-    /// Soft deletes a patient event and rebuilds the materialized view for the related correlation id.
+    /// Deletes a patient event and rebuilds the materialized view for the related correlation id.
     /// </summary>
     /// <remarks>
     /// DELETE: api/patient-events/{id}
@@ -104,13 +107,31 @@ public async Task<IActionResult> DeletePatientEvent(string id, CancellationToken
             return BadRequest("Patient event ID is required.");
         }
 
+        using var transaction = await _patientEventQueries.StartTransaction();
         try
         {
+            var patientEventFaciltyId = (await _patientEventQueries.GetPatientEventById(id, cancellationToken))?.FacilityId;
+
+            if(string.IsNullOrWhiteSpace(patientEventFaciltyId))
+            {
+                await transaction.RollbackAsync(cancellationToken);
+                return NotFound($"Patient event with ID {id} not found.");
+            }
+
             await _patientEventManager.DeletePatientEventById(id, cancellationToken);
+            await _patientEncounterQueries.RebuildPatientEncounterTable(
+                facilityId: patientEventFaciltyId,
+                correlationId: null,
+                useTransaction: false,
+                cancellationToken: cancellationToken
+            );
+
+            await transaction.CommitAsync(cancellationToken);
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "Error deleting patient event with ID {Id}", id?.Replace("\r", "").Replace("\n", ""));
+            await transaction.RollbackAsync(cancellationToken);
             return Problem(
                 detail: "An error occurred while processing your request.",
                 statusCode: StatusCodes.Status500InternalServerError
@@ -121,7 +142,7 @@ public async Task<IActionResult> DeletePatientEvent(string id, CancellationToken
     }
 
     /// <summary>
-    /// Soft deletes the patient event store for the given correlation id and removes the corresponding materialized view.
+    /// Deletes the patient event store for the given correlation id and removes the corresponding materialized view.
     /// </summary>
     /// <remarks>
     /// DELETE: api/patient-events/visit/{correlationId}
@@ -136,15 +157,24 @@ public async Task<IActionResult> DeletePatientEventsByCorrelation(string correla
         {
             return BadRequest("Correlation ID is required.");
         }
-        
+
+        using var transaction = await _patientEventQueries.StartTransaction();
         try
         {
             await _patientEventQueries.DeletePatientEventByCorrelationId(correlationId, cancellationToken);
+            await _patientEncounterQueries.RebuildPatientEncounterTable(
+                facilityId: null,
+                correlationId: correlationId,
+                useTransaction: false,
+                cancellationToken: cancellationToken
+            );
+            await transaction.CommitAsync(cancellationToken);
 
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "Error deleting patient events for correlation ID {CorrelationId}", correlationId?.Replace("\r", "").Replace("\n", ""));
+            await transaction.RollbackAsync(cancellationToken);
             return Problem(
                 detail: "An error occurred while processing your request.",
                 statusCode: StatusCodes.Status500InternalServerError

DotNet/Census/Domain/Converters/PayloadJsonConverter.cs

@@ -72,7 +72,7 @@ public override IPayload Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
                     if (rootElement.TryGetProperty("patientId", out patientIdProp))
                         patientId = patientIdProp.GetString();
 
-                    if (rootElement.TryGetProperty("admitDate", out var dischargeDateProp) && 
+                    if (rootElement.TryGetProperty("dischargeDate", out var dischargeDateProp) && 
                         dischargeDateProp.ValueKind == JsonValueKind.String)
                     {
                         DateTime.TryParse(dischargeDateProp.GetString(), out dischargeDate);

DotNet/Census/Domain/Managers/PatientEventManager.cs

@@ -12,10 +12,15 @@ public interface IPatientEventManager
 public class PatientEventManager : IPatientEventManager
 {
     private readonly IBaseEntityRepository<PatientEvent> _patientEventRepository;
+    private readonly IPatientEncounterManager _patientEncounterManager;
 
-    public PatientEventManager(IBaseEntityRepository<PatientEvent> patientEventRepository)
+    public PatientEventManager(
+        IBaseEntityRepository<PatientEvent> patientEventRepository,
+        IPatientEncounterManager patientEncounterManager
+        )
     {
         _patientEventRepository = patientEventRepository ?? throw new ArgumentNullException(nameof(patientEventRepository));
+        _patientEncounterManager = patientEncounterManager ?? throw new ArgumentNullException(nameof(patientEncounterManager));
     }
 
     public async Task<List<PatientEvent>> GetByFacilityIdAndPatientId(string facilityId, string patientId, CancellationToken cancellationToken)
@@ -45,12 +50,20 @@ public async Task<PatientEvent> AddPatientEvent(PatientEvent patientEvent, Cance
         return await _patientEventRepository.AddAsync(patientEvent, cancellationToken);
     }
 
-    public Task DeletePatientEventById(string id, CancellationToken cancellationToken)
+    public async Task DeletePatientEventById(string id, CancellationToken cancellationToken)
     {
         if (string.IsNullOrWhiteSpace(id))
         {
             throw new ArgumentException("Patient event ID cannot be null or empty.", nameof(id));
         }
-        return _patientEventRepository.DeleteAsync(id, cancellationToken);
+
+        var toBeDeletedEvent = await _patientEventRepository.GetAsync(id, cancellationToken);
+
+        if (toBeDeletedEvent == null)
+        {
+            throw new Exception($"Patient event with ID {id} not found.");
+        }
+
+        await _patientEventRepository.DeleteAsync(id, cancellationToken);
     }
 }