fix: fxing date formatting (#1512)

* fix: fxing date formatting

* fix: now maps all the dates

* fix: fixing unit tests

* fix: removing unwanted code

* fix: removing unused usings

Author: SamRobinson75684

application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographic.cs

@@ -5,7 +5,6 @@ namespace NHS.CohortManager.DemographicServices;
 using System.Text.Json;
 using Common;
 using Common.Interfaces;
-using DataServices.Client;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Logging;

application/CohortManager/src/Functions/Shared/Common/FhirPatientDemographicMapper.cs

@@ -10,6 +10,7 @@ namespace Common;
 using Model.Enums;
 using System;
 using System.Linq;
+using NHS.CohortManager.Shared.Utilities;
 
 public class FhirPatientDemographicMapper : IFhirPatientDemographicMapper
 {
@@ -120,7 +121,7 @@ public PdsDemographic MapPatientToPDSDemographic(Patient patient)
         demographic.ParticipantId = null; // We do not know the Participant ID from PDS
         demographic.RecordUpdateDateTime = null; // We do not know the RecordUpdateDateTime from PDS
         demographic.RecordInsertDateTime = null; // We do not know the RecordInsertDateTime from PDS
-        demographic.DateOfBirth = patient.BirthDate;
+        demographic.DateOfBirth = FormatDates(patient.BirthDate);
 
         // CurrentPosting & CurrentPostingEffectiveFromDate
         // these are not set as not available in PDS
@@ -150,7 +151,7 @@ private static void MapPrimaryCareProvider(Patient patient, Demographic demograp
         demographic.PrimaryCareProvider = gp.Identifier.Value;
 
         if (gp.Identifier.Period?.Start != null)
-            demographic.PrimaryCareProviderEffectiveFromDate = gp.Identifier.Period.Start.ToString();
+            demographic.PrimaryCareProviderEffectiveFromDate = FormatDates(gp.Identifier.Period.Start);
     }
 
     private static void MapNames(Patient patient, Demographic demographic)
@@ -246,7 +247,7 @@ private static void MapAddressComponents(Address address, Demographic demographi
         // Map effective date
         if (address.Period?.Start != null)
         {
-            demographic.UsualAddressEffectiveFromDate = address.Period.Start.ToString();
+            demographic.UsualAddressEffectiveFromDate = FormatDates(address.Period.Start);
         }
     }
 
@@ -358,7 +359,7 @@ private static void MapContactPoint(
 
         if (contactPoint.Period?.Start != null)
         {
-            setDateAction(contactPoint.Period.Start.ToString());
+            setDateAction(FormatDates(contactPoint.Period.Start));
         }
     }
 
@@ -451,4 +452,11 @@ private static void MapSecurityMetadata(Patient patient, PdsDemographic demograp
 
         demographic.ConfidentialityCode = confidentialityCoding.Code;
     }
+
+    private static string FormatDates(string dateToConvert)
+    {
+        var parsedDateTime = MappingUtilities.ParseDates(dateToConvert);
+        return parsedDateTime?.ToString("yyyyMMdd")!;
+    }
+
 }

tests/UnitTests/SharedTests/FhirPatientDemographicMapperTests/FhirPatientDemographicMapperTests.cs

@@ -90,11 +90,11 @@ public void FhirParser_ValidJson_ReturnsDemographic()
             ParticipantId = null,
             RecordUpdateDateTime = null,
             RecordInsertDateTime = null,
-            DateOfBirth = "2010-10-22",
+            DateOfBirth = "20101022",
 
             // Primary Care Provider
             PrimaryCareProvider = "Y12345",
-            PrimaryCareProviderEffectiveFromDate = "2020-01-01",
+            PrimaryCareProviderEffectiveFromDate = "20200101",
 
             // Name Information
             NamePrefix = "Mrs",
@@ -114,19 +114,19 @@ public void FhirParser_ValidJson_ReturnsDemographic()
             AddressLine5 = "West Yorkshire",
             Postcode = "LS1 6AE",
             PafKey = "12345678",
-            UsualAddressEffectiveFromDate = "2020-01-01",
+            UsualAddressEffectiveFromDate = "20200101",
 
             // Death Information
             DateOfDeath = "2010-10-22T00:00:00+00:00",
             DeathStatus = Status.Formal, // "Formal - death notice received from Registrar of Deaths"
 
             // Contact Information
             TelephoneNumber = "01632960587", // Home phone
-            TelephoneNumberEffectiveFromDate = "2020-01-01",
+            TelephoneNumberEffectiveFromDate = "20200101",
             MobileNumber = null, // No mobile phone in the sample
             MobileNumberEffectiveFromDate = null,
             EmailAddress = "jane.smith@example.com",
-            EmailAddressEffectiveFromDate = "2019-01-01",
+            EmailAddressEffectiveFromDate = "20190101",
 
             // Language Preferences
             PreferredLanguage = "fr",
@@ -215,7 +215,7 @@ public void FhirParser_SensitivePatient_MapsCorrectly()
 
         // Basic Information
         Assert.AreEqual("9000000025", result.NhsNumber);
-        Assert.AreEqual("2010-10-22", result.DateOfBirth);
+        Assert.AreEqual("20101022", result.DateOfBirth);
         Assert.AreEqual(Gender.Female, result.Gender);
 
         // Name Information
@@ -340,7 +340,7 @@ public void FhirParser_PatientWithMobileNumber_MapsCorrectly()
 
         // Assert
         Assert.AreEqual("07700900123", result.MobileNumber);
-        Assert.AreEqual("2020-01-01", result.MobileNumberEffectiveFromDate);
+        Assert.AreEqual("20200101", result.MobileNumberEffectiveFromDate);
     }
 
     [TestMethod]