Unmask story

src/In.ProjectEKA.DefaultHip/Link/PatientRepository.cs

@@ -30,7 +30,7 @@ public Option<Patient> PatientWith(string referenceNumber)
                 return Option.None<Patient>();
             }
         }
-
+        
         private IEnumerable<Patient> All()
         {
             var patientsInfo = FileReader.ReadJson(filePath);

src/In.ProjectEKA.DefaultHip/Patient/MaskingUtility.cs

@@ -0,0 +1,69 @@
+namespace In.ProjectEKA.DefaultHip.Patient
+{
+    using System.Collections.Generic;
+    using System.Linq;
+    using HipLibrary.Patient;
+
+    public class MaskingUtility : IMaskUtility
+    {
+        private static Dictionary<string, string> maskedDataMap = new Dictionary<string, string>();
+
+        public string MaskReference(string referenceNumber)
+        {
+            var maskedPatientReferenceNumber = "";
+            if (referenceNumber.Length > 2)
+            {
+                maskedPatientReferenceNumber = string.Concat(
+                    "".PadLeft(referenceNumber.Length - 2, 'X'),
+                    referenceNumber.Substring(referenceNumber.Length - 2));
+            }
+            else
+            {
+                maskedPatientReferenceNumber = "XXX" + referenceNumber;
+            }
+
+            if (!maskedDataMap.ContainsKey(referenceNumber))
+            {
+                maskedDataMap.Add(referenceNumber, maskedPatientReferenceNumber);
+            }
+
+            return maskedPatientReferenceNumber;
+        }
+
+        public string MaskMobileNumber(string mobileNumber)
+        {
+            var number = mobileNumber;
+            var paddingBit = "".PadLeft(mobileNumber.Length - 8, 'X');
+            return string.Concat(
+                number.Substring(0, 6) +
+                paddingBit,
+                number.Substring(mobileNumber.Length - 2));
+        }
+
+        public string MaskCareContextDisplay(string referenceNumber)
+        {
+            return string.Concat(
+                "".PadLeft(referenceNumber.Length - 4, 'X'),
+                referenceNumber.Substring(referenceNumber.Length - 2));
+        }
+
+        public string UnmaskData(string maskedData)
+        {
+            var keysWithMatchingValues = maskedDataMap.Where(p => p.Value == maskedData).Select(p => p.Key);
+            return keysWithMatchingValues.First();
+        }
+
+        public string MaskPatientName(string patientName)
+        {
+            if (patientName.Length >= 5)
+            {
+                return string.Concat(
+                    patientName.Substring(0, 2) +
+                    "".PadLeft(patientName.Length - 4, 'X'),
+                    patientName.Substring(patientName.Length - 2));
+            }
+
+            return "XXX" + patientName;
+        }
+    }
+}

src/In.ProjectEKA.HipLibrary/Patient/IMaskUtility.cs

@@ -0,0 +1,11 @@
+namespace In.ProjectEKA.HipLibrary.Patient
+{
+    public interface IMaskUtility
+    {
+        string MaskReference(string referenceNumber);
+        string MaskCareContextDisplay(string referenceNumber);
+        string UnmaskData(string maskedData);
+        string MaskMobileNumber(string mobileNumber);
+
+    }
+}

src/In.ProjectEKA.HipLibrary/Patient/Model/CareContextEnquiry.cs

@@ -2,7 +2,7 @@ namespace In.ProjectEKA.HipLibrary.Patient.Model
 {
     public class CareContextEnquiry
     {
-        public string ReferenceNumber { get; }
+        public string ReferenceNumber { get; set; }
 
         public CareContextEnquiry(string referenceNumber)
         {

src/In.ProjectEKA.HipLibrary/Patient/Model/CareContextRepresentation.cs

@@ -2,9 +2,9 @@ namespace In.ProjectEKA.HipLibrary.Patient.Model
 {
     public class CareContextRepresentation
     {
-        public string ReferenceNumber { get; }
+        public string ReferenceNumber { get; set; }
 
-        public string Display { get; }
+        public string Display { get; set; }
 
         public CareContextRepresentation(string referenceNumber, string display)
         {

src/In.ProjectEKA.HipLibrary/Patient/Model/LinkConfirmationRepresentation.cs

@@ -1,8 +1,6 @@
 namespace In.ProjectEKA.HipLibrary.Patient.Model
 {
     using System.Collections.Generic;
-    using System.Text.Json.Serialization;
-    using System.Xml.Serialization;
 
     public class LinkConfirmationRepresentation
     {

src/In.ProjectEKA.HipLibrary/Patient/Model/LinkEnquiryRepresentation.cs

@@ -9,7 +9,7 @@ public class LinkEnquiryRepresentation
 
         public string AuthenticationType { get; }
 
-        public LinkReferenceMeta Meta { get; }
+        public LinkReferenceMeta Meta { get; set; }
 
         public LinkEnquiryRepresentation()
         {

src/In.ProjectEKA.HipLibrary/Patient/Model/LinkReferenceMeta.cs

@@ -2,13 +2,12 @@ namespace In.ProjectEKA.HipLibrary.Patient.Model
 {
     public class LinkReferenceMeta
     {
-        public string CommunicationMedium { get; }
+        public string CommunicationMedium { get; set; }
 
-        public string CommunicationHint { get; }
+        public string CommunicationHint { get; set; }
 
         public string CommunicationExpiry { get; }
 
-
         public LinkReferenceMeta(string communicationMedium, string communicationHint, string communicationExpiry)
         {
             CommunicationMedium = communicationMedium;

src/In.ProjectEKA.HipLibrary/Patient/Model/Patient.cs

@@ -5,7 +5,7 @@ namespace In.ProjectEKA.HipLibrary.Patient.Model
     public class Patient
     {
         public string Identifier { get; set; }
-
+      
         public Gender Gender { get; set; }
 
         public string PhoneNumber { get; set; }

src/In.ProjectEKA.HipLibrary/Patient/Model/PatientEnquiryRepresentation.cs

@@ -4,9 +4,9 @@ namespace In.ProjectEKA.HipLibrary.Patient.Model
 
     public class PatientEnquiryRepresentation
     {
-        public string ReferenceNumber { get; }
+        public string ReferenceNumber { get; set; }
 
-        public string Display { get; }
+        public string Display { get; set; }
 
         public IEnumerable<CareContextRepresentation> CareContexts { get; }
 

src/In.ProjectEKA.HipService/Discovery/Database/Migrations/DiscoveryContextModelSnapshot.cs

@@ -16,7 +16,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn)
-                .HasAnnotation("ProductVersion", "3.1.4")
+                .HasAnnotation("ProductVersion", "3.1.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             modelBuilder.Entity("In.ProjectEKA.HipService.Discovery.Model.DiscoveryRequest", b =>

src/In.ProjectEKA.HipService/Discovery/DiscoveryRequestRepository.cs

@@ -1,3 +1,5 @@
+using System.Linq;
+
 namespace In.ProjectEKA.HipService.Discovery
 {
     using System.Threading.Tasks;
@@ -46,5 +48,11 @@ public Task<bool> RequestExistsFor(string requestId)
             return discoveryContext.DiscoveryRequest
                 .AnyAsync(request => request.TransactionId == requestId);
         }
+
+        public async Task<DiscoveryRequest> GetRequestFor(string transactionId)
+        {
+            return await discoveryContext.DiscoveryRequest
+                .FirstOrDefaultAsync(request => request.TransactionId == transactionId);
+        }
     }
 }

src/In.ProjectEKA.HipService/Discovery/IDiscoveryRequestRepository.cs

@@ -12,5 +12,7 @@ public interface IDiscoveryRequestRepository
         Task<bool> RequestExistsFor(string requestId, string consentManagerUserId, string patientReferenceNumber);
 
         Task<bool> RequestExistsFor(string requestId);
+
+        Task<DiscoveryRequest> GetRequestFor(string requestTransactionId);
     }
 }

src/In.ProjectEKA.HipService/Discovery/PatientDiscovery.cs

@@ -4,11 +4,12 @@ namespace In.ProjectEKA.HipService.Discovery
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using DefaultHip.Patient;
     using HipLibrary.Matcher;
     using HipLibrary.Patient;
     using HipLibrary.Patient.Model;
     using Link;
-    using In.ProjectEKA.HipService.Link.Model;
+    using Link.Model;
     using Logger;
 
     public class PatientDiscovery
@@ -36,7 +37,8 @@ public virtual async Task<ValueTuple<DiscoveryRepresentation, ErrorRepresentatio
             if (await AlreadyExists(request.TransactionId))
             {
                 return (null,
-                    new ErrorRepresentation(new Error(ErrorCode.DuplicateDiscoveryRequest, "Discovery Request already exists")));
+                    new ErrorRepresentation(new Error(ErrorCode.DuplicateDiscoveryRequest,
+                        "Discovery Request already exists")));
             }
 
             var (linkedAccounts, exception) = await linkPatientRepository.GetLinkedCareContexts(request.Patient.Id);
@@ -57,8 +59,13 @@ public virtual async Task<ValueTuple<DiscoveryRepresentation, ErrorRepresentatio
                     {
                         await discoveryRequestRepository.Add(new Model.DiscoveryRequest(request.TransactionId,
                             request.Patient.Id, patient.Identifier));
-                        return (new DiscoveryRepresentation(patient.ToPatientEnquiryRepresentation(
-                                GetUnlinkedCareContexts(linkedCareContexts, patient))),
+
+                        var careContextRepresentations = GetUnlinkedCareContexts(linkedCareContexts, patient).ToList();
+                        var maskedPatientEnquiryRepresentation = GetMaskedPatientEnquiryRepresentation(
+                            patient.ToPatientEnquiryRepresentation(
+                                careContextRepresentations));
+
+                        return (new DiscoveryRepresentation(maskedPatientEnquiryRepresentation),
                             (ErrorRepresentation) null);
                     })
                     .ValueOr(Task.FromResult(((DiscoveryRepresentation) null,
@@ -76,7 +83,9 @@ await discoveryRequestRepository.Add(new Model.DiscoveryRequest(request.Transact
 
             await discoveryRequestRepository.Add(new Model.DiscoveryRequest(request.TransactionId,
                 request.Patient.Id, patientEnquiryRepresentation.ReferenceNumber));
-            return (new DiscoveryRepresentation(patientEnquiryRepresentation), null);
+            var representation = GetMaskedPatientEnquiryRepresentation(patientEnquiryRepresentation);
+
+            return (new DiscoveryRepresentation(representation), null);
         }
 
         private async Task<bool> AlreadyExists(string transactionId)
@@ -102,5 +111,22 @@ private static IEnumerable<CareContextRepresentation> GetUnlinkedCareContexts(
                     allLinkedCareContexts.Find(linkedCareContext =>
                         linkedCareContext == careContext.ReferenceNumber) == null);
         }
+
+        private PatientEnquiryRepresentation GetMaskedPatientEnquiryRepresentation(
+            PatientEnquiryRepresentation patient)
+        {
+            var maskingUtility = new MaskingUtility();
+            patient.ReferenceNumber = maskingUtility.MaskReference(patient.ReferenceNumber);
+            patient.Display = maskingUtility.MaskPatientName(patient.Display);
+            foreach (var careContextRepresentation in patient.CareContexts.AsEnumerable())
+            {
+                careContextRepresentation.ReferenceNumber =
+                    new MaskingUtility().MaskReference(careContextRepresentation.ReferenceNumber);
+                careContextRepresentation.Display =
+                    new MaskingUtility().MaskCareContextDisplay(careContextRepresentation.Display);
+            }
+
+            return patient;
+        }
     }
 }

src/In.ProjectEKA.HipService/Link/Database/LinkPatientContext.cs

@@ -13,9 +13,9 @@ public LinkPatientContext(DbContextOptions<LinkPatientContext> options) : base(o
         }
 
         public DbSet<LinkEnquires> LinkEnquires { get; set; }
-
-        public DbSet<LinkedAccounts> LinkedAccounts { get; set; }
 
+        public DbSet<LinkedAccounts> LinkedAccounts { get; set; }
+
         public DbSet<InitiatedLinkRequest> InitiatedLinkRequest { get; set; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -29,7 +29,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .WithOne(c => c.LinkEnquires)
                 .IsRequired()
                 .OnDelete(DeleteBehavior.Cascade);
-            
+
             modelBuilder.Entity<LinkedAccounts>(builder =>
             {
                 builder.Property(p => p.DateTimeStamp)
@@ -43,7 +43,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 builder.Property(p => p.Status)
                     .HasDefaultValueSql("false");
             });
-            
+
             modelBuilder.Entity<LinkedAccounts>()
                 .Property(e => e.CareContexts)
                 .HasConversion(

src/In.ProjectEKA.HipService/Link/Database/Migrations/LinkPatientContextModelSnapshot.cs

@@ -1,4 +1,6 @@
 // <auto-generated />
+
+using System;
 using In.ProjectEKA.HipService.Link.Database;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -15,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn)
-                .HasAnnotation("ProductVersion", "3.1.3")
+                .HasAnnotation("ProductVersion", "3.1.5")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             modelBuilder.Entity("In.ProjectEKA.HipService.Link.Model.CareContext", b =>
@@ -105,7 +107,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.ToTable("LinkedAccounts");
                 });
-
+            
             modelBuilder.Entity("In.ProjectEKA.HipService.Link.Model.CareContext", b =>
                 {
                     b.HasOne("In.ProjectEKA.HipService.Link.Model.LinkEnquires", "LinkEnquires")

src/In.ProjectEKA.HipService/Link/ILinkPatientRepository.cs

@@ -1,3 +1,5 @@
+using In.ProjectEKA.HipLibrary.Patient.Model;
+
 namespace In.ProjectEKA.HipService.Link
 {
     using System;