Abstract out default implementation from HIP service (#71)

* Temp commit

* Let the repository take care of building expression

* Abstract out default implementation

* Removed duplicate code introduced in link

* Abstract out link implementation

* Lookup for migrations in HipService

* Reuse discovery repository in link too

* Remove unnecessary return statement

Author: ganesanarun

…ultHip/Discovery/Matcher/EmptyMatcher.cs …EKA.DefaultHip/Discovery/EmptyMatcher.cssrc/In.ProjectEKA.DefaultHip/Discovery/Matcher/EmptyMatcher.cs renamed to src/In.ProjectEKA.DefaultHip/Discovery/EmptyMatcher.cs src/In.ProjectEKA.DefaultHip/Discovery/Matcher/EmptyMatcher.cs renamed to src/In.ProjectEKA.DefaultHip/Discovery/EmptyMatcher.cs

@@ -1,8 +1,8 @@
-namespace In.ProjectEKA.DefaultHip.Discovery.Matcher
+namespace In.ProjectEKA.DefaultHip.Discovery
 {
     using System;
     using System.Linq.Expressions;
-    using Model;
+    using HipLibrary.Patient.Model;
 
     public class EmptyMatcher : IIdentifierMatcher
     {

…ip/Discovery/Helper/ExpressionBuilder.cs …efaultHip/Discovery/ExpressionBuilder.cssrc/In.ProjectEKA.DefaultHip/Discovery/Helper/ExpressionBuilder.cs renamed to src/In.ProjectEKA.DefaultHip/Discovery/ExpressionBuilder.cs src/In.ProjectEKA.DefaultHip/Discovery/Helper/ExpressionBuilder.cs renamed to src/In.ProjectEKA.DefaultHip/Discovery/ExpressionBuilder.cs

@@ -1,15 +1,10 @@
-namespace In.ProjectEKA.DefaultHip.Discovery.Helper
+namespace In.ProjectEKA.DefaultHip.Discovery
 {
     using System;
     using System.Linq.Expressions;
 
     public static class ExpressionBuilder
     {
-        public static Expression<Func<T, bool>> True<T>()
-        {
-            return f => true;
-        }
-
         public static Expression<Func<T, bool>> False<T>()
         {
             return f => false;
@@ -23,6 +18,7 @@ public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> exp
                 (Expression.OrElse(expr1.Body, invokedExpr), expr1.Parameters);
         }
 
+        // ReSharper disable once UnusedMember.Global
         public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> expr1,
             Expression<Func<T, bool>> expr2)
         {

src/In.ProjectEKA.DefaultHip/Discovery/IMatchingRepository.cs

@@ -1,11 +1,12 @@
 namespace In.ProjectEKA.DefaultHip.Discovery
 {
-    using System;
     using System.Linq;
-    using System.Linq.Expressions;
     using System.Threading.Tasks;
-    using Helper;
-    using Model;
+    using HipLibrary.Patient;
+    using HipLibrary.Patient.Model;
+    using Patient;
+    using DiscoveryRequest = HipLibrary.Patient.Model.Request.DiscoveryRequest;
+    using static StrongMatcherFactory;
 
     public class PatientMatchingRepository : IMatchingRepository
     {
@@ -15,11 +16,11 @@ public PatientMatchingRepository(string patientFilePath)
         {
             this.patientFilePath = patientFilePath;
         }
-
-        public async Task<IQueryable<Patient>> Where(Expression<Func<Patient, bool>> predicate)
+        public async Task<IQueryable<Patient>> Where(DiscoveryRequest request)
         {
+            var expression = GetExpression(request.Patient.VerifiedIdentifiers);
             var patientsInfo = await FileReader.ReadJsonAsync(patientFilePath);
-            return patientsInfo.Where(predicate.Compile()).AsQueryable();
+            return patientsInfo.Where(expression.Compile()).AsQueryable();
         }
     }
 }

src/In.ProjectEKA.DefaultHip/Discovery/Matcher/IIdentifierMatcher.cs

@@ -1,8 +1,8 @@
-namespace In.ProjectEKA.DefaultHip.Discovery.Matcher
+namespace In.ProjectEKA.DefaultHip.Discovery
 {
     using System;
     using System.Linq.Expressions;
-    using Model;
+    using HipLibrary.Patient.Model;
 
     public class PhoneNumberMatcher : IIdentifierMatcher
     {

src/In.ProjectEKA.DefaultHip/Discovery/Model/CareContext.cs

@@ -1,12 +1,10 @@
-namespace In.ProjectEKA.DefaultHip.Discovery.Matcher
+namespace In.ProjectEKA.DefaultHip.Discovery
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Linq.Expressions;
-    using Helper;
     using HipLibrary.Patient.Model;
-    using Model;
 
     public static class StrongMatcherFactory
     {
@@ -29,4 +27,9 @@ public static Expression<Func<Patient, bool>> GetExpression(IEnumerable<Identifi
                     (accumulate, next) => accumulate.Or(next));
         }
     }
+
+    public interface IIdentifierMatcher
+    {
+        Expression<Func<Patient, bool>> Of(string value);
+    }
 }

src/In.ProjectEKA.DefaultHip/Discovery/Model/Patient.cs

@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="health-information-provider-library" Version="0.1.0" />
+    <PackageReference Include="health-information-provider-library" Version="0.1.3" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -15,9 +15,5 @@
     <PackageReference Include="NpgSql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.1" />
     <PackageReference Include="Optional" Version="4.0.0" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <Folder Include="Link\Database\Migrations" />
-  </ItemGroup>
 
 </Project>