fix: fixing history

Author: SamRobinson75684

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

@@ -10,7 +10,6 @@ namespace Common;
 using Model.Enums;
 using System;
 using System.Linq;
-using NHS.CohortManager.Shared.Utilities;
 
 public class FhirPatientDemographicMapper : IFhirPatientDemographicMapper
 {
@@ -121,7 +120,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 = FormatDates(patient.BirthDate);
+        demographic.DateOfBirth = patient.BirthDate;
 
         // CurrentPosting & CurrentPostingEffectiveFromDate
         // these are not set as not available in PDS
@@ -151,7 +150,7 @@ private static void MapPrimaryCareProvider(Patient patient, Demographic demograp
         demographic.PrimaryCareProvider = gp.Identifier.Value;
 
         if (gp.Identifier.Period?.Start != null)
-            demographic.PrimaryCareProviderEffectiveFromDate = FormatDates(gp.Identifier.Period.Start);
+            demographic.PrimaryCareProviderEffectiveFromDate = gp.Identifier.Period.Start.ToString();
     }
 
     private static void MapNames(Patient patient, Demographic demographic)
@@ -247,7 +246,7 @@ private static void MapAddressComponents(Address address, Demographic demographi
         // Map effective date
         if (address.Period?.Start != null)
         {
-            demographic.UsualAddressEffectiveFromDate = FormatDates(address.Period.Start);
+            demographic.UsualAddressEffectiveFromDate = address.Period.Start.ToString();
         }
     }
 
@@ -359,7 +358,7 @@ private static void MapContactPoint(
 
         if (contactPoint.Period?.Start != null)
         {
-            setDateAction(FormatDates(contactPoint.Period.Start));
+            setDateAction(contactPoint.Period.Start.ToString());
         }
     }
 
@@ -452,11 +451,4 @@ 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")!;
-    }
-
 }

application/CohortManager/src/Functions/Shared/Model/PdsDemographic.cs

@@ -1,7 +1,9 @@
 namespace Model;
 
+using System.Data;
 using System.Text.Json.Serialization;
 using Model.Enums;
+using NHS.CohortManager.Shared.Utilities;
 
 public class PdsDemographic : Demographic
 {
@@ -27,7 +29,7 @@ public ParticipantDemographic ToParticipantDemographic()
             OtherGivenName = OtherGivenNames,
             FamilyName = FamilyName,
             PreviousFamilyName = PreviousFamilyName,
-            DateOfBirth = DateOfBirth,
+            DateOfBirth = MappingUtilities.ParseDates(DateOfBirth!)?.ToString("yyyyMMdd"),
             Gender = (short?)(Gender.HasValue ? (Gender?)Gender.Value : null),
             AddressLine1 = AddressLine1,
             AddressLine2 = AddressLine2,
@@ -36,15 +38,15 @@ public ParticipantDemographic ToParticipantDemographic()
             AddressLine5 = AddressLine5,
             PostCode = Postcode,
             PafKey = PafKey,
-            UsualAddressFromDate = UsualAddressEffectiveFromDate,
+            UsualAddressFromDate = MappingUtilities.ParseDates(UsualAddressEffectiveFromDate!)?.ToString("yyyyMMdd"),
             DateOfDeath = DateOfDeath,
             DeathStatus = (short?)(DeathStatus.HasValue ? (Status?)DeathStatus.Value : null),
             TelephoneNumberHome = TelephoneNumber,
-            TelephoneNumberHomeFromDate = TelephoneNumberEffectiveFromDate,
+            TelephoneNumberHomeFromDate = MappingUtilities.ParseDates(TelephoneNumberEffectiveFromDate!)?.ToString("yyyy-MM-dd"),
             TelephoneNumberMob = MobileNumber,
-            TelephoneNumberMobFromDate = MobileNumberEffectiveFromDate,
+            TelephoneNumberMobFromDate = MappingUtilities.ParseDates(MobileNumberEffectiveFromDate!)?.ToString("yyyyMMdd"),
             EmailAddressHome = EmailAddress,
-            EmailAddressHomeFromDate = EmailAddressEffectiveFromDate,
+            EmailAddressHomeFromDate = MappingUtilities.ParseDates(EmailAddressEffectiveFromDate!)?.ToString("yyyyMMdd"),
             PreferredLanguage = PreferredLanguage,
             InterpreterRequired = IsInterpreterRequired?.ToLower() switch
             {

tests/UnitTests/SharedTests/FhirPatientDemographicMapperTests/FhirPatientDemographicMapperTests.cs

@@ -90,11 +90,11 @@ public void FhirParser_ValidJson_ReturnsDemographic()
             ParticipantId = null,
             RecordUpdateDateTime = null,
             RecordInsertDateTime = null,
-            DateOfBirth = "20101022",
+            DateOfBirth = "2010-10-22",
 
             // Primary Care Provider
             PrimaryCareProvider = "Y12345",
-            PrimaryCareProviderEffectiveFromDate = "20200101",
+            PrimaryCareProviderEffectiveFromDate = "2020-01-01",
 
             // Name Information
             NamePrefix = "Mrs",
@@ -114,19 +114,19 @@ public void FhirParser_ValidJson_ReturnsDemographic()
             AddressLine5 = "West Yorkshire",
             Postcode = "LS1 6AE",
             PafKey = "12345678",
-            UsualAddressEffectiveFromDate = "20200101",
+            UsualAddressEffectiveFromDate = "2020-01-01",
 
             // 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 = "20200101",
+            TelephoneNumberEffectiveFromDate = "2020-01-01",
             MobileNumber = null, // No mobile phone in the sample
             MobileNumberEffectiveFromDate = null,
             EmailAddress = "jane.smith@example.com",
-            EmailAddressEffectiveFromDate = "20190101",
+            EmailAddressEffectiveFromDate = "2019-01-01",
 
             // Language Preferences
             PreferredLanguage = "fr",
@@ -215,7 +215,7 @@ public void FhirParser_SensitivePatient_MapsCorrectly()
 
         // Basic Information
         Assert.AreEqual("9000000025", result.NhsNumber);
-        Assert.AreEqual("20101022", result.DateOfBirth);
+        Assert.AreEqual("2010-10-22", 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("20200101", result.MobileNumberEffectiveFromDate);
+        Assert.AreEqual("2020-01-01", result.MobileNumberEffectiveFromDate);
     }
 
     [TestMethod]