From 9ca4c9bee5d8710102edcdb26b41916995a73694 Mon Sep 17 00:00:00 2001 From: nexengineer Date: Thu, 20 Aug 2020 14:09:42 +0530 Subject: [PATCH 01/10] Network hip intial implementation --- hip-service.sln | 2 +- .../DataFlow/Collect.cs | 127 ------------------ .../In.ProjectEKA.HipService.csproj | 2 +- src/In.ProjectEKA.HipService/Startup.cs | 2 +- .../appsettings.Development.json | 6 +- src/In.ProjectEKA.HipService/appsettings.json | 2 +- .../DataFlow/CareContextRecord.cs | 0 .../DataFlow/Collect.cs | 124 +++++++++++++++++ .../DataFlow/Model/NetworkData.cs | 17 +++ .../DataFlow/Model/NetworkDataRequest.cs | 21 +++ .../DataFlow/Model/NetworkDataResponse.cs | 14 ++ .../Discovery/PatientMatchingRepository.cs | 0 .../In.ProjectEKA.NetworkHip.csproj} | 1 + .../Link/PatientRepository.cs | 0 ...MAXNCC1543DischargeSummaryDoc20190409.json | 0 ...MAXNCC1543DischargeSummaryDoc20190419.json | 0 ...MAXRVH9999DiagnosticReportDoc20160801.json | 0 ...MAXRVH9999DiagnosticReportDoc20160803.json | 0 ...MAXRVH9999DischargeSummaryDoc20160801.json | 0 ...MAXRVH9999DischargeSummaryDoc20160811.json | 0 .../MAXRVH9999OPConsultationDoc20160801.json | 0 .../MAXRVH9999OPConsultationDoc20160803.json | 0 .../MAXRVH9999PrescriptionDoc20160801.json | 0 .../MAXRVH9999PrescriptionDoc20160803.json | 0 .../MAXRVH9999PrescriptionDoc20160805.json | 0 .../MAXRVH9999PrescriptionDoc20160807.json | 0 .../Patient/FileReader.cs | 0 .../BI-KTH-12FirstVisitConditions.json | 0 .../MAXLIVNO09PrescriptionDoc20150801.json | 0 ...MAXLIVNO10DiagnosticReportDoc20190801.json | 0 .../MAXLIVNO10PrescriptionDoc20180801.json | 0 .../MAXLIVNO11OPConsultationDoc20180801.json | 0 .../MAXLIVNO11PrescriptionDoc20190801.json | 0 .../MAXLIVNO14PrescriptionDoc20110801.json | 0 ...MAXNCC1543DischargeSummaryDoc20190409.json | 0 ...MAXNCC1543DischargeSummaryDoc20190419.json | 0 .../MAXNCC1702PrescriptionDoc20180801.json | 0 .../MAXNCC1702PrescriptionDoc20180803.json | 0 .../MAXNCC1702PrescriptionDoc20180805.json | 0 ...MAXNCP1702DiagnosticReportDoc20190101.json | 0 ...MAXNCP1702DiagnosticReportDoc20190103.json | 0 ...MAXRVH9999DiagnosticReportDoc20160801.json | 0 ...MAXRVH9999DiagnosticReportDoc20160803.json | 0 ...MAXRVH9999DischargeSummaryDoc20160801.json | 0 ...MAXRVH9999DischargeSummaryDoc20160811.json | 0 .../MAXRVH9999OPConsultationDoc20160801.json | 0 .../MAXRVH9999OPConsultationDoc20160803.json | 0 .../MAXRVH9999PrescriptionDoc20160801.json | 0 .../MAXRVH9999PrescriptionDoc20160803.json | 0 .../MAXRVH9999PrescriptionDoc20160805.json | 0 .../MAXRVH9999PrescriptionDoc20160807.json | 0 ...gnosticReportWithRadiologyImageInline.json | 0 .../NCP1006FirstVisitDiagnosticReports.json | 0 .../NCP1006SecondVisitDiagnosticRepots.json | 0 .../NCP1006ThirdVisitImagingStudy.json | 0 .../NCP1007DiagnosticReportDocument.json | 0 .../NCP1007DiagnosticReportDocument1.json | 0 .../Resources/NCP1007DischargeSummary1.json | 0 .../Resources/NCP1007DischargeSummary2.json | 0 .../NCP1007PrescriptionDocument1.json | 0 .../NCP1007PrescriptionDocument2.json | 0 .../NCP1007PrescriptionDocument3.json | 0 .../NCP1008ClinicalDocumentComposition.json | 0 .../NCP1008DiagnosticReportDoc20191001.json | 0 .../NCP1008DiagnosticReportDoc20191003.json | 0 .../NCP1008DiagnosticReportDoc20191005.json | 0 ...gnosticReportWithRadiologyImageInline.json | 0 .../NCP1008FifthVisitPrescription.json | 0 .../Resources/NCP1008FirstVisitCondition.json | 0 .../NCP1008FirstVisitDiagnosticReport.json | 0 .../NCP1008FirstVisitObservations.json | 0 .../NCP1008FourthVisitDocumentReference.json | 0 .../NCP1008NRCOPConsultationNote.json | 0 .../NCP1008PrescriptionDoc20190801.json | 0 .../NCP1008PrescriptionDoc20190803.json | 0 .../NCP1008PrescriptionDoc20190805.json | 0 .../NCP1008SecondVisitDiagnosticReport.json | 0 .../NCP1008SecondVisitMedications.json | 0 .../NCP1008SecondVisitObsWithMembers.json | 0 .../NCP1008ThirdVisitDischargeSummary.json | 0 .../NCP1008WEBEMROPConsultationNote.json | 0 .../NCP1702DischargeSummary20190203.json | 0 .../NCP1702DischargeSummary20191003.json | 0 .../NCP1702OPConsultationNote20200709.json | 0 .../NCP1702OPConsultationNote20200710.json | 0 .../RVMHD01PrescriptionDoc06012019.json | 0 .../RVMHD01PrescriptionDoc06032019.json | 0 .../RVMHD01PrescriptionDoc06052019.json | 0 .../RVMHD01PrescriptionDoc06072019.json | 0 .../RVMHD01PrescriptionDoc06092019.json | 0 .../RVMHD01PrescriptionDoc08012019.json | 0 .../RVMHD01PrescriptionDocument1.json | 0 .../RVMHD01PrescriptionDocument2.json | 0 .../RVMHD01PrescriptionDocument3.json | 0 .../RVMHD01PrescriptionDocument4.json | 0 .../SC1701FirstVisitDiagnosticReport.json | 0 .../ShriyaTMHFirstVisitConditionAndObs.json | 0 .../ShriyaTMHFirstVisitDiagnosticReport.json | 0 .../ShriyaTMHThirdVisitDiagnosticReports.json | 0 .../ShriyaTMHThirdVisitMedication.json | 0 .../ShriyaTMHThirdVisitObsWithRef.json | 0 .../Resources/bundleTemplate.json | 0 .../demoPatientCareContextDataMap.json | 0 .../Resources/demoPatients.json | 0 .../Resources/diagnosticReport.json | 0 ...ignosticReportWithMediaDicomFileAsUrl.json | 0 ...icReportWithPresentedFormPdfFileAsUrl.json | 0 .../Resources/observation.json | 0 .../Resources/patients.json | 0 .../In.ProjectEKA.DefaultHipTest.csproj | 2 +- 110 files changed, 185 insertions(+), 135 deletions(-) delete mode 100644 src/In.ProjectEKA.DefaultHip/DataFlow/Collect.cs rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/DataFlow/CareContextRecord.cs (100%) create mode 100644 src/In.ProjectEKA.NetworkHip/DataFlow/Collect.cs create mode 100644 src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkData.cs create mode 100644 src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataRequest.cs create mode 100644 src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataResponse.cs rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Discovery/PatientMatchingRepository.cs (100%) rename src/{In.ProjectEKA.DefaultHip/In.ProjectEKA.DefaultHip.csproj => In.ProjectEKA.NetworkHip/In.ProjectEKA.NetworkHip.csproj} (97%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Link/PatientRepository.cs (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXNCC1543DischargeSummaryDoc20190409.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXNCC1543DischargeSummaryDoc20190419.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXRVH9999DiagnosticReportDoc20160801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXRVH9999DiagnosticReportDoc20160803.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXRVH9999DischargeSummaryDoc20160801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXRVH9999DischargeSummaryDoc20160811.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXRVH9999OPConsultationDoc20160801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXRVH9999OPConsultationDoc20160803.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXRVH9999PrescriptionDoc20160801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXRVH9999PrescriptionDoc20160803.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXRVH9999PrescriptionDoc20160805.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/MAXRVH9999PrescriptionDoc20160807.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Patient/FileReader.cs (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/BI-KTH-12FirstVisitConditions.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXLIVNO09PrescriptionDoc20150801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXLIVNO10DiagnosticReportDoc20190801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXLIVNO10PrescriptionDoc20180801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXLIVNO11OPConsultationDoc20180801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXLIVNO11PrescriptionDoc20190801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXLIVNO14PrescriptionDoc20110801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXNCC1543DischargeSummaryDoc20190409.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXNCC1543DischargeSummaryDoc20190419.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXNCC1702PrescriptionDoc20180801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXNCC1702PrescriptionDoc20180803.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXNCC1702PrescriptionDoc20180805.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXNCP1702DiagnosticReportDoc20190101.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXNCP1702DiagnosticReportDoc20190103.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXRVH9999DiagnosticReportDoc20160801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXRVH9999DiagnosticReportDoc20160803.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXRVH9999DischargeSummaryDoc20160801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXRVH9999DischargeSummaryDoc20160811.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXRVH9999OPConsultationDoc20160801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXRVH9999OPConsultationDoc20160803.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXRVH9999PrescriptionDoc20160801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXRVH9999PrescriptionDoc20160803.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXRVH9999PrescriptionDoc20160805.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/MAXRVH9999PrescriptionDoc20160807.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1006DiagnosticReportWithRadiologyImageInline.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1006FirstVisitDiagnosticReports.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1006SecondVisitDiagnosticRepots.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1006ThirdVisitImagingStudy.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1007DiagnosticReportDocument.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1007DiagnosticReportDocument1.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1007DischargeSummary1.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1007DischargeSummary2.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1007PrescriptionDocument1.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1007PrescriptionDocument2.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1007PrescriptionDocument3.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008ClinicalDocumentComposition.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008DiagnosticReportDoc20191001.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008DiagnosticReportDoc20191003.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008DiagnosticReportDoc20191005.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008DiagnosticReportWithRadiologyImageInline.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008FifthVisitPrescription.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008FirstVisitCondition.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008FirstVisitDiagnosticReport.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008FirstVisitObservations.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008FourthVisitDocumentReference.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008NRCOPConsultationNote.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008PrescriptionDoc20190801.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008PrescriptionDoc20190803.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008PrescriptionDoc20190805.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008SecondVisitDiagnosticReport.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008SecondVisitMedications.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008SecondVisitObsWithMembers.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008ThirdVisitDischargeSummary.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1008WEBEMROPConsultationNote.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1702DischargeSummary20190203.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1702DischargeSummary20191003.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1702OPConsultationNote20200709.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/NCP1702OPConsultationNote20200710.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/RVMHD01PrescriptionDoc06012019.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/RVMHD01PrescriptionDoc06032019.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/RVMHD01PrescriptionDoc06052019.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/RVMHD01PrescriptionDoc06072019.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/RVMHD01PrescriptionDoc06092019.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/RVMHD01PrescriptionDoc08012019.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/RVMHD01PrescriptionDocument1.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/RVMHD01PrescriptionDocument2.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/RVMHD01PrescriptionDocument3.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/RVMHD01PrescriptionDocument4.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/SC1701FirstVisitDiagnosticReport.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/ShriyaTMHFirstVisitConditionAndObs.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/ShriyaTMHFirstVisitDiagnosticReport.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/ShriyaTMHThirdVisitDiagnosticReports.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/ShriyaTMHThirdVisitMedication.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/ShriyaTMHThirdVisitObsWithRef.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/bundleTemplate.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/demoPatientCareContextDataMap.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/demoPatients.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/diagnosticReport.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/dignosticReportWithMediaDicomFileAsUrl.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/dignosticReportWithPresentedFormPdfFileAsUrl.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/observation.json (100%) rename src/{In.ProjectEKA.DefaultHip => In.ProjectEKA.NetworkHip}/Resources/patients.json (100%) diff --git a/hip-service.sln b/hip-service.sln index 71c85c89..9df8fe4e 100644 --- a/hip-service.sln +++ b/hip-service.sln @@ -9,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C6699092-7 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.HipServiceTest", "test\In.ProjectEKA.HipServiceTest\In.ProjectEKA.HipServiceTest.csproj", "{B5A9C0B9-25EC-472E-B2CD-3EC5A69584F7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.DefaultHip", "src\In.ProjectEKA.DefaultHip\In.ProjectEKA.DefaultHip.csproj", "{23976B61-FBF9-41B8-AEA2-B70AD47F00A8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.NetworkHip", "src\In.ProjectEKA.NetworkHip\In.ProjectEKA.NetworkHip.csproj", "{23976B61-FBF9-41B8-AEA2-B70AD47F00A8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.DefaultHipTest", "test\In.ProjectEKA.DefaultHipTest\In.ProjectEKA.DefaultHipTest.csproj", "{4412373D-2E69-412A-8264-FA2806902173}" EndProject diff --git a/src/In.ProjectEKA.DefaultHip/DataFlow/Collect.cs b/src/In.ProjectEKA.DefaultHip/DataFlow/Collect.cs deleted file mode 100644 index 00e3d981..00000000 --- a/src/In.ProjectEKA.DefaultHip/DataFlow/Collect.cs +++ /dev/null @@ -1,127 +0,0 @@ -namespace In.ProjectEKA.DefaultHip.DataFlow -{ - using System; - using System.Collections.Generic; - using System.Globalization; - using System.IO; - using System.Linq; - using System.Threading.Tasks; - using HipLibrary.Patient; - using HipLibrary.Patient.Model; - using Hl7.Fhir.Model; - using Hl7.Fhir.Utility; - using Newtonsoft.Json; - using Optional; - using Patient; - using Serilog; - - public class Collect : ICollect - { - private readonly string careContextMapFile; - - public Collect(string careContextMapFile) - { - this.careContextMapFile = careContextMapFile; - } - - public async Task> CollectData(DataRequest dataRequest) - { - var bundles = new List(); - var patientData = FindPatientData(dataRequest); - var careContextReferences = patientData.Keys.ToList(); - foreach (var careContextReference in careContextReferences) - foreach (var result in patientData.GetOrDefault(careContextReference)) - { - Log.Information($"Returning file: {result}"); - bundles.Add(new CareBundle(careContextReference, await FileReader.ReadJsonAsync(result))); - } - - var entries = new Entries(bundles); - return Option.Some(entries); - } - - private static bool WithinRange(DateRange range, DateTime date) - { - var fromDate = ParseDate(range.From).AddHours(2); - var toDate = ParseDate(range.To); - return date > fromDate && date < toDate; - } - - private static DateTime ParseDate(string dateString) - { - var formatStrings = new[] - { - "yyyy-MM-dd", "yyyy-MM-dd hh:mm:ss", "yyyy-MM-dd hh:mm:ss tt", "yyyy-MM-ddTHH:mm:ss.fffzzz", - "yyyy-MM-dd'T'HH:mm:ss.fff", "yyyy-MM-dd'T'HH:mm:ss.ffff", "yyyy-MM-dd'T'HH:mm:ss.fffff", - "yyyy-MM-dd'T'HH:mm:ss", "yyyy-MM-dd'T'HH:mm:ss.ff", "yyyy-MM-dd'T'HH:mm:ss.ff", - "dd/MM/yyyy", "dd/MM/yyyy hh:mm:ss", "dd/MM/yyyy hh:mm:ss tt", "dd/MM/yyyyTHH:mm:ss.fffzzz", - "yyyy-MM-dd'T'HH:mm:ss.ffffff" - }; - var tryParseExact = DateTime.TryParseExact(dateString, - formatStrings, - CultureInfo.CurrentCulture, - DateTimeStyles.None, - out var aDateTime); - if (!tryParseExact) - Log.Error($"Error parsing date: {dateString}"); - - return aDateTime; - } - - private Dictionary> FindPatientData(DataRequest request) - { - try - { - LogDataRequest(request); - var jsonData = File.ReadAllText(careContextMapFile); - var patientDataMap = JsonConvert - .DeserializeObject>>>(jsonData); - - var careContextsAndListOfDataFiles = new Dictionary>(); - - foreach (var grantedContext in request.CareContexts) - { - var refData = patientDataMap[grantedContext.PatientReference]; - var ccData = refData?[grantedContext.CareContextReference]; - var listOfDataFiles = new List(); - if (ccData == null) continue; - // ReSharper disable once ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator - foreach (var ccRecord in ccData) - { - var captureTime = ParseDate(ccRecord.CapturedOn); - if (!WithinRange(request.DateRange, captureTime)) continue; - foreach (var hiType in request.HiType) - { - var hiTypeStr = hiType.ToString().ToLower(); - var dataFiles = ccRecord.Data.GetValueOrDefault(hiTypeStr) ?? new List(); - if (dataFiles.Count > 0) - listOfDataFiles.AddRange(dataFiles); - } - } - careContextsAndListOfDataFiles.Add(grantedContext.CareContextReference, listOfDataFiles); - } - - return careContextsAndListOfDataFiles; - } - catch (Exception e) - { - Log.Error("Error Occured while collecting data. {Error}", e); - } - - return new Dictionary>(); - } - - private static void LogDataRequest(DataRequest request) - { - var ccList = JsonConvert.SerializeObject(request.CareContexts); - var requestedHiTypes = string.Join(", ", request.HiType.Select(hiType => hiType.ToString())); - Log.Information("Data request received." + - $" transactionId:{request.TransactionId} , " + - $"CareContexts:{ccList}, " + - $"HiTypes:{requestedHiTypes}," + - $" From date:{request.DateRange.From}," + - $" To date:{request.DateRange.To}, " + - $"CallbackUrl:{request.DataPushUrl}"); - } - } -} \ No newline at end of file diff --git a/src/In.ProjectEKA.HipService/In.ProjectEKA.HipService.csproj b/src/In.ProjectEKA.HipService/In.ProjectEKA.HipService.csproj index 74ffeb4f..01e53d86 100644 --- a/src/In.ProjectEKA.HipService/In.ProjectEKA.HipService.csproj +++ b/src/In.ProjectEKA.HipService/In.ProjectEKA.HipService.csproj @@ -40,8 +40,8 @@ - + diff --git a/src/In.ProjectEKA.HipService/Startup.cs b/src/In.ProjectEKA.HipService/Startup.cs index 3017a5cb..f28ea711 100644 --- a/src/In.ProjectEKA.HipService/Startup.cs +++ b/src/In.ProjectEKA.HipService/Startup.cs @@ -81,7 +81,7 @@ public void ConfigureServices(IServiceCollection services) .AddHangfire(config => { config.UseMemoryStorage(); }) .AddSingleton() .AddSingleton(new PatientRepository("demoPatients.json")) - .AddSingleton(new Collect("demoPatientCareContextDataMap.json")) + .AddSingleton(new Collect("http://localhost:8003/getData", HttpClient)) .AddSingleton(new PatientRepository("demoPatients.json")) .AddRabbit(Configuration) .Configure(Configuration.GetSection("OtpService")) diff --git a/src/In.ProjectEKA.HipService/appsettings.Development.json b/src/In.ProjectEKA.HipService/appsettings.Development.json index 69b3bdbe..69320a63 100644 --- a/src/In.ProjectEKA.HipService/appsettings.Development.json +++ b/src/In.ProjectEKA.HipService/appsettings.Development.json @@ -2,10 +2,10 @@ "Serilog": { "Using": [], "MinimumLevel": { - "Default": "Debug", + "Default": "Information", "Override": { - "Microsoft": "Debug", - "System": "Debug" + "Microsoft": "Warning", + "System": "Information" } }, "Enrich": [ diff --git a/src/In.ProjectEKA.HipService/appsettings.json b/src/In.ProjectEKA.HipService/appsettings.json index c0111f9b..6d1ecb5c 100644 --- a/src/In.ProjectEKA.HipService/appsettings.json +++ b/src/In.ProjectEKA.HipService/appsettings.json @@ -5,7 +5,7 @@ "Default": "Information", "Override": { "Microsoft": "Warning", - "System": "Warning" + "System": "Information" } }, "Enrich": [ diff --git a/src/In.ProjectEKA.DefaultHip/DataFlow/CareContextRecord.cs b/src/In.ProjectEKA.NetworkHip/DataFlow/CareContextRecord.cs similarity index 100% rename from src/In.ProjectEKA.DefaultHip/DataFlow/CareContextRecord.cs rename to src/In.ProjectEKA.NetworkHip/DataFlow/CareContextRecord.cs diff --git a/src/In.ProjectEKA.NetworkHip/DataFlow/Collect.cs b/src/In.ProjectEKA.NetworkHip/DataFlow/Collect.cs new file mode 100644 index 00000000..ecdf16f7 --- /dev/null +++ b/src/In.ProjectEKA.NetworkHip/DataFlow/Collect.cs @@ -0,0 +1,124 @@ +namespace In.ProjectEKA.DefaultHip.DataFlow +{ + using System; + using System.Collections.Generic; + using System.IO; + using System.Linq; + using System.Net.Http; + using System.Net.Mime; + using System.Text; + using System.Threading.Tasks; + using HipLibrary.Patient; + using HipLibrary.Patient.Model; + using Hl7.Fhir.Model; + using Hl7.Fhir.Serialization; + using Hl7.Fhir.Utility; + using Model; + using Newtonsoft.Json; + using Newtonsoft.Json.Serialization; + using Optional; + using Patient; + using Serilog; + + public class Collect : ICollect + { + private readonly string HipSystemDataUrl; + private readonly HttpClient HttpClient; + + public Collect(string hipSystemDataUrl, HttpClient httpClient) + { + HipSystemDataUrl = hipSystemDataUrl; + HttpClient = httpClient; + } + + public async Task> CollectData(DataRequest dataRequest) + { + var bundles = new List(); + var patientData = await FindPatientsData(dataRequest); + var careContextReferences = patientData.Keys.ToList(); + foreach (var careContextReference in careContextReferences) + foreach (var result in patientData.GetOrDefault(careContextReference)) + { + Log.Information($"Returning file: {result}"); + var fjp = new FhirJsonParser(); + bundles.Add(new CareBundle(careContextReference, fjp.Parse(result))); + } + + var entries = new Entries(bundles); + return Option.Some(entries); + } + + private async Task>> FindPatientsData(DataRequest request) + { + // LogDataRequest(request); + + var patientReferenceNumber = request.CareContexts.First().PatientReference; + var careContexts = request.CareContexts.Select(careContext => careContext.CareContextReference).ToList(); + var dataResponse = await GetPatientsData(new NetworkDataRequest(patientReferenceNumber, + careContexts, + request.DateRange, + request.HiType)); + var structuredData = new Dictionary>(); + return dataResponse.Map(content => + { + foreach (var result in content.Results) + { + if (structuredData.ContainsKey(result.CareContext)) + { + structuredData[result.CareContext].Add(result.Data); + } + else + { + structuredData.Add(result.CareContext, new List {result.Data}); + } + } + return structuredData; + }).ValueOr(structuredData); + } + + private async Task> GetPatientsData(NetworkDataRequest networkDataRequest) + { + try + { + var json = JsonConvert.SerializeObject(networkDataRequest, new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore, + ContractResolver = new DefaultContractResolver + { + NamingStrategy = new CamelCaseNamingStrategy() + } + }); + var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, new Uri($"{HipSystemDataUrl}")) + { + Content = new StringContent(json, Encoding.UTF8, MediaTypeNames.Application.Json) + }; + var response = await HttpClient.SendAsync(httpRequestMessage).ConfigureAwait(false); + if (!response.IsSuccessStatusCode) + return Option.None(); + + var responseContent = response.Content; + using var reader = new StreamReader(await responseContent.ReadAsStreamAsync()); + var result = await reader.ReadToEndAsync().ConfigureAwait(false); + return Option.Some(JsonConvert.DeserializeObject(result)); + } + catch (Exception exception) + { + Log.Error(exception, exception.StackTrace); + return Option.None(); + } + } + + private static void LogDataRequest(DataRequest request) + { + var ccList = JsonConvert.SerializeObject(request.CareContexts); + var requestedHiTypes = string.Join(", ", request.HiType.Select(hiType => hiType.ToString())); + Log.Information("Data request received." + + $" transactionId:{request.TransactionId} , " + + $"CareContexts:{ccList}, " + + $"HiTypes:{requestedHiTypes}," + + $" From date:{request.DateRange.From}," + + $" To date:{request.DateRange.To}, " + + $"CallbackUrl:{request.DataPushUrl}"); + } + } +} \ No newline at end of file diff --git a/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkData.cs b/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkData.cs new file mode 100644 index 00000000..b37bbead --- /dev/null +++ b/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkData.cs @@ -0,0 +1,17 @@ +namespace In.ProjectEKA.DefaultHip.DataFlow.Model +{ + using HipLibrary.Patient.Model; + public class NetworkData + { + public string CareContext { get; set; } + public HiType HiType { get; set; } + public string Data { get; set; } + + public NetworkData(string careContext, HiType hiType, string data) + { + CareContext = careContext; + HiType = hiType; + Data = data; + } + } +} \ No newline at end of file diff --git a/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataRequest.cs b/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataRequest.cs new file mode 100644 index 00000000..970a498c --- /dev/null +++ b/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataRequest.cs @@ -0,0 +1,21 @@ +namespace In.ProjectEKA.DefaultHip.DataFlow.Model +{ + using System.Collections.Generic; + using HipLibrary.Patient.Model; + + public class NetworkDataRequest + { + public string PatientReference { get; set; } + public IEnumerable CareContexts { get; set; } + public DateRange DataRange { get; set; } + public IEnumerable HiTypes { get; set; } + + public NetworkDataRequest(string patientReference, IEnumerable careContexts, DateRange dataRange, IEnumerable hiTypes) + { + PatientReference = patientReference; + CareContexts = careContexts; + DataRange = dataRange; + HiTypes = hiTypes; + } + } +} \ No newline at end of file diff --git a/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataResponse.cs b/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataResponse.cs new file mode 100644 index 00000000..5355e34d --- /dev/null +++ b/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataResponse.cs @@ -0,0 +1,14 @@ +namespace In.ProjectEKA.DefaultHip.DataFlow.Model +{ + using System.Collections.Generic; + + public class NetworkDataResponse + { + public IEnumerable Results { get; set; } + + public NetworkDataResponse(IEnumerable results) + { + Results = results; + } + } +} \ No newline at end of file diff --git a/src/In.ProjectEKA.DefaultHip/Discovery/PatientMatchingRepository.cs b/src/In.ProjectEKA.NetworkHip/Discovery/PatientMatchingRepository.cs similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Discovery/PatientMatchingRepository.cs rename to src/In.ProjectEKA.NetworkHip/Discovery/PatientMatchingRepository.cs diff --git a/src/In.ProjectEKA.DefaultHip/In.ProjectEKA.DefaultHip.csproj b/src/In.ProjectEKA.NetworkHip/In.ProjectEKA.NetworkHip.csproj similarity index 97% rename from src/In.ProjectEKA.DefaultHip/In.ProjectEKA.DefaultHip.csproj rename to src/In.ProjectEKA.NetworkHip/In.ProjectEKA.NetworkHip.csproj index 1c804c41..67a47e7d 100644 --- a/src/In.ProjectEKA.DefaultHip/In.ProjectEKA.DefaultHip.csproj +++ b/src/In.ProjectEKA.NetworkHip/In.ProjectEKA.NetworkHip.csproj @@ -2,6 +2,7 @@ netcoreapp3.1 + In.ProjectEKA.DefaultHip diff --git a/src/In.ProjectEKA.DefaultHip/Link/PatientRepository.cs b/src/In.ProjectEKA.NetworkHip/Link/PatientRepository.cs similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Link/PatientRepository.cs rename to src/In.ProjectEKA.NetworkHip/Link/PatientRepository.cs diff --git a/src/In.ProjectEKA.DefaultHip/MAXNCC1543DischargeSummaryDoc20190409.json b/src/In.ProjectEKA.NetworkHip/MAXNCC1543DischargeSummaryDoc20190409.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXNCC1543DischargeSummaryDoc20190409.json rename to src/In.ProjectEKA.NetworkHip/MAXNCC1543DischargeSummaryDoc20190409.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXNCC1543DischargeSummaryDoc20190419.json b/src/In.ProjectEKA.NetworkHip/MAXNCC1543DischargeSummaryDoc20190419.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXNCC1543DischargeSummaryDoc20190419.json rename to src/In.ProjectEKA.NetworkHip/MAXNCC1543DischargeSummaryDoc20190419.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXRVH9999DiagnosticReportDoc20160801.json b/src/In.ProjectEKA.NetworkHip/MAXRVH9999DiagnosticReportDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXRVH9999DiagnosticReportDoc20160801.json rename to src/In.ProjectEKA.NetworkHip/MAXRVH9999DiagnosticReportDoc20160801.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXRVH9999DiagnosticReportDoc20160803.json b/src/In.ProjectEKA.NetworkHip/MAXRVH9999DiagnosticReportDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXRVH9999DiagnosticReportDoc20160803.json rename to src/In.ProjectEKA.NetworkHip/MAXRVH9999DiagnosticReportDoc20160803.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXRVH9999DischargeSummaryDoc20160801.json b/src/In.ProjectEKA.NetworkHip/MAXRVH9999DischargeSummaryDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXRVH9999DischargeSummaryDoc20160801.json rename to src/In.ProjectEKA.NetworkHip/MAXRVH9999DischargeSummaryDoc20160801.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXRVH9999DischargeSummaryDoc20160811.json b/src/In.ProjectEKA.NetworkHip/MAXRVH9999DischargeSummaryDoc20160811.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXRVH9999DischargeSummaryDoc20160811.json rename to src/In.ProjectEKA.NetworkHip/MAXRVH9999DischargeSummaryDoc20160811.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXRVH9999OPConsultationDoc20160801.json b/src/In.ProjectEKA.NetworkHip/MAXRVH9999OPConsultationDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXRVH9999OPConsultationDoc20160801.json rename to src/In.ProjectEKA.NetworkHip/MAXRVH9999OPConsultationDoc20160801.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXRVH9999OPConsultationDoc20160803.json b/src/In.ProjectEKA.NetworkHip/MAXRVH9999OPConsultationDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXRVH9999OPConsultationDoc20160803.json rename to src/In.ProjectEKA.NetworkHip/MAXRVH9999OPConsultationDoc20160803.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXRVH9999PrescriptionDoc20160801.json b/src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXRVH9999PrescriptionDoc20160801.json rename to src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160801.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXRVH9999PrescriptionDoc20160803.json b/src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXRVH9999PrescriptionDoc20160803.json rename to src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160803.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXRVH9999PrescriptionDoc20160805.json b/src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160805.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXRVH9999PrescriptionDoc20160805.json rename to src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160805.json diff --git a/src/In.ProjectEKA.DefaultHip/MAXRVH9999PrescriptionDoc20160807.json b/src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160807.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/MAXRVH9999PrescriptionDoc20160807.json rename to src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160807.json diff --git a/src/In.ProjectEKA.DefaultHip/Patient/FileReader.cs b/src/In.ProjectEKA.NetworkHip/Patient/FileReader.cs similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Patient/FileReader.cs rename to src/In.ProjectEKA.NetworkHip/Patient/FileReader.cs diff --git a/src/In.ProjectEKA.DefaultHip/Resources/BI-KTH-12FirstVisitConditions.json b/src/In.ProjectEKA.NetworkHip/Resources/BI-KTH-12FirstVisitConditions.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/BI-KTH-12FirstVisitConditions.json rename to src/In.ProjectEKA.NetworkHip/Resources/BI-KTH-12FirstVisitConditions.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO09PrescriptionDoc20150801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO09PrescriptionDoc20150801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO09PrescriptionDoc20150801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO09PrescriptionDoc20150801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO10DiagnosticReportDoc20190801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO10DiagnosticReportDoc20190801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO10DiagnosticReportDoc20190801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO10DiagnosticReportDoc20190801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO10PrescriptionDoc20180801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO10PrescriptionDoc20180801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO10PrescriptionDoc20180801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO10PrescriptionDoc20180801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO11OPConsultationDoc20180801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO11OPConsultationDoc20180801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO11OPConsultationDoc20180801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO11OPConsultationDoc20180801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO11PrescriptionDoc20190801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO11PrescriptionDoc20190801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO11PrescriptionDoc20190801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO11PrescriptionDoc20190801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO14PrescriptionDoc20110801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO14PrescriptionDoc20110801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXLIVNO14PrescriptionDoc20110801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO14PrescriptionDoc20110801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXNCC1543DischargeSummaryDoc20190409.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1543DischargeSummaryDoc20190409.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXNCC1543DischargeSummaryDoc20190409.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1543DischargeSummaryDoc20190409.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXNCC1543DischargeSummaryDoc20190419.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1543DischargeSummaryDoc20190419.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXNCC1543DischargeSummaryDoc20190419.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1543DischargeSummaryDoc20190419.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXNCC1702PrescriptionDoc20180801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXNCC1702PrescriptionDoc20180801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXNCC1702PrescriptionDoc20180803.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180803.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXNCC1702PrescriptionDoc20180803.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180803.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXNCC1702PrescriptionDoc20180805.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180805.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXNCC1702PrescriptionDoc20180805.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180805.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXNCP1702DiagnosticReportDoc20190101.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXNCP1702DiagnosticReportDoc20190101.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXNCP1702DiagnosticReportDoc20190101.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXNCP1702DiagnosticReportDoc20190101.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXNCP1702DiagnosticReportDoc20190103.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXNCP1702DiagnosticReportDoc20190103.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXNCP1702DiagnosticReportDoc20190103.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXNCP1702DiagnosticReportDoc20190103.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999DiagnosticReportDoc20160801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DiagnosticReportDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999DiagnosticReportDoc20160801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DiagnosticReportDoc20160801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999DiagnosticReportDoc20160803.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DiagnosticReportDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999DiagnosticReportDoc20160803.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DiagnosticReportDoc20160803.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999DischargeSummaryDoc20160801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DischargeSummaryDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999DischargeSummaryDoc20160801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DischargeSummaryDoc20160801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999DischargeSummaryDoc20160811.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DischargeSummaryDoc20160811.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999DischargeSummaryDoc20160811.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DischargeSummaryDoc20160811.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999OPConsultationDoc20160801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999OPConsultationDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999OPConsultationDoc20160801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999OPConsultationDoc20160801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999OPConsultationDoc20160803.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999OPConsultationDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999OPConsultationDoc20160803.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999OPConsultationDoc20160803.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999PrescriptionDoc20160801.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999PrescriptionDoc20160801.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999PrescriptionDoc20160803.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999PrescriptionDoc20160803.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160803.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999PrescriptionDoc20160805.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160805.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999PrescriptionDoc20160805.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160805.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999PrescriptionDoc20160807.json b/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160807.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/MAXRVH9999PrescriptionDoc20160807.json rename to src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160807.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1006DiagnosticReportWithRadiologyImageInline.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1006DiagnosticReportWithRadiologyImageInline.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1006DiagnosticReportWithRadiologyImageInline.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1006DiagnosticReportWithRadiologyImageInline.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1006FirstVisitDiagnosticReports.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1006FirstVisitDiagnosticReports.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1006FirstVisitDiagnosticReports.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1006FirstVisitDiagnosticReports.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1006SecondVisitDiagnosticRepots.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1006SecondVisitDiagnosticRepots.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1006SecondVisitDiagnosticRepots.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1006SecondVisitDiagnosticRepots.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1006ThirdVisitImagingStudy.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1006ThirdVisitImagingStudy.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1006ThirdVisitImagingStudy.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1006ThirdVisitImagingStudy.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1007DiagnosticReportDocument.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1007DiagnosticReportDocument.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1007DiagnosticReportDocument.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1007DiagnosticReportDocument.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1007DiagnosticReportDocument1.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1007DiagnosticReportDocument1.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1007DiagnosticReportDocument1.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1007DiagnosticReportDocument1.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1007DischargeSummary1.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1007DischargeSummary1.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1007DischargeSummary1.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1007DischargeSummary1.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1007DischargeSummary2.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1007DischargeSummary2.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1007DischargeSummary2.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1007DischargeSummary2.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1007PrescriptionDocument1.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument1.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1007PrescriptionDocument1.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument1.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1007PrescriptionDocument2.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument2.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1007PrescriptionDocument2.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument2.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1007PrescriptionDocument3.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument3.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1007PrescriptionDocument3.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument3.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008ClinicalDocumentComposition.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008ClinicalDocumentComposition.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008ClinicalDocumentComposition.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008ClinicalDocumentComposition.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008DiagnosticReportDoc20191001.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191001.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008DiagnosticReportDoc20191001.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191001.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008DiagnosticReportDoc20191003.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191003.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008DiagnosticReportDoc20191003.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191003.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008DiagnosticReportDoc20191005.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191005.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008DiagnosticReportDoc20191005.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191005.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008DiagnosticReportWithRadiologyImageInline.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportWithRadiologyImageInline.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008DiagnosticReportWithRadiologyImageInline.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportWithRadiologyImageInline.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008FifthVisitPrescription.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008FifthVisitPrescription.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008FifthVisitPrescription.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008FifthVisitPrescription.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008FirstVisitCondition.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitCondition.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008FirstVisitCondition.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitCondition.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008FirstVisitDiagnosticReport.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitDiagnosticReport.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008FirstVisitDiagnosticReport.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitDiagnosticReport.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008FirstVisitObservations.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitObservations.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008FirstVisitObservations.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitObservations.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008FourthVisitDocumentReference.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008FourthVisitDocumentReference.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008FourthVisitDocumentReference.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008FourthVisitDocumentReference.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008NRCOPConsultationNote.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008NRCOPConsultationNote.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008NRCOPConsultationNote.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008NRCOPConsultationNote.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008PrescriptionDoc20190801.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190801.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008PrescriptionDoc20190801.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190801.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008PrescriptionDoc20190803.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190803.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008PrescriptionDoc20190803.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190803.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008PrescriptionDoc20190805.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190805.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008PrescriptionDoc20190805.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190805.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008SecondVisitDiagnosticReport.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitDiagnosticReport.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008SecondVisitDiagnosticReport.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitDiagnosticReport.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008SecondVisitMedications.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitMedications.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008SecondVisitMedications.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitMedications.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008SecondVisitObsWithMembers.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitObsWithMembers.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008SecondVisitObsWithMembers.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitObsWithMembers.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008ThirdVisitDischargeSummary.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008ThirdVisitDischargeSummary.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008ThirdVisitDischargeSummary.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008ThirdVisitDischargeSummary.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1008WEBEMROPConsultationNote.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1008WEBEMROPConsultationNote.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1008WEBEMROPConsultationNote.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1008WEBEMROPConsultationNote.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1702DischargeSummary20190203.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1702DischargeSummary20190203.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1702DischargeSummary20190203.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1702DischargeSummary20190203.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1702DischargeSummary20191003.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1702DischargeSummary20191003.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1702DischargeSummary20191003.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1702DischargeSummary20191003.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1702OPConsultationNote20200709.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1702OPConsultationNote20200709.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1702OPConsultationNote20200709.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1702OPConsultationNote20200709.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/NCP1702OPConsultationNote20200710.json b/src/In.ProjectEKA.NetworkHip/Resources/NCP1702OPConsultationNote20200710.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/NCP1702OPConsultationNote20200710.json rename to src/In.ProjectEKA.NetworkHip/Resources/NCP1702OPConsultationNote20200710.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc06012019.json b/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06012019.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc06012019.json rename to src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06012019.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc06032019.json b/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06032019.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc06032019.json rename to src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06032019.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc06052019.json b/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06052019.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc06052019.json rename to src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06052019.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc06072019.json b/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06072019.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc06072019.json rename to src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06072019.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc06092019.json b/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06092019.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc06092019.json rename to src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06092019.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc08012019.json b/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc08012019.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDoc08012019.json rename to src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc08012019.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDocument1.json b/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument1.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDocument1.json rename to src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument1.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDocument2.json b/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument2.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDocument2.json rename to src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument2.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDocument3.json b/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument3.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDocument3.json rename to src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument3.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDocument4.json b/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument4.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/RVMHD01PrescriptionDocument4.json rename to src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument4.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/SC1701FirstVisitDiagnosticReport.json b/src/In.ProjectEKA.NetworkHip/Resources/SC1701FirstVisitDiagnosticReport.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/SC1701FirstVisitDiagnosticReport.json rename to src/In.ProjectEKA.NetworkHip/Resources/SC1701FirstVisitDiagnosticReport.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/ShriyaTMHFirstVisitConditionAndObs.json b/src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHFirstVisitConditionAndObs.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/ShriyaTMHFirstVisitConditionAndObs.json rename to src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHFirstVisitConditionAndObs.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/ShriyaTMHFirstVisitDiagnosticReport.json b/src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHFirstVisitDiagnosticReport.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/ShriyaTMHFirstVisitDiagnosticReport.json rename to src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHFirstVisitDiagnosticReport.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/ShriyaTMHThirdVisitDiagnosticReports.json b/src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitDiagnosticReports.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/ShriyaTMHThirdVisitDiagnosticReports.json rename to src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitDiagnosticReports.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/ShriyaTMHThirdVisitMedication.json b/src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitMedication.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/ShriyaTMHThirdVisitMedication.json rename to src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitMedication.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/ShriyaTMHThirdVisitObsWithRef.json b/src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitObsWithRef.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/ShriyaTMHThirdVisitObsWithRef.json rename to src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitObsWithRef.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/bundleTemplate.json b/src/In.ProjectEKA.NetworkHip/Resources/bundleTemplate.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/bundleTemplate.json rename to src/In.ProjectEKA.NetworkHip/Resources/bundleTemplate.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/demoPatientCareContextDataMap.json b/src/In.ProjectEKA.NetworkHip/Resources/demoPatientCareContextDataMap.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/demoPatientCareContextDataMap.json rename to src/In.ProjectEKA.NetworkHip/Resources/demoPatientCareContextDataMap.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/demoPatients.json b/src/In.ProjectEKA.NetworkHip/Resources/demoPatients.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/demoPatients.json rename to src/In.ProjectEKA.NetworkHip/Resources/demoPatients.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/diagnosticReport.json b/src/In.ProjectEKA.NetworkHip/Resources/diagnosticReport.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/diagnosticReport.json rename to src/In.ProjectEKA.NetworkHip/Resources/diagnosticReport.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/dignosticReportWithMediaDicomFileAsUrl.json b/src/In.ProjectEKA.NetworkHip/Resources/dignosticReportWithMediaDicomFileAsUrl.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/dignosticReportWithMediaDicomFileAsUrl.json rename to src/In.ProjectEKA.NetworkHip/Resources/dignosticReportWithMediaDicomFileAsUrl.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/dignosticReportWithPresentedFormPdfFileAsUrl.json b/src/In.ProjectEKA.NetworkHip/Resources/dignosticReportWithPresentedFormPdfFileAsUrl.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/dignosticReportWithPresentedFormPdfFileAsUrl.json rename to src/In.ProjectEKA.NetworkHip/Resources/dignosticReportWithPresentedFormPdfFileAsUrl.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/observation.json b/src/In.ProjectEKA.NetworkHip/Resources/observation.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/observation.json rename to src/In.ProjectEKA.NetworkHip/Resources/observation.json diff --git a/src/In.ProjectEKA.DefaultHip/Resources/patients.json b/src/In.ProjectEKA.NetworkHip/Resources/patients.json similarity index 100% rename from src/In.ProjectEKA.DefaultHip/Resources/patients.json rename to src/In.ProjectEKA.NetworkHip/Resources/patients.json diff --git a/test/In.ProjectEKA.DefaultHipTest/In.ProjectEKA.DefaultHipTest.csproj b/test/In.ProjectEKA.DefaultHipTest/In.ProjectEKA.DefaultHipTest.csproj index 40d4d379..eeadd6e2 100644 --- a/test/In.ProjectEKA.DefaultHipTest/In.ProjectEKA.DefaultHipTest.csproj +++ b/test/In.ProjectEKA.DefaultHipTest/In.ProjectEKA.DefaultHipTest.csproj @@ -21,7 +21,7 @@ - + From 534a294a11e445142459a23fae0f41f671148d6c Mon Sep 17 00:00:00 2001 From: nexengineer Date: Thu, 20 Aug 2020 14:53:53 +0530 Subject: [PATCH 02/10] Fixing test case --- hip-service.sln | 4 ++-- .../DataFlow/CareContextRecord.cs | 0 .../DataFlow/Collect.cs | 0 .../DataFlow/Model/NetworkData.cs | 0 .../DataFlow/Model/NetworkDataRequest.cs | 0 .../DataFlow/Model/NetworkDataResponse.cs | 0 .../Discovery/PatientMatchingRepository.cs | 0 .../In.ProjectEKA.FHIRHip.csproj} | 0 .../Link/PatientRepository.cs | 0 .../MAXNCC1543DischargeSummaryDoc20190409.json | 0 .../MAXNCC1543DischargeSummaryDoc20190419.json | 0 .../MAXRVH9999DiagnosticReportDoc20160801.json | 0 .../MAXRVH9999DiagnosticReportDoc20160803.json | 0 .../MAXRVH9999DischargeSummaryDoc20160801.json | 0 .../MAXRVH9999DischargeSummaryDoc20160811.json | 0 .../MAXRVH9999OPConsultationDoc20160801.json | 0 .../MAXRVH9999OPConsultationDoc20160803.json | 0 .../MAXRVH9999PrescriptionDoc20160801.json | 0 .../MAXRVH9999PrescriptionDoc20160803.json | 0 .../MAXRVH9999PrescriptionDoc20160805.json | 0 .../MAXRVH9999PrescriptionDoc20160807.json | 0 .../Patient/FileReader.cs | 0 .../Resources/BI-KTH-12FirstVisitConditions.json | 0 .../Resources/MAXLIVNO09PrescriptionDoc20150801.json | 0 .../Resources/MAXLIVNO10DiagnosticReportDoc20190801.json | 0 .../Resources/MAXLIVNO10PrescriptionDoc20180801.json | 0 .../Resources/MAXLIVNO11OPConsultationDoc20180801.json | 0 .../Resources/MAXLIVNO11PrescriptionDoc20190801.json | 0 .../Resources/MAXLIVNO14PrescriptionDoc20110801.json | 0 .../Resources/MAXNCC1543DischargeSummaryDoc20190409.json | 0 .../Resources/MAXNCC1543DischargeSummaryDoc20190419.json | 0 .../Resources/MAXNCC1702PrescriptionDoc20180801.json | 0 .../Resources/MAXNCC1702PrescriptionDoc20180803.json | 0 .../Resources/MAXNCC1702PrescriptionDoc20180805.json | 0 .../Resources/MAXNCP1702DiagnosticReportDoc20190101.json | 0 .../Resources/MAXNCP1702DiagnosticReportDoc20190103.json | 0 .../Resources/MAXRVH9999DiagnosticReportDoc20160801.json | 0 .../Resources/MAXRVH9999DiagnosticReportDoc20160803.json | 0 .../Resources/MAXRVH9999DischargeSummaryDoc20160801.json | 0 .../Resources/MAXRVH9999DischargeSummaryDoc20160811.json | 0 .../Resources/MAXRVH9999OPConsultationDoc20160801.json | 0 .../Resources/MAXRVH9999OPConsultationDoc20160803.json | 0 .../Resources/MAXRVH9999PrescriptionDoc20160801.json | 0 .../Resources/MAXRVH9999PrescriptionDoc20160803.json | 0 .../Resources/MAXRVH9999PrescriptionDoc20160805.json | 0 .../Resources/MAXRVH9999PrescriptionDoc20160807.json | 0 .../NCP1006DiagnosticReportWithRadiologyImageInline.json | 0 .../Resources/NCP1006FirstVisitDiagnosticReports.json | 0 .../Resources/NCP1006SecondVisitDiagnosticRepots.json | 0 .../Resources/NCP1006ThirdVisitImagingStudy.json | 0 .../Resources/NCP1007DiagnosticReportDocument.json | 0 .../Resources/NCP1007DiagnosticReportDocument1.json | 0 .../Resources/NCP1007DischargeSummary1.json | 0 .../Resources/NCP1007DischargeSummary2.json | 0 .../Resources/NCP1007PrescriptionDocument1.json | 0 .../Resources/NCP1007PrescriptionDocument2.json | 0 .../Resources/NCP1007PrescriptionDocument3.json | 0 .../Resources/NCP1008ClinicalDocumentComposition.json | 0 .../Resources/NCP1008DiagnosticReportDoc20191001.json | 0 .../Resources/NCP1008DiagnosticReportDoc20191003.json | 0 .../Resources/NCP1008DiagnosticReportDoc20191005.json | 0 .../NCP1008DiagnosticReportWithRadiologyImageInline.json | 0 .../Resources/NCP1008FifthVisitPrescription.json | 0 .../Resources/NCP1008FirstVisitCondition.json | 0 .../Resources/NCP1008FirstVisitDiagnosticReport.json | 0 .../Resources/NCP1008FirstVisitObservations.json | 0 .../Resources/NCP1008FourthVisitDocumentReference.json | 0 .../Resources/NCP1008NRCOPConsultationNote.json | 0 .../Resources/NCP1008PrescriptionDoc20190801.json | 0 .../Resources/NCP1008PrescriptionDoc20190803.json | 0 .../Resources/NCP1008PrescriptionDoc20190805.json | 0 .../Resources/NCP1008SecondVisitDiagnosticReport.json | 0 .../Resources/NCP1008SecondVisitMedications.json | 0 .../Resources/NCP1008SecondVisitObsWithMembers.json | 0 .../Resources/NCP1008ThirdVisitDischargeSummary.json | 0 .../Resources/NCP1008WEBEMROPConsultationNote.json | 0 .../Resources/NCP1702DischargeSummary20190203.json | 0 .../Resources/NCP1702DischargeSummary20191003.json | 0 .../Resources/NCP1702OPConsultationNote20200709.json | 0 .../Resources/NCP1702OPConsultationNote20200710.json | 0 .../Resources/RVMHD01PrescriptionDoc06012019.json | 0 .../Resources/RVMHD01PrescriptionDoc06032019.json | 0 .../Resources/RVMHD01PrescriptionDoc06052019.json | 0 .../Resources/RVMHD01PrescriptionDoc06072019.json | 0 .../Resources/RVMHD01PrescriptionDoc06092019.json | 0 .../Resources/RVMHD01PrescriptionDoc08012019.json | 0 .../Resources/RVMHD01PrescriptionDocument1.json | 0 .../Resources/RVMHD01PrescriptionDocument2.json | 0 .../Resources/RVMHD01PrescriptionDocument3.json | 0 .../Resources/RVMHD01PrescriptionDocument4.json | 0 .../Resources/SC1701FirstVisitDiagnosticReport.json | 0 .../Resources/ShriyaTMHFirstVisitConditionAndObs.json | 0 .../Resources/ShriyaTMHFirstVisitDiagnosticReport.json | 0 .../Resources/ShriyaTMHThirdVisitDiagnosticReports.json | 0 .../Resources/ShriyaTMHThirdVisitMedication.json | 0 .../Resources/ShriyaTMHThirdVisitObsWithRef.json | 0 .../Resources/bundleTemplate.json | 0 .../Resources/demoPatientCareContextDataMap.json | 0 .../Resources/demoPatients.json | 0 .../Resources/diagnosticReport.json | 0 .../Resources/dignosticReportWithMediaDicomFileAsUrl.json | 0 .../dignosticReportWithPresentedFormPdfFileAsUrl.json | 0 .../Resources/observation.json | 0 .../Resources/patients.json | 0 src/In.ProjectEKA.HipService/In.ProjectEKA.HipService.csproj | 2 +- .../DataFlow/CollectTest.cs | 0 .../Discovery/PatientMatchingRepositoryTest.cs | 0 .../In.ProjectEKA.FHIRHipTest.csproj} | 3 ++- .../Link/PatientRepositoryTest.cs | 0 109 files changed, 5 insertions(+), 4 deletions(-) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/DataFlow/CareContextRecord.cs (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/DataFlow/Collect.cs (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/DataFlow/Model/NetworkData.cs (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/DataFlow/Model/NetworkDataRequest.cs (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/DataFlow/Model/NetworkDataResponse.cs (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Discovery/PatientMatchingRepository.cs (100%) rename src/{In.ProjectEKA.NetworkHip/In.ProjectEKA.NetworkHip.csproj => In.ProjectEKA.FHIRHip/In.ProjectEKA.FHIRHip.csproj} (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Link/PatientRepository.cs (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXNCC1543DischargeSummaryDoc20190409.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXNCC1543DischargeSummaryDoc20190419.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXRVH9999DiagnosticReportDoc20160801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXRVH9999DiagnosticReportDoc20160803.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXRVH9999DischargeSummaryDoc20160801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXRVH9999DischargeSummaryDoc20160811.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXRVH9999OPConsultationDoc20160801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXRVH9999OPConsultationDoc20160803.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXRVH9999PrescriptionDoc20160801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXRVH9999PrescriptionDoc20160803.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXRVH9999PrescriptionDoc20160805.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/MAXRVH9999PrescriptionDoc20160807.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Patient/FileReader.cs (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/BI-KTH-12FirstVisitConditions.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXLIVNO09PrescriptionDoc20150801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXLIVNO10DiagnosticReportDoc20190801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXLIVNO10PrescriptionDoc20180801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXLIVNO11OPConsultationDoc20180801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXLIVNO11PrescriptionDoc20190801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXLIVNO14PrescriptionDoc20110801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXNCC1543DischargeSummaryDoc20190409.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXNCC1543DischargeSummaryDoc20190419.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXNCC1702PrescriptionDoc20180801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXNCC1702PrescriptionDoc20180803.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXNCC1702PrescriptionDoc20180805.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXNCP1702DiagnosticReportDoc20190101.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXNCP1702DiagnosticReportDoc20190103.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXRVH9999DiagnosticReportDoc20160801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXRVH9999DiagnosticReportDoc20160803.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXRVH9999DischargeSummaryDoc20160801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXRVH9999DischargeSummaryDoc20160811.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXRVH9999OPConsultationDoc20160801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXRVH9999OPConsultationDoc20160803.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXRVH9999PrescriptionDoc20160801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXRVH9999PrescriptionDoc20160803.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXRVH9999PrescriptionDoc20160805.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/MAXRVH9999PrescriptionDoc20160807.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1006DiagnosticReportWithRadiologyImageInline.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1006FirstVisitDiagnosticReports.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1006SecondVisitDiagnosticRepots.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1006ThirdVisitImagingStudy.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1007DiagnosticReportDocument.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1007DiagnosticReportDocument1.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1007DischargeSummary1.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1007DischargeSummary2.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1007PrescriptionDocument1.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1007PrescriptionDocument2.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1007PrescriptionDocument3.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008ClinicalDocumentComposition.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008DiagnosticReportDoc20191001.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008DiagnosticReportDoc20191003.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008DiagnosticReportDoc20191005.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008DiagnosticReportWithRadiologyImageInline.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008FifthVisitPrescription.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008FirstVisitCondition.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008FirstVisitDiagnosticReport.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008FirstVisitObservations.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008FourthVisitDocumentReference.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008NRCOPConsultationNote.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008PrescriptionDoc20190801.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008PrescriptionDoc20190803.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008PrescriptionDoc20190805.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008SecondVisitDiagnosticReport.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008SecondVisitMedications.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008SecondVisitObsWithMembers.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008ThirdVisitDischargeSummary.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1008WEBEMROPConsultationNote.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1702DischargeSummary20190203.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1702DischargeSummary20191003.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1702OPConsultationNote20200709.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/NCP1702OPConsultationNote20200710.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/RVMHD01PrescriptionDoc06012019.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/RVMHD01PrescriptionDoc06032019.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/RVMHD01PrescriptionDoc06052019.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/RVMHD01PrescriptionDoc06072019.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/RVMHD01PrescriptionDoc06092019.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/RVMHD01PrescriptionDoc08012019.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/RVMHD01PrescriptionDocument1.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/RVMHD01PrescriptionDocument2.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/RVMHD01PrescriptionDocument3.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/RVMHD01PrescriptionDocument4.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/SC1701FirstVisitDiagnosticReport.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/ShriyaTMHFirstVisitConditionAndObs.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/ShriyaTMHFirstVisitDiagnosticReport.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/ShriyaTMHThirdVisitDiagnosticReports.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/ShriyaTMHThirdVisitMedication.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/ShriyaTMHThirdVisitObsWithRef.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/bundleTemplate.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/demoPatientCareContextDataMap.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/demoPatients.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/diagnosticReport.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/dignosticReportWithMediaDicomFileAsUrl.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/dignosticReportWithPresentedFormPdfFileAsUrl.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/observation.json (100%) rename src/{In.ProjectEKA.NetworkHip => In.ProjectEKA.FHIRHip}/Resources/patients.json (100%) rename test/{In.ProjectEKA.DefaultHipTest => In.ProjectEKA.FHIRHipTest}/DataFlow/CollectTest.cs (100%) rename test/{In.ProjectEKA.DefaultHipTest => In.ProjectEKA.FHIRHipTest}/Discovery/PatientMatchingRepositoryTest.cs (100%) rename test/{In.ProjectEKA.DefaultHipTest/In.ProjectEKA.DefaultHipTest.csproj => In.ProjectEKA.FHIRHipTest/In.ProjectEKA.FHIRHipTest.csproj} (85%) rename test/{In.ProjectEKA.DefaultHipTest => In.ProjectEKA.FHIRHipTest}/Link/PatientRepositoryTest.cs (100%) diff --git a/hip-service.sln b/hip-service.sln index 9df8fe4e..58665f62 100644 --- a/hip-service.sln +++ b/hip-service.sln @@ -9,9 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C6699092-7 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.HipServiceTest", "test\In.ProjectEKA.HipServiceTest\In.ProjectEKA.HipServiceTest.csproj", "{B5A9C0B9-25EC-472E-B2CD-3EC5A69584F7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.NetworkHip", "src\In.ProjectEKA.NetworkHip\In.ProjectEKA.NetworkHip.csproj", "{23976B61-FBF9-41B8-AEA2-B70AD47F00A8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.FHIRHip", "src\In.ProjectEKA.FHIRHip\In.ProjectEKA.FHIRHip.csproj", "{23976B61-FBF9-41B8-AEA2-B70AD47F00A8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.DefaultHipTest", "test\In.ProjectEKA.DefaultHipTest\In.ProjectEKA.DefaultHipTest.csproj", "{4412373D-2E69-412A-8264-FA2806902173}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.FHIRHipTest", "test\In.ProjectEKA.FHIRHipTest\In.ProjectEKA.FHIRHipTest.csproj", "{4412373D-2E69-412A-8264-FA2806902173}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.HipLibrary", "src\In.ProjectEKA.HipLibrary\In.ProjectEKA.HipLibrary.csproj", "{40B6794D-AA65-4B3D-B929-0180CA40E3D6}" EndProject diff --git a/src/In.ProjectEKA.NetworkHip/DataFlow/CareContextRecord.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/CareContextRecord.cs similarity index 100% rename from src/In.ProjectEKA.NetworkHip/DataFlow/CareContextRecord.cs rename to src/In.ProjectEKA.FHIRHip/DataFlow/CareContextRecord.cs diff --git a/src/In.ProjectEKA.NetworkHip/DataFlow/Collect.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs similarity index 100% rename from src/In.ProjectEKA.NetworkHip/DataFlow/Collect.cs rename to src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs diff --git a/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkData.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs similarity index 100% rename from src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkData.cs rename to src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs diff --git a/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataRequest.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataRequest.cs similarity index 100% rename from src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataRequest.cs rename to src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataRequest.cs diff --git a/src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataResponse.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataResponse.cs similarity index 100% rename from src/In.ProjectEKA.NetworkHip/DataFlow/Model/NetworkDataResponse.cs rename to src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataResponse.cs diff --git a/src/In.ProjectEKA.NetworkHip/Discovery/PatientMatchingRepository.cs b/src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Discovery/PatientMatchingRepository.cs rename to src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs diff --git a/src/In.ProjectEKA.NetworkHip/In.ProjectEKA.NetworkHip.csproj b/src/In.ProjectEKA.FHIRHip/In.ProjectEKA.FHIRHip.csproj similarity index 100% rename from src/In.ProjectEKA.NetworkHip/In.ProjectEKA.NetworkHip.csproj rename to src/In.ProjectEKA.FHIRHip/In.ProjectEKA.FHIRHip.csproj diff --git a/src/In.ProjectEKA.NetworkHip/Link/PatientRepository.cs b/src/In.ProjectEKA.FHIRHip/Link/PatientRepository.cs similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Link/PatientRepository.cs rename to src/In.ProjectEKA.FHIRHip/Link/PatientRepository.cs diff --git a/src/In.ProjectEKA.NetworkHip/MAXNCC1543DischargeSummaryDoc20190409.json b/src/In.ProjectEKA.FHIRHip/MAXNCC1543DischargeSummaryDoc20190409.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXNCC1543DischargeSummaryDoc20190409.json rename to src/In.ProjectEKA.FHIRHip/MAXNCC1543DischargeSummaryDoc20190409.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXNCC1543DischargeSummaryDoc20190419.json b/src/In.ProjectEKA.FHIRHip/MAXNCC1543DischargeSummaryDoc20190419.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXNCC1543DischargeSummaryDoc20190419.json rename to src/In.ProjectEKA.FHIRHip/MAXNCC1543DischargeSummaryDoc20190419.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXRVH9999DiagnosticReportDoc20160801.json b/src/In.ProjectEKA.FHIRHip/MAXRVH9999DiagnosticReportDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXRVH9999DiagnosticReportDoc20160801.json rename to src/In.ProjectEKA.FHIRHip/MAXRVH9999DiagnosticReportDoc20160801.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXRVH9999DiagnosticReportDoc20160803.json b/src/In.ProjectEKA.FHIRHip/MAXRVH9999DiagnosticReportDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXRVH9999DiagnosticReportDoc20160803.json rename to src/In.ProjectEKA.FHIRHip/MAXRVH9999DiagnosticReportDoc20160803.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXRVH9999DischargeSummaryDoc20160801.json b/src/In.ProjectEKA.FHIRHip/MAXRVH9999DischargeSummaryDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXRVH9999DischargeSummaryDoc20160801.json rename to src/In.ProjectEKA.FHIRHip/MAXRVH9999DischargeSummaryDoc20160801.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXRVH9999DischargeSummaryDoc20160811.json b/src/In.ProjectEKA.FHIRHip/MAXRVH9999DischargeSummaryDoc20160811.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXRVH9999DischargeSummaryDoc20160811.json rename to src/In.ProjectEKA.FHIRHip/MAXRVH9999DischargeSummaryDoc20160811.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXRVH9999OPConsultationDoc20160801.json b/src/In.ProjectEKA.FHIRHip/MAXRVH9999OPConsultationDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXRVH9999OPConsultationDoc20160801.json rename to src/In.ProjectEKA.FHIRHip/MAXRVH9999OPConsultationDoc20160801.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXRVH9999OPConsultationDoc20160803.json b/src/In.ProjectEKA.FHIRHip/MAXRVH9999OPConsultationDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXRVH9999OPConsultationDoc20160803.json rename to src/In.ProjectEKA.FHIRHip/MAXRVH9999OPConsultationDoc20160803.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160801.json b/src/In.ProjectEKA.FHIRHip/MAXRVH9999PrescriptionDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160801.json rename to src/In.ProjectEKA.FHIRHip/MAXRVH9999PrescriptionDoc20160801.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160803.json b/src/In.ProjectEKA.FHIRHip/MAXRVH9999PrescriptionDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160803.json rename to src/In.ProjectEKA.FHIRHip/MAXRVH9999PrescriptionDoc20160803.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160805.json b/src/In.ProjectEKA.FHIRHip/MAXRVH9999PrescriptionDoc20160805.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160805.json rename to src/In.ProjectEKA.FHIRHip/MAXRVH9999PrescriptionDoc20160805.json diff --git a/src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160807.json b/src/In.ProjectEKA.FHIRHip/MAXRVH9999PrescriptionDoc20160807.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/MAXRVH9999PrescriptionDoc20160807.json rename to src/In.ProjectEKA.FHIRHip/MAXRVH9999PrescriptionDoc20160807.json diff --git a/src/In.ProjectEKA.NetworkHip/Patient/FileReader.cs b/src/In.ProjectEKA.FHIRHip/Patient/FileReader.cs similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Patient/FileReader.cs rename to src/In.ProjectEKA.FHIRHip/Patient/FileReader.cs diff --git a/src/In.ProjectEKA.NetworkHip/Resources/BI-KTH-12FirstVisitConditions.json b/src/In.ProjectEKA.FHIRHip/Resources/BI-KTH-12FirstVisitConditions.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/BI-KTH-12FirstVisitConditions.json rename to src/In.ProjectEKA.FHIRHip/Resources/BI-KTH-12FirstVisitConditions.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO09PrescriptionDoc20150801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO09PrescriptionDoc20150801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO09PrescriptionDoc20150801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO09PrescriptionDoc20150801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO10DiagnosticReportDoc20190801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO10DiagnosticReportDoc20190801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO10DiagnosticReportDoc20190801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO10DiagnosticReportDoc20190801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO10PrescriptionDoc20180801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO10PrescriptionDoc20180801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO10PrescriptionDoc20180801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO10PrescriptionDoc20180801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO11OPConsultationDoc20180801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO11OPConsultationDoc20180801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO11OPConsultationDoc20180801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO11OPConsultationDoc20180801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO11PrescriptionDoc20190801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO11PrescriptionDoc20190801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO11PrescriptionDoc20190801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO11PrescriptionDoc20190801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO14PrescriptionDoc20110801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO14PrescriptionDoc20110801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXLIVNO14PrescriptionDoc20110801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXLIVNO14PrescriptionDoc20110801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1543DischargeSummaryDoc20190409.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXNCC1543DischargeSummaryDoc20190409.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1543DischargeSummaryDoc20190409.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXNCC1543DischargeSummaryDoc20190409.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1543DischargeSummaryDoc20190419.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXNCC1543DischargeSummaryDoc20190419.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1543DischargeSummaryDoc20190419.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXNCC1543DischargeSummaryDoc20190419.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXNCC1702PrescriptionDoc20180801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXNCC1702PrescriptionDoc20180801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180803.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXNCC1702PrescriptionDoc20180803.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180803.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXNCC1702PrescriptionDoc20180803.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180805.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXNCC1702PrescriptionDoc20180805.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXNCC1702PrescriptionDoc20180805.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXNCC1702PrescriptionDoc20180805.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXNCP1702DiagnosticReportDoc20190101.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXNCP1702DiagnosticReportDoc20190101.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXNCP1702DiagnosticReportDoc20190101.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXNCP1702DiagnosticReportDoc20190101.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXNCP1702DiagnosticReportDoc20190103.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXNCP1702DiagnosticReportDoc20190103.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXNCP1702DiagnosticReportDoc20190103.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXNCP1702DiagnosticReportDoc20190103.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DiagnosticReportDoc20160801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999DiagnosticReportDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DiagnosticReportDoc20160801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999DiagnosticReportDoc20160801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DiagnosticReportDoc20160803.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999DiagnosticReportDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DiagnosticReportDoc20160803.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999DiagnosticReportDoc20160803.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DischargeSummaryDoc20160801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999DischargeSummaryDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DischargeSummaryDoc20160801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999DischargeSummaryDoc20160801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DischargeSummaryDoc20160811.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999DischargeSummaryDoc20160811.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999DischargeSummaryDoc20160811.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999DischargeSummaryDoc20160811.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999OPConsultationDoc20160801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999OPConsultationDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999OPConsultationDoc20160801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999OPConsultationDoc20160801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999OPConsultationDoc20160803.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999OPConsultationDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999OPConsultationDoc20160803.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999OPConsultationDoc20160803.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160801.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999PrescriptionDoc20160801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160801.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999PrescriptionDoc20160801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160803.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999PrescriptionDoc20160803.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160803.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999PrescriptionDoc20160803.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160805.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999PrescriptionDoc20160805.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160805.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999PrescriptionDoc20160805.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160807.json b/src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999PrescriptionDoc20160807.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/MAXRVH9999PrescriptionDoc20160807.json rename to src/In.ProjectEKA.FHIRHip/Resources/MAXRVH9999PrescriptionDoc20160807.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1006DiagnosticReportWithRadiologyImageInline.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1006DiagnosticReportWithRadiologyImageInline.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1006DiagnosticReportWithRadiologyImageInline.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1006DiagnosticReportWithRadiologyImageInline.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1006FirstVisitDiagnosticReports.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1006FirstVisitDiagnosticReports.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1006FirstVisitDiagnosticReports.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1006FirstVisitDiagnosticReports.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1006SecondVisitDiagnosticRepots.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1006SecondVisitDiagnosticRepots.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1006SecondVisitDiagnosticRepots.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1006SecondVisitDiagnosticRepots.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1006ThirdVisitImagingStudy.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1006ThirdVisitImagingStudy.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1006ThirdVisitImagingStudy.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1006ThirdVisitImagingStudy.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1007DiagnosticReportDocument.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1007DiagnosticReportDocument.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1007DiagnosticReportDocument.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1007DiagnosticReportDocument.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1007DiagnosticReportDocument1.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1007DiagnosticReportDocument1.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1007DiagnosticReportDocument1.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1007DiagnosticReportDocument1.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1007DischargeSummary1.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1007DischargeSummary1.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1007DischargeSummary1.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1007DischargeSummary1.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1007DischargeSummary2.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1007DischargeSummary2.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1007DischargeSummary2.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1007DischargeSummary2.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument1.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1007PrescriptionDocument1.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument1.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1007PrescriptionDocument1.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument2.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1007PrescriptionDocument2.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument2.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1007PrescriptionDocument2.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument3.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1007PrescriptionDocument3.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1007PrescriptionDocument3.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1007PrescriptionDocument3.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008ClinicalDocumentComposition.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008ClinicalDocumentComposition.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008ClinicalDocumentComposition.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008ClinicalDocumentComposition.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191001.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008DiagnosticReportDoc20191001.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191001.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008DiagnosticReportDoc20191001.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191003.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008DiagnosticReportDoc20191003.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191003.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008DiagnosticReportDoc20191003.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191005.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008DiagnosticReportDoc20191005.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportDoc20191005.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008DiagnosticReportDoc20191005.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportWithRadiologyImageInline.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008DiagnosticReportWithRadiologyImageInline.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008DiagnosticReportWithRadiologyImageInline.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008DiagnosticReportWithRadiologyImageInline.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008FifthVisitPrescription.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008FifthVisitPrescription.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008FifthVisitPrescription.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008FifthVisitPrescription.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitCondition.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008FirstVisitCondition.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitCondition.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008FirstVisitCondition.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitDiagnosticReport.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008FirstVisitDiagnosticReport.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitDiagnosticReport.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008FirstVisitDiagnosticReport.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitObservations.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008FirstVisitObservations.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008FirstVisitObservations.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008FirstVisitObservations.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008FourthVisitDocumentReference.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008FourthVisitDocumentReference.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008FourthVisitDocumentReference.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008FourthVisitDocumentReference.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008NRCOPConsultationNote.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008NRCOPConsultationNote.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008NRCOPConsultationNote.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008NRCOPConsultationNote.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190801.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008PrescriptionDoc20190801.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190801.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008PrescriptionDoc20190801.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190803.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008PrescriptionDoc20190803.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190803.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008PrescriptionDoc20190803.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190805.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008PrescriptionDoc20190805.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008PrescriptionDoc20190805.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008PrescriptionDoc20190805.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitDiagnosticReport.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008SecondVisitDiagnosticReport.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitDiagnosticReport.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008SecondVisitDiagnosticReport.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitMedications.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008SecondVisitMedications.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitMedications.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008SecondVisitMedications.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitObsWithMembers.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008SecondVisitObsWithMembers.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008SecondVisitObsWithMembers.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008SecondVisitObsWithMembers.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008ThirdVisitDischargeSummary.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008ThirdVisitDischargeSummary.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008ThirdVisitDischargeSummary.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008ThirdVisitDischargeSummary.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1008WEBEMROPConsultationNote.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1008WEBEMROPConsultationNote.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1008WEBEMROPConsultationNote.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1008WEBEMROPConsultationNote.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1702DischargeSummary20190203.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1702DischargeSummary20190203.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1702DischargeSummary20190203.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1702DischargeSummary20190203.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1702DischargeSummary20191003.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1702DischargeSummary20191003.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1702DischargeSummary20191003.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1702DischargeSummary20191003.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1702OPConsultationNote20200709.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1702OPConsultationNote20200709.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1702OPConsultationNote20200709.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1702OPConsultationNote20200709.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/NCP1702OPConsultationNote20200710.json b/src/In.ProjectEKA.FHIRHip/Resources/NCP1702OPConsultationNote20200710.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/NCP1702OPConsultationNote20200710.json rename to src/In.ProjectEKA.FHIRHip/Resources/NCP1702OPConsultationNote20200710.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06012019.json b/src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc06012019.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06012019.json rename to src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc06012019.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06032019.json b/src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc06032019.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06032019.json rename to src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc06032019.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06052019.json b/src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc06052019.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06052019.json rename to src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc06052019.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06072019.json b/src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc06072019.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06072019.json rename to src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc06072019.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06092019.json b/src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc06092019.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc06092019.json rename to src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc06092019.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc08012019.json b/src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc08012019.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDoc08012019.json rename to src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDoc08012019.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument1.json b/src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDocument1.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument1.json rename to src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDocument1.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument2.json b/src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDocument2.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument2.json rename to src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDocument2.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument3.json b/src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDocument3.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument3.json rename to src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDocument3.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument4.json b/src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDocument4.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/RVMHD01PrescriptionDocument4.json rename to src/In.ProjectEKA.FHIRHip/Resources/RVMHD01PrescriptionDocument4.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/SC1701FirstVisitDiagnosticReport.json b/src/In.ProjectEKA.FHIRHip/Resources/SC1701FirstVisitDiagnosticReport.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/SC1701FirstVisitDiagnosticReport.json rename to src/In.ProjectEKA.FHIRHip/Resources/SC1701FirstVisitDiagnosticReport.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHFirstVisitConditionAndObs.json b/src/In.ProjectEKA.FHIRHip/Resources/ShriyaTMHFirstVisitConditionAndObs.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHFirstVisitConditionAndObs.json rename to src/In.ProjectEKA.FHIRHip/Resources/ShriyaTMHFirstVisitConditionAndObs.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHFirstVisitDiagnosticReport.json b/src/In.ProjectEKA.FHIRHip/Resources/ShriyaTMHFirstVisitDiagnosticReport.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHFirstVisitDiagnosticReport.json rename to src/In.ProjectEKA.FHIRHip/Resources/ShriyaTMHFirstVisitDiagnosticReport.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitDiagnosticReports.json b/src/In.ProjectEKA.FHIRHip/Resources/ShriyaTMHThirdVisitDiagnosticReports.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitDiagnosticReports.json rename to src/In.ProjectEKA.FHIRHip/Resources/ShriyaTMHThirdVisitDiagnosticReports.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitMedication.json b/src/In.ProjectEKA.FHIRHip/Resources/ShriyaTMHThirdVisitMedication.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitMedication.json rename to src/In.ProjectEKA.FHIRHip/Resources/ShriyaTMHThirdVisitMedication.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitObsWithRef.json b/src/In.ProjectEKA.FHIRHip/Resources/ShriyaTMHThirdVisitObsWithRef.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/ShriyaTMHThirdVisitObsWithRef.json rename to src/In.ProjectEKA.FHIRHip/Resources/ShriyaTMHThirdVisitObsWithRef.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/bundleTemplate.json b/src/In.ProjectEKA.FHIRHip/Resources/bundleTemplate.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/bundleTemplate.json rename to src/In.ProjectEKA.FHIRHip/Resources/bundleTemplate.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/demoPatientCareContextDataMap.json b/src/In.ProjectEKA.FHIRHip/Resources/demoPatientCareContextDataMap.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/demoPatientCareContextDataMap.json rename to src/In.ProjectEKA.FHIRHip/Resources/demoPatientCareContextDataMap.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/demoPatients.json b/src/In.ProjectEKA.FHIRHip/Resources/demoPatients.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/demoPatients.json rename to src/In.ProjectEKA.FHIRHip/Resources/demoPatients.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/diagnosticReport.json b/src/In.ProjectEKA.FHIRHip/Resources/diagnosticReport.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/diagnosticReport.json rename to src/In.ProjectEKA.FHIRHip/Resources/diagnosticReport.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/dignosticReportWithMediaDicomFileAsUrl.json b/src/In.ProjectEKA.FHIRHip/Resources/dignosticReportWithMediaDicomFileAsUrl.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/dignosticReportWithMediaDicomFileAsUrl.json rename to src/In.ProjectEKA.FHIRHip/Resources/dignosticReportWithMediaDicomFileAsUrl.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/dignosticReportWithPresentedFormPdfFileAsUrl.json b/src/In.ProjectEKA.FHIRHip/Resources/dignosticReportWithPresentedFormPdfFileAsUrl.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/dignosticReportWithPresentedFormPdfFileAsUrl.json rename to src/In.ProjectEKA.FHIRHip/Resources/dignosticReportWithPresentedFormPdfFileAsUrl.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/observation.json b/src/In.ProjectEKA.FHIRHip/Resources/observation.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/observation.json rename to src/In.ProjectEKA.FHIRHip/Resources/observation.json diff --git a/src/In.ProjectEKA.NetworkHip/Resources/patients.json b/src/In.ProjectEKA.FHIRHip/Resources/patients.json similarity index 100% rename from src/In.ProjectEKA.NetworkHip/Resources/patients.json rename to src/In.ProjectEKA.FHIRHip/Resources/patients.json diff --git a/src/In.ProjectEKA.HipService/In.ProjectEKA.HipService.csproj b/src/In.ProjectEKA.HipService/In.ProjectEKA.HipService.csproj index 01e53d86..ef414420 100644 --- a/src/In.ProjectEKA.HipService/In.ProjectEKA.HipService.csproj +++ b/src/In.ProjectEKA.HipService/In.ProjectEKA.HipService.csproj @@ -40,8 +40,8 @@ + - diff --git a/test/In.ProjectEKA.DefaultHipTest/DataFlow/CollectTest.cs b/test/In.ProjectEKA.FHIRHipTest/DataFlow/CollectTest.cs similarity index 100% rename from test/In.ProjectEKA.DefaultHipTest/DataFlow/CollectTest.cs rename to test/In.ProjectEKA.FHIRHipTest/DataFlow/CollectTest.cs diff --git a/test/In.ProjectEKA.DefaultHipTest/Discovery/PatientMatchingRepositoryTest.cs b/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs similarity index 100% rename from test/In.ProjectEKA.DefaultHipTest/Discovery/PatientMatchingRepositoryTest.cs rename to test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs diff --git a/test/In.ProjectEKA.DefaultHipTest/In.ProjectEKA.DefaultHipTest.csproj b/test/In.ProjectEKA.FHIRHipTest/In.ProjectEKA.FHIRHipTest.csproj similarity index 85% rename from test/In.ProjectEKA.DefaultHipTest/In.ProjectEKA.DefaultHipTest.csproj rename to test/In.ProjectEKA.FHIRHipTest/In.ProjectEKA.FHIRHipTest.csproj index eeadd6e2..eb35fc7a 100644 --- a/test/In.ProjectEKA.DefaultHipTest/In.ProjectEKA.DefaultHipTest.csproj +++ b/test/In.ProjectEKA.FHIRHipTest/In.ProjectEKA.FHIRHipTest.csproj @@ -2,6 +2,7 @@ netcoreapp3.1 + In.ProjectEKA.DefaultHipTest @@ -21,7 +22,7 @@ + - diff --git a/test/In.ProjectEKA.DefaultHipTest/Link/PatientRepositoryTest.cs b/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs similarity index 100% rename from test/In.ProjectEKA.DefaultHipTest/Link/PatientRepositoryTest.cs rename to test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs From 638b03c1c0594679b673521738bb5dc23e4b1b9f Mon Sep 17 00:00:00 2001 From: nexengineer Date: Thu, 20 Aug 2020 14:56:34 +0530 Subject: [PATCH 03/10] PR Fixes --- src/In.ProjectEKA.FHIRHip/In.ProjectEKA.FHIRHip.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/In.ProjectEKA.FHIRHip/In.ProjectEKA.FHIRHip.csproj b/src/In.ProjectEKA.FHIRHip/In.ProjectEKA.FHIRHip.csproj index 67a47e7d..5bf18cc5 100644 --- a/src/In.ProjectEKA.FHIRHip/In.ProjectEKA.FHIRHip.csproj +++ b/src/In.ProjectEKA.FHIRHip/In.ProjectEKA.FHIRHip.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - In.ProjectEKA.DefaultHip + In.ProjectEKA.FHIRHip From 4154fee38373d2afad3e3b3bc9becfb95dc7cbd8 Mon Sep 17 00:00:00 2001 From: nexengineer Date: Thu, 20 Aug 2020 15:51:26 +0530 Subject: [PATCH 04/10] Test case fixes --- .../DataFlow/CareContextRecord.cs | 2 +- src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs | 3 +- .../DataFlow/Model/NetworkData.cs | 3 +- .../DataFlow/Model/NetworkDataRequest.cs | 2 +- .../DataFlow/Model/NetworkDataResponse.cs | 2 +- .../Discovery/PatientMatchingRepository.cs | 2 +- .../Link/PatientRepository.cs | 2 +- .../Patient/FileReader.cs | 2 +- src/In.ProjectEKA.HipService/Startup.cs | 6 +- .../DataFlow/CollectTest.cs | 74 +++++++++---------- .../PatientMatchingRepositoryTest.cs | 2 +- .../Link/PatientRepositoryTest.cs | 2 +- 12 files changed, 47 insertions(+), 55 deletions(-) diff --git a/src/In.ProjectEKA.FHIRHip/DataFlow/CareContextRecord.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/CareContextRecord.cs index 529e8b47..59633a53 100644 --- a/src/In.ProjectEKA.FHIRHip/DataFlow/CareContextRecord.cs +++ b/src/In.ProjectEKA.FHIRHip/DataFlow/CareContextRecord.cs @@ -1,4 +1,4 @@ -namespace In.ProjectEKA.DefaultHip.DataFlow +namespace In.ProjectEKA.FHIRHip.DataFlow { using System.Collections.Generic; diff --git a/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs index ecdf16f7..e180d161 100644 --- a/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs +++ b/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs @@ -1,4 +1,4 @@ -namespace In.ProjectEKA.DefaultHip.DataFlow +namespace In.ProjectEKA.FHIRHip.DataFlow { using System; using System.Collections.Generic; @@ -17,7 +17,6 @@ namespace In.ProjectEKA.DefaultHip.DataFlow using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Optional; - using Patient; using Serilog; public class Collect : ICollect diff --git a/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs index b37bbead..1566ec7c 100644 --- a/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs +++ b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs @@ -1,6 +1,7 @@ -namespace In.ProjectEKA.DefaultHip.DataFlow.Model +namespace In.ProjectEKA.FHIRHip.DataFlow.Model { using HipLibrary.Patient.Model; + public class NetworkData { public string CareContext { get; set; } diff --git a/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataRequest.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataRequest.cs index 970a498c..5d9382e7 100644 --- a/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataRequest.cs +++ b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataRequest.cs @@ -1,4 +1,4 @@ -namespace In.ProjectEKA.DefaultHip.DataFlow.Model +namespace In.ProjectEKA.FHIRHip.DataFlow.Model { using System.Collections.Generic; using HipLibrary.Patient.Model; diff --git a/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataResponse.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataResponse.cs index 5355e34d..87625481 100644 --- a/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataResponse.cs +++ b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataResponse.cs @@ -1,4 +1,4 @@ -namespace In.ProjectEKA.DefaultHip.DataFlow.Model +namespace In.ProjectEKA.FHIRHip.DataFlow.Model { using System.Collections.Generic; diff --git a/src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs b/src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs index 1017965e..1f52f971 100644 --- a/src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs +++ b/src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs @@ -1,4 +1,4 @@ -namespace In.ProjectEKA.DefaultHip.Discovery +namespace In.ProjectEKA.FHIRHip.Discovery { using System.Linq; using System.Threading.Tasks; diff --git a/src/In.ProjectEKA.FHIRHip/Link/PatientRepository.cs b/src/In.ProjectEKA.FHIRHip/Link/PatientRepository.cs index b8a03c79..89be9b56 100644 --- a/src/In.ProjectEKA.FHIRHip/Link/PatientRepository.cs +++ b/src/In.ProjectEKA.FHIRHip/Link/PatientRepository.cs @@ -1,4 +1,4 @@ -namespace In.ProjectEKA.DefaultHip.Link +namespace In.ProjectEKA.FHIRHip.Link { using System; using System.Collections.Generic; diff --git a/src/In.ProjectEKA.FHIRHip/Patient/FileReader.cs b/src/In.ProjectEKA.FHIRHip/Patient/FileReader.cs index 752e0186..2499bc24 100644 --- a/src/In.ProjectEKA.FHIRHip/Patient/FileReader.cs +++ b/src/In.ProjectEKA.FHIRHip/Patient/FileReader.cs @@ -1,4 +1,4 @@ -namespace In.ProjectEKA.DefaultHip.Patient +namespace In.ProjectEKA.FHIRHip.Patient { using System.Collections.Generic; using System.IO; diff --git a/src/In.ProjectEKA.HipService/Startup.cs b/src/In.ProjectEKA.HipService/Startup.cs index f28ea711..56a32378 100644 --- a/src/In.ProjectEKA.HipService/Startup.cs +++ b/src/In.ProjectEKA.HipService/Startup.cs @@ -13,11 +13,11 @@ namespace In.ProjectEKA.HipService using DataFlow; using DataFlow.Database; using DataFlow.Encryptor; - using DefaultHip.DataFlow; - using DefaultHip.Discovery; - using DefaultHip.Link; using Discovery; using Discovery.Database; + using FHIRHip.DataFlow; + using FHIRHip.Discovery; + using FHIRHip.Link; using Gateway; using Hangfire; using Hangfire.MemoryStorage; diff --git a/test/In.ProjectEKA.FHIRHipTest/DataFlow/CollectTest.cs b/test/In.ProjectEKA.FHIRHipTest/DataFlow/CollectTest.cs index 8ea1c641..af0b252c 100644 --- a/test/In.ProjectEKA.FHIRHipTest/DataFlow/CollectTest.cs +++ b/test/In.ProjectEKA.FHIRHipTest/DataFlow/CollectTest.cs @@ -2,22 +2,31 @@ namespace In.ProjectEKA.DefaultHipTest.DataFlow { + using System; using System.Collections.Generic; using System.Linq; - using DefaultHip.DataFlow; + using System.Net; + using System.Net.Http; + using System.Threading; + using System.Threading.Tasks; + using FHIRHip.DataFlow; using FluentAssertions; using HipLibrary.Patient.Model; + using Moq; + using Moq.Protected; using Optional.Unsafe; using Xunit; [Collection("Collect Tests")] public class CollectTest { - private readonly Collect collect = new Collect("demoPatientCareContextDataMap.json"); - [Fact] - private async void ReturnEntriesForHina() + private async void ReturnCallDataFlowService() { + var handlerMock = new Mock(MockBehavior.Strict); + var httpClient = new HttpClient(handlerMock.Object); + var expectedUri = new Uri("http://localhost:8003/getData"); + const string consentId = "ConsentId"; const string consentManagerId = "ConsentManagerId"; var grantedContexts = new List @@ -38,6 +47,18 @@ private async void ReturnEntriesForHina() HiType.DischargeSummary, HiType.OPConsultation }; + handlerMock + .Protected() + .Setup>( + "SendAsync", + ItExpr.IsAny(), + ItExpr.IsAny()) + .ReturnsAsync(new HttpResponseMessage + { + StatusCode = HttpStatusCode.OK + }) + .Verifiable(); + var dataRequest = new DataRequest(grantedContexts, dateRange, "/someUrl", @@ -47,44 +68,15 @@ private async void ReturnEntriesForHina() consentManagerId, consentId, "sometext"); - - var entries = await collect.CollectData(dataRequest); - entries.ValueOrDefault().CareBundles.Count().Should().Be(18); - } - - [Fact] - private async void ReturnEntriesForNavjot() - { - const string consentId = "ConsentId"; - const string consentManagerId = "ConsentManagerId"; - var grantedContexts = new List - { - new GrantedContext("RVH1002", "NCP1007"), - new GrantedContext("RVH1002", "RV-MHD-01.17.0024") - }; - var dateRange = new DateRange("2013-12-01T15:43:00.000+0000", "2021-12-31T15:43:19.279+0000"); - var hiTypes = new List - { - HiType.Condition, - HiType.Observation, - HiType.DiagnosticReport, - HiType.MedicationRequest, - HiType.DocumentReference, - HiType.Prescription, - HiType.DischargeSummary - }; - var dataRequest = new DataRequest(grantedContexts, - dateRange, - "/someUrl", - hiTypes, - "someTxnId", - null, - consentManagerId, - consentId, - "sometext"); - + var collect = new Collect("http://localhost:8003/getData", httpClient); var entries = await collect.CollectData(dataRequest); - entries.ValueOrDefault().CareBundles.Count().Should().Be(17); + entries.ValueOrDefault().CareBundles.Should().NotBeNull(); + handlerMock.Protected().Verify( + "SendAsync", + Times.Exactly(1), + ItExpr.Is(message => message.Method == HttpMethod.Post + && message.RequestUri == expectedUri), + ItExpr.IsAny()); } } } \ No newline at end of file diff --git a/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs b/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs index 961ebde7..76dfa844 100644 --- a/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs +++ b/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs @@ -3,7 +3,7 @@ namespace In.ProjectEKA.DefaultHipTest.Discovery using System; using System.Collections.Generic; using System.Linq; - using DefaultHip.Discovery; + using FHIRHip.Discovery; using FluentAssertions; using HipLibrary.Patient.Model; using Xunit; diff --git a/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs b/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs index aa12bc94..7b2361af 100644 --- a/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs +++ b/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs @@ -1,6 +1,6 @@ namespace In.ProjectEKA.DefaultHipTest.Link { - using DefaultHip.Link; + using FHIRHip.Link; using FluentAssertions; using HipLibrary.Patient.Model; using Xunit; From 98242ee58b8eedbf8a262170393f43addbd2ce98 Mon Sep 17 00:00:00 2001 From: nexengineer Date: Thu, 20 Aug 2020 15:57:48 +0530 Subject: [PATCH 05/10] Codacy fix --- src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs index e180d161..215d931b 100644 --- a/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs +++ b/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs @@ -33,30 +33,31 @@ public Collect(string hipSystemDataUrl, HttpClient httpClient) public async Task> CollectData(DataRequest dataRequest) { var bundles = new List(); - var patientData = await FindPatientsData(dataRequest); + var patientData = await FindPatientsData(dataRequest).ConfigureAwait(false); var careContextReferences = patientData.Keys.ToList(); foreach (var careContextReference in careContextReferences) + { foreach (var result in patientData.GetOrDefault(careContextReference)) { Log.Information($"Returning file: {result}"); var fjp = new FhirJsonParser(); bundles.Add(new CareBundle(careContextReference, fjp.Parse(result))); } - + } var entries = new Entries(bundles); return Option.Some(entries); } private async Task>> FindPatientsData(DataRequest request) { - // LogDataRequest(request); + LogDataRequest(request); var patientReferenceNumber = request.CareContexts.First().PatientReference; var careContexts = request.CareContexts.Select(careContext => careContext.CareContextReference).ToList(); var dataResponse = await GetPatientsData(new NetworkDataRequest(patientReferenceNumber, careContexts, request.DateRange, - request.HiType)); + request.HiType)).ConfigureAwait(false); var structuredData = new Dictionary>(); return dataResponse.Map(content => { @@ -93,8 +94,9 @@ private async Task> GetPatientsData(NetworkDataReque }; var response = await HttpClient.SendAsync(httpRequestMessage).ConfigureAwait(false); if (!response.IsSuccessStatusCode) + { return Option.None(); - + } var responseContent = response.Content; using var reader = new StreamReader(await responseContent.ReadAsStreamAsync()); var result = await reader.ReadToEndAsync().ConfigureAwait(false); From b6618054fe9586657db450692fd15760f56ff953 Mon Sep 17 00:00:00 2001 From: nexengineer Date: Thu, 20 Aug 2020 17:13:09 +0530 Subject: [PATCH 06/10] PR Review Fixes --- src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs | 4 ++-- src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs | 6 +++--- .../DataFlow/DataFlowConfiguration.cs | 1 + src/In.ProjectEKA.HipService/Startup.cs | 2 +- src/In.ProjectEKA.HipService/appsettings.Development.json | 3 ++- src/In.ProjectEKA.HipService/appsettings.local.json | 3 ++- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs index 215d931b..0106eff2 100644 --- a/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs +++ b/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs @@ -65,11 +65,11 @@ private async Task>> FindPatientsData(DataReques { if (structuredData.ContainsKey(result.CareContext)) { - structuredData[result.CareContext].Add(result.Data); + structuredData[result.CareContext].Add(result.FHIRData); } else { - structuredData.Add(result.CareContext, new List {result.Data}); + structuredData.Add(result.CareContext, new List {result.FHIRData}); } } return structuredData; diff --git a/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs index 1566ec7c..1c75382b 100644 --- a/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs +++ b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkData.cs @@ -6,13 +6,13 @@ public class NetworkData { public string CareContext { get; set; } public HiType HiType { get; set; } - public string Data { get; set; } + public string FHIRData { get; set; } - public NetworkData(string careContext, HiType hiType, string data) + public NetworkData(string careContext, HiType hiType, string fhirData) { CareContext = careContext; HiType = hiType; - Data = data; + FHIRData = fhirData; } } } \ No newline at end of file diff --git a/src/In.ProjectEKA.HipService/DataFlow/DataFlowConfiguration.cs b/src/In.ProjectEKA.HipService/DataFlow/DataFlowConfiguration.cs index 9774dc3a..b8e45f15 100644 --- a/src/In.ProjectEKA.HipService/DataFlow/DataFlowConfiguration.cs +++ b/src/In.ProjectEKA.HipService/DataFlow/DataFlowConfiguration.cs @@ -4,5 +4,6 @@ public class DataFlowConfiguration { public int DataSizeLimitInMbs { get; set; } public int DataLinkTtlInMinutes { get; set; } + public string Url { get; set; } } } \ No newline at end of file diff --git a/src/In.ProjectEKA.HipService/Startup.cs b/src/In.ProjectEKA.HipService/Startup.cs index 56a32378..ac024f72 100644 --- a/src/In.ProjectEKA.HipService/Startup.cs +++ b/src/In.ProjectEKA.HipService/Startup.cs @@ -81,7 +81,7 @@ public void ConfigureServices(IServiceCollection services) .AddHangfire(config => { config.UseMemoryStorage(); }) .AddSingleton() .AddSingleton(new PatientRepository("demoPatients.json")) - .AddSingleton(new Collect("http://localhost:8003/getData", HttpClient)) + .AddSingleton(new Collect(Configuration.GetSection("dataFlow:url").Get(), HttpClient)) .AddSingleton(new PatientRepository("demoPatients.json")) .AddRabbit(Configuration) .Configure(Configuration.GetSection("OtpService")) diff --git a/src/In.ProjectEKA.HipService/appsettings.Development.json b/src/In.ProjectEKA.HipService/appsettings.Development.json index 69320a63..a7002610 100644 --- a/src/In.ProjectEKA.HipService/appsettings.Development.json +++ b/src/In.ProjectEKA.HipService/appsettings.Development.json @@ -38,7 +38,8 @@ }, "dataFlow": { "dataSizeLimitInMbs": 5, - "dataLinkTTLInMinutes": 10 + "dataLinkTTLInMinutes": 10, + "url": "http://localhost:8003/getData" }, "hip": { "url": "http://localhost:8000" diff --git a/src/In.ProjectEKA.HipService/appsettings.local.json b/src/In.ProjectEKA.HipService/appsettings.local.json index 16ec6f46..a241b8be 100644 --- a/src/In.ProjectEKA.HipService/appsettings.local.json +++ b/src/In.ProjectEKA.HipService/appsettings.local.json @@ -39,7 +39,8 @@ }, "dataFlow": { "dataSizeLimitInMbs": 5, - "dataLinkTTLInMinutes": 10 + "dataLinkTTLInMinutes": 10, + "url": "http://localhost:8003/getData" }, "hip": { "url": "http://localhost:8000" From 26f01d245bbd50c5dd39f965e3b818d71567b9b7 Mon Sep 17 00:00:00 2001 From: nexengineer Date: Thu, 20 Aug 2020 17:58:59 +0530 Subject: [PATCH 07/10] PR fixes --- src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs | 8 +++---- .../DataFlow/Model/DataFlowConfiguration.cs | 11 ++++++++++ .../DataFlow/DataFlowConfiguration.cs | 2 ++ src/In.ProjectEKA.HipService/Startup.cs | 2 +- .../appsettings.Development.json | 4 +++- src/In.ProjectEKA.HipService/appsettings.json | 9 +++++--- .../appsettings.local.json | 4 +++- .../DataFlow/CollectTest.cs | 21 ++++++++++++++----- .../PatientMatchingRepositoryTest.cs | 2 +- .../In.ProjectEKA.FHIRHipTest.csproj | 3 ++- .../Link/PatientRepositoryTest.cs | 2 +- 11 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 src/In.ProjectEKA.FHIRHip/DataFlow/Model/DataFlowConfiguration.cs diff --git a/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs index 0106eff2..bf871fbc 100644 --- a/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs +++ b/src/In.ProjectEKA.FHIRHip/DataFlow/Collect.cs @@ -21,12 +21,12 @@ namespace In.ProjectEKA.FHIRHip.DataFlow public class Collect : ICollect { - private readonly string HipSystemDataUrl; + private readonly DataFlowConfiguration DataFlowConfiguration; private readonly HttpClient HttpClient; - public Collect(string hipSystemDataUrl, HttpClient httpClient) + public Collect(DataFlowConfiguration dataFlowConfiguration, HttpClient httpClient) { - HipSystemDataUrl = hipSystemDataUrl; + DataFlowConfiguration = dataFlowConfiguration; HttpClient = httpClient; } @@ -88,7 +88,7 @@ private async Task> GetPatientsData(NetworkDataReque NamingStrategy = new CamelCaseNamingStrategy() } }); - var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, new Uri($"{HipSystemDataUrl}")) + var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, new Uri($"{DataFlowConfiguration.Url}")) { Content = new StringContent(json, Encoding.UTF8, MediaTypeNames.Application.Json) }; diff --git a/src/In.ProjectEKA.FHIRHip/DataFlow/Model/DataFlowConfiguration.cs b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/DataFlowConfiguration.cs new file mode 100644 index 00000000..6810d9fc --- /dev/null +++ b/src/In.ProjectEKA.FHIRHip/DataFlow/Model/DataFlowConfiguration.cs @@ -0,0 +1,11 @@ +namespace In.ProjectEKA.FHIRHip.DataFlow.Model +{ + public class DataFlowConfiguration + { + public int DataSizeLimitInMbs { get; set; } + public int DataLinkTtlInMinutes { get; set; } + public string Url { get; set; } + public bool IsAuthEnabled { get; set; } + public string AuthUrl { get; set; } + } +} \ No newline at end of file diff --git a/src/In.ProjectEKA.HipService/DataFlow/DataFlowConfiguration.cs b/src/In.ProjectEKA.HipService/DataFlow/DataFlowConfiguration.cs index b8e45f15..f2cc50c3 100644 --- a/src/In.ProjectEKA.HipService/DataFlow/DataFlowConfiguration.cs +++ b/src/In.ProjectEKA.HipService/DataFlow/DataFlowConfiguration.cs @@ -5,5 +5,7 @@ public class DataFlowConfiguration public int DataSizeLimitInMbs { get; set; } public int DataLinkTtlInMinutes { get; set; } public string Url { get; set; } + public bool IsAuthEnabled { get; set; } + public string AuthUrl { get; set; } } } \ No newline at end of file diff --git a/src/In.ProjectEKA.HipService/Startup.cs b/src/In.ProjectEKA.HipService/Startup.cs index ac024f72..45d42fab 100644 --- a/src/In.ProjectEKA.HipService/Startup.cs +++ b/src/In.ProjectEKA.HipService/Startup.cs @@ -81,7 +81,7 @@ public void ConfigureServices(IServiceCollection services) .AddHangfire(config => { config.UseMemoryStorage(); }) .AddSingleton() .AddSingleton(new PatientRepository("demoPatients.json")) - .AddSingleton(new Collect(Configuration.GetSection("dataFlow:url").Get(), HttpClient)) + .AddSingleton(new Collect(Configuration.GetSection("dataFlow").Get(), HttpClient)) .AddSingleton(new PatientRepository("demoPatients.json")) .AddRabbit(Configuration) .Configure(Configuration.GetSection("OtpService")) diff --git a/src/In.ProjectEKA.HipService/appsettings.Development.json b/src/In.ProjectEKA.HipService/appsettings.Development.json index a7002610..ccac8bd3 100644 --- a/src/In.ProjectEKA.HipService/appsettings.Development.json +++ b/src/In.ProjectEKA.HipService/appsettings.Development.json @@ -39,7 +39,9 @@ "dataFlow": { "dataSizeLimitInMbs": 5, "dataLinkTTLInMinutes": 10, - "url": "http://localhost:8003/getData" + "url": "http://localhost:8003/getData", + "isAuthEnabled": false, + "authUrl": "" }, "hip": { "url": "http://localhost:8000" diff --git a/src/In.ProjectEKA.HipService/appsettings.json b/src/In.ProjectEKA.HipService/appsettings.json index 6d1ecb5c..3896b097 100644 --- a/src/In.ProjectEKA.HipService/appsettings.json +++ b/src/In.ProjectEKA.HipService/appsettings.json @@ -42,16 +42,19 @@ "Password": "guest" }, "dataFlow": { - "dataSizeLimitInMbs": 5 + "dataSizeLimitInMbs": 5, + "url": "http://localhost:8003/getData", + "isAuthEnabled": false, + "authUrl": "" }, "hip": { "url": "http://hip:8000" }, "Gateway": { "url": "http://gateway:8000", - "timeout": 40, + "timeout": 3000, "clientId": "10000005", - "clientSecret": "93ef283e-1968-46ab-8731-cfccda83680a", + "clientSecret": "95ca9a9d-1473-4172-9d87-0fd4d87ee1d6", "CmSuffix": "ncg" }, "BackgroundJobs": { diff --git a/src/In.ProjectEKA.HipService/appsettings.local.json b/src/In.ProjectEKA.HipService/appsettings.local.json index a241b8be..cfce6455 100644 --- a/src/In.ProjectEKA.HipService/appsettings.local.json +++ b/src/In.ProjectEKA.HipService/appsettings.local.json @@ -40,7 +40,9 @@ "dataFlow": { "dataSizeLimitInMbs": 5, "dataLinkTTLInMinutes": 10, - "url": "http://localhost:8003/getData" + "url": "http://localhost:8003/getData", + "isAuthEnabled": false, + "authUrl": "" }, "hip": { "url": "http://localhost:8000" diff --git a/test/In.ProjectEKA.FHIRHipTest/DataFlow/CollectTest.cs b/test/In.ProjectEKA.FHIRHipTest/DataFlow/CollectTest.cs index af0b252c..9c0591f8 100644 --- a/test/In.ProjectEKA.FHIRHipTest/DataFlow/CollectTest.cs +++ b/test/In.ProjectEKA.FHIRHipTest/DataFlow/CollectTest.cs @@ -1,17 +1,16 @@ -using Hl7.Fhir.Utility; - -namespace In.ProjectEKA.DefaultHipTest.DataFlow +namespace In.ProjectEKA.FHIRHipTest.DataFlow { using System; using System.Collections.Generic; - using System.Linq; using System.Net; using System.Net.Http; using System.Threading; using System.Threading.Tasks; using FHIRHip.DataFlow; + using FHIRHip.DataFlow.Model; using FluentAssertions; using HipLibrary.Patient.Model; + using Microsoft.Extensions.Options; using Moq; using Moq.Protected; using Optional.Unsafe; @@ -20,6 +19,18 @@ namespace In.ProjectEKA.DefaultHipTest.DataFlow [Collection("Collect Tests")] public class CollectTest { + private readonly IOptions dataFlowConfiguration; + + public CollectTest() + { + var dataFlow = new DataFlowConfiguration {Url = "http://localhost:8003/getData", + AuthUrl = "", + DataLinkTtlInMinutes = 0, + DataSizeLimitInMbs = 0, + IsAuthEnabled = false}; + dataFlowConfiguration = Options.Create(dataFlow); + } + [Fact] private async void ReturnCallDataFlowService() { @@ -68,7 +79,7 @@ private async void ReturnCallDataFlowService() consentManagerId, consentId, "sometext"); - var collect = new Collect("http://localhost:8003/getData", httpClient); + var collect = new Collect(dataFlowConfiguration.Value, httpClient); var entries = await collect.CollectData(dataRequest); entries.ValueOrDefault().CareBundles.Should().NotBeNull(); handlerMock.Protected().Verify( diff --git a/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs b/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs index 76dfa844..e638ccb2 100644 --- a/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs +++ b/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs @@ -1,4 +1,4 @@ -namespace In.ProjectEKA.DefaultHipTest.Discovery +namespace In.ProjectEKA.FHIRHipTest.Discovery { using System; using System.Collections.Generic; diff --git a/test/In.ProjectEKA.FHIRHipTest/In.ProjectEKA.FHIRHipTest.csproj b/test/In.ProjectEKA.FHIRHipTest/In.ProjectEKA.FHIRHipTest.csproj index eb35fc7a..9c4b0e7d 100644 --- a/test/In.ProjectEKA.FHIRHipTest/In.ProjectEKA.FHIRHipTest.csproj +++ b/test/In.ProjectEKA.FHIRHipTest/In.ProjectEKA.FHIRHipTest.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - In.ProjectEKA.DefaultHipTest + In.ProjectEKA.FHIRHipTest @@ -10,6 +10,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all + diff --git a/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs b/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs index 7b2361af..8742d8e5 100644 --- a/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs +++ b/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs @@ -1,4 +1,4 @@ -namespace In.ProjectEKA.DefaultHipTest.Link +namespace In.ProjectEKA.FHIRHipTest.Link { using FHIRHip.Link; using FluentAssertions; From f91981c7aa3b3f7d37e7fc01410f1191f229813f Mon Sep 17 00:00:00 2001 From: nexengineer Date: Mon, 24 Aug 2020 19:59:35 +0530 Subject: [PATCH 08/10] Adding network call for Discovery --- .../Discovery/PatientMatchingRepository.cs | 56 ++++++++++++++--- .../Link/PatientRepository.cs | 56 ++++++++++++----- .../Patient/IPatientRepository.cs | 3 +- .../Discovery/PatientDiscovery.cs | 5 +- .../Link/LinkPatient.cs | 15 ++--- src/In.ProjectEKA.HipService/Startup.cs | 6 +- .../appsettings.Development.json | 9 ++- src/In.ProjectEKA.HipService/appsettings.json | 5 ++ .../appsettings.local.json | 5 ++ .../PatientMatchingRepositoryTest.cs | 43 ++++++++++++- .../Link/PatientRepositoryTest.cs | 63 ++++++++++++------- .../Discovery/PatientDiscoveryTest.cs | 2 +- .../Link/LinkPatientTest.cs | 10 +-- 13 files changed, 209 insertions(+), 69 deletions(-) diff --git a/src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs b/src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs index 1f52f971..d729508c 100644 --- a/src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs +++ b/src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs @@ -1,26 +1,64 @@ namespace In.ProjectEKA.FHIRHip.Discovery { + using System; + using System.IO; using System.Linq; + using System.Net.Http; + using System.Text; using System.Threading.Tasks; using HipLibrary.Matcher; using HipLibrary.Patient.Model; - using Patient; - using static HipLibrary.Matcher.StrongMatcherFactory; + using Model; + using Newtonsoft.Json; + using Serilog; public class PatientMatchingRepository : IMatchingRepository { - private readonly string patientFilePath; + private readonly HttpClient client; + private readonly PatientConfiguration patientConfiguration; - public PatientMatchingRepository(string patientFilePath) + + public PatientMatchingRepository(HttpClient client, PatientConfiguration patientConfiguration) { - this.patientFilePath = patientFilePath; + this.client = client; + this.patientConfiguration = patientConfiguration; } - public async Task> Where(DiscoveryRequest request) + public async Task> Where(DiscoveryRequest predicate) { - var expression = GetVerifiedExpression(request.Patient.VerifiedIdentifiers); - var patientsInfo = await FileReader.ReadJsonAsync(patientFilePath); - return patientsInfo.Where(expression.Compile()).AsQueryable(); + try + { + var request = new HttpRequestMessage(HttpMethod.Post, patientConfiguration.BaseUrl + patientConfiguration.PathDiscovery) + { + Content = new StringContent( + JsonConvert.SerializeObject(new + { + mobileNumber = predicate.Patient.VerifiedIdentifiers.First().Value + }), + Encoding.UTF8, + "application/json") + }; + var response = await client.SendAsync(request); + var responseContent = response.Content; + using var reader = new StreamReader(await responseContent.ReadAsStreamAsync()); + var result = await reader.ReadToEndAsync().ConfigureAwait(false); + var patientResponseResult = JsonConvert.DeserializeObject(result); + return patientResponseResult.Results.Select(patient => new Patient + { + Name = patient.Name, + Gender = patient.Gender, + Identifier = patient.Identifier, + CareContexts = patient.CareContexts, + PhoneNumber = patient.PhoneNumber, + YearOfBirth = patient.YearOfBirth + }).AsQueryable(); + + } + catch (Exception e) + { + Log.Error(e.Message); + return null; + } } } } \ No newline at end of file diff --git a/src/In.ProjectEKA.FHIRHip/Link/PatientRepository.cs b/src/In.ProjectEKA.FHIRHip/Link/PatientRepository.cs index 89be9b56..59f3045e 100644 --- a/src/In.ProjectEKA.FHIRHip/Link/PatientRepository.cs +++ b/src/In.ProjectEKA.FHIRHip/Link/PatientRepository.cs @@ -2,39 +2,65 @@ namespace In.ProjectEKA.FHIRHip.Link { using System; using System.Collections.Generic; + using System.IO; using System.Linq; + using System.Net.Http; + using System.Text; + using System.Threading.Tasks; + using Discovery.Model; using HipLibrary.Patient; using HipLibrary.Patient.Model; + using Newtonsoft.Json; using Optional; using Patient; + using Serilog; - public class PatientRepository : IPatientRepository + public class PatientRepository : IPatientRepository { - private readonly string filePath; + private readonly HttpClient client; + private readonly PatientConfiguration patientConfiguration; - public PatientRepository(string filePath) + public PatientRepository(HttpClient client, PatientConfiguration patientConfiguration) { - this.filePath = filePath; + this.client = client; + this.patientConfiguration = patientConfiguration; } - public Option PatientWith(string referenceNumber) + public async Task> PatientWith(string referenceNumber) { try { - var patientsInfo = All(); - var patient = patientsInfo.First(p => p.Identifier == referenceNumber); - return Option.Some(patient); + var request = new HttpRequestMessage(HttpMethod.Post, patientConfiguration.BaseUrl + patientConfiguration.PathLink) + { + Content = new StringContent( + JsonConvert.SerializeObject(new + { + identifier = referenceNumber + }), + Encoding.UTF8, + "application/json") + }; + var response = await client.SendAsync(request); + var responseContent = response.Content; + using var reader = new StreamReader(await responseContent.ReadAsStreamAsync()); + var result = await reader.ReadToEndAsync().ConfigureAwait(false); + var patientResponseResult = JsonConvert.DeserializeObject(result); + var patients = patientResponseResult.Results.Select(patient => new Patient + { + Name = patient.Name, + Gender = patient.Gender, + Identifier = patient.Identifier, + CareContexts = patient.CareContexts, + PhoneNumber = patient.PhoneNumber, + YearOfBirth = patient.YearOfBirth + }).AsQueryable(); + return Option.Some(patients.First()); } - catch (Exception) + catch (Exception e) { + Log.Error(e.Message); return Option.None(); } } - - private IEnumerable All() - { - var patientsInfo = FileReader.ReadJson(filePath); - return patientsInfo; - } } } \ No newline at end of file diff --git a/src/In.ProjectEKA.HipLibrary/Patient/IPatientRepository.cs b/src/In.ProjectEKA.HipLibrary/Patient/IPatientRepository.cs index 86b50d3d..b64e9334 100644 --- a/src/In.ProjectEKA.HipLibrary/Patient/IPatientRepository.cs +++ b/src/In.ProjectEKA.HipLibrary/Patient/IPatientRepository.cs @@ -1,10 +1,11 @@ namespace In.ProjectEKA.HipLibrary.Patient { + using System.Threading.Tasks; using Model; using Optional; public interface IPatientRepository { - Option PatientWith(string referenceNumber); + Task> PatientWith(string referenceNumber); } } \ No newline at end of file diff --git a/src/In.ProjectEKA.HipService/Discovery/PatientDiscovery.cs b/src/In.ProjectEKA.HipService/Discovery/PatientDiscovery.cs index 500fa951..db44e4bf 100644 --- a/src/In.ProjectEKA.HipService/Discovery/PatientDiscovery.cs +++ b/src/In.ProjectEKA.HipService/Discovery/PatientDiscovery.cs @@ -62,8 +62,9 @@ public virtual async Task + var patientInfo = + await patientRepository.PatientWith(linkedCareContexts.First().PatientReferenceNumber); + return await patientInfo.Map(async patient => { await discoveryRequestRepository.Add(new Model.DiscoveryRequest(request.TransactionId, request.Patient.Id, diff --git a/src/In.ProjectEKA.HipService/Link/LinkPatient.cs b/src/In.ProjectEKA.HipService/Link/LinkPatient.cs index 9b0605e4..2b3d11b2 100644 --- a/src/In.ProjectEKA.HipService/Link/LinkPatient.cs +++ b/src/In.ProjectEKA.HipService/Link/LinkPatient.cs @@ -40,7 +40,7 @@ public LinkPatient( public virtual async Task> LinkPatients( PatientLinkEnquiry request) { - var (patient, error) = PatientAndCareContextValidation(request); + var (patient, error) = await PatientAndCareContextValidation(request); if (error != null) { Log.Error(error.Error.Message); @@ -95,11 +95,12 @@ await discoveryRequestRepository.Delete(request.TransactionId, request.Patient.C return (patientLinkReferenceResponse, null); } - private ValueTuple PatientAndCareContextValidation( + private async Task> PatientAndCareContextValidation( PatientLinkEnquiry request) { - return patientRepository.PatientWith(request.Patient.ReferenceNumber) - .Map( + var patientInfo = + await patientRepository.PatientWith(request.Patient.ReferenceNumber); + return patientInfo.Map( patient => { var programs = request.Patient.CareContexts @@ -133,9 +134,9 @@ public virtual async Task + var patientInfo = + await patientRepository.PatientWith(linkEnquires.PatientReferenceNumber); + return await patientInfo.Map(async patient => { var savedLinkRequests = await linkPatientRepository.Get(request.LinkReferenceNumber); savedLinkRequests.MatchSome(linkRequests => diff --git a/src/In.ProjectEKA.HipService/Startup.cs b/src/In.ProjectEKA.HipService/Startup.cs index 45d42fab..ff402ce6 100644 --- a/src/In.ProjectEKA.HipService/Startup.cs +++ b/src/In.ProjectEKA.HipService/Startup.cs @@ -80,15 +80,15 @@ public void ConfigureServices(IServiceCollection services) x => x.MigrationsAssembly("In.ProjectEKA.HipService"))) .AddHangfire(config => { config.UseMemoryStorage(); }) .AddSingleton() - .AddSingleton(new PatientRepository("demoPatients.json")) + .AddSingleton(new PatientRepository(HttpClient, Configuration.GetSection("patientConfig").Get())) .AddSingleton(new Collect(Configuration.GetSection("dataFlow").Get(), HttpClient)) - .AddSingleton(new PatientRepository("demoPatients.json")) + .AddSingleton(new PatientRepository(HttpClient, Configuration.GetSection("patientConfig").Get())) .AddRabbit(Configuration) .Configure(Configuration.GetSection("OtpService")) .Configure(Configuration.GetSection("dataFlow")) .Configure(Configuration.GetSection("hip")) .AddScoped() - .AddSingleton(new PatientMatchingRepository("demoPatients.json")) + .AddSingleton(new PatientMatchingRepository(HttpClient, Configuration.GetSection("patientConfig").Get())) .AddScoped() .AddScoped() .AddScoped() diff --git a/src/In.ProjectEKA.HipService/appsettings.Development.json b/src/In.ProjectEKA.HipService/appsettings.Development.json index ccac8bd3..64c309b4 100644 --- a/src/In.ProjectEKA.HipService/appsettings.Development.json +++ b/src/In.ProjectEKA.HipService/appsettings.Development.json @@ -51,7 +51,14 @@ }, "Gateway": { "url": "http://localhost:8000", - "timeout": 3 + "timeout": 3, + "clientId": "10000005", + "clientSecret": "95ca9a9d-1473-4172-9d87-0fd4d87ee1d6" + }, + "patientConfig": { + "baseUrl": "http://localhost:8003", + "pathDiscovery": "/discovery/patients", + "pathLink": "/discovery/search/patient" }, "BackgroundJobs": { "cancellationCheckInterval": 5 diff --git a/src/In.ProjectEKA.HipService/appsettings.json b/src/In.ProjectEKA.HipService/appsettings.json index 3896b097..cdf55a64 100644 --- a/src/In.ProjectEKA.HipService/appsettings.json +++ b/src/In.ProjectEKA.HipService/appsettings.json @@ -57,6 +57,11 @@ "clientSecret": "95ca9a9d-1473-4172-9d87-0fd4d87ee1d6", "CmSuffix": "ncg" }, + "patientConfig": { + "baseUrl": "http://localhost:8003", + "pathDiscovery": "/discovery/patients", + "pathLink": "/discovery/search/patient" + }, "BackgroundJobs": { "cancellationCheckInterval": 5 } diff --git a/src/In.ProjectEKA.HipService/appsettings.local.json b/src/In.ProjectEKA.HipService/appsettings.local.json index cfce6455..ca7ed545 100644 --- a/src/In.ProjectEKA.HipService/appsettings.local.json +++ b/src/In.ProjectEKA.HipService/appsettings.local.json @@ -56,6 +56,11 @@ "clientId": "10000005", "clientSecret": "$CLIENT_SECRET" }, + "patientConfig": { + "baseUrl": "http://localhost:8003", + "pathDiscovery": "/discovery/patients", + "pathLink": "/discovery/search/patient" + }, "BackgroundJobs": { "cancellationCheckInterval": 5 } diff --git a/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs b/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs index e638ccb2..9c4de71d 100644 --- a/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs +++ b/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs @@ -3,18 +3,39 @@ namespace In.ProjectEKA.FHIRHipTest.Discovery using System; using System.Collections.Generic; using System.Linq; + using System.Net; + using System.Net.Http; + using System.Threading; + using System.Threading.Tasks; + using FHIRHip.DataFlow.Model; using FHIRHip.Discovery; + using FHIRHip.Discovery.Model; using FluentAssertions; using HipLibrary.Patient.Model; + using Microsoft.Extensions.Options; + using Moq; + using Moq.Protected; using Xunit; [Collection("Patient Repository Tests")] public class PatientMatchingRepositoryTest { + private readonly IOptions patientConfiguration; + + public PatientMatchingRepositoryTest() + { + var dataFlow = new PatientConfiguration {BaseUrl = "http://localhost:8003", + PathDiscovery = "/discovery/patients", + PathLink = "/discovery/search/patient"}; + patientConfiguration = Options.Create(dataFlow); + } + [Fact] private async void ShouldReturnPatientsBasedOnExpression() { - var patientMatchingRepository = new PatientMatchingRepository("demoPatients.json"); + var expectedUri = new Uri("http://localhost:8003/discovery/patients"); + var handlerMock = new Mock(MockBehavior.Strict); + var httpClient = new HttpClient(handlerMock.Object); var phoneNumberIdentifier = new Identifier(IdentifierType.MOBILE, "+91-7777777777"); var request = new DiscoveryRequest( new PatientEnquiry(string.Empty, @@ -26,10 +47,28 @@ private async void ShouldReturnPatientsBasedOnExpression() string.Empty, "transactionId", DateTime.Now); + handlerMock + .Protected() + .Setup>( + "SendAsync", + ItExpr.IsAny(), + ItExpr.IsAny()) + .ReturnsAsync(new HttpResponseMessage + { + StatusCode = HttpStatusCode.OK + }) + .Verifiable(); + + var patientMatchingRepository = new PatientMatchingRepository(httpClient, patientConfiguration.Value); var patientInfo = await patientMatchingRepository.Where(request); - patientInfo.Count().Should().Be(1); + handlerMock.Protected().Verify( + "SendAsync", + Times.Exactly(1), + ItExpr.Is(message => message.Method == HttpMethod.Post + && message.RequestUri == expectedUri), + ItExpr.IsAny()); } } } diff --git a/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs b/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs index 8742d8e5..69538d79 100644 --- a/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs +++ b/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs @@ -1,46 +1,63 @@ namespace In.ProjectEKA.FHIRHipTest.Link { + using System; + using System.Net; + using System.Net.Http; + using System.Threading; + using System.Threading.Tasks; + using FHIRHip.Discovery.Model; using FHIRHip.Link; using FluentAssertions; using HipLibrary.Patient.Model; + using Microsoft.Extensions.Options; + using Moq; + using Moq.Protected; using Xunit; [Collection("Patient Repository Tests")] public class PatientRepositoryTest { - private readonly PatientRepository patientRepository = new PatientRepository("demoPatients.json"); + private readonly IOptions patientConfiguration; - [Fact] - private void ReturnPatient() + public PatientRepositoryTest() { - const string patientReferenceNumber = "RVH1002"; - var testPatient = new Patient + var dataFlow = new PatientConfiguration { - PhoneNumber = "+91-7777777777", - Identifier = patientReferenceNumber, - Gender = Gender.F, - Name = "Navjot Singh", - CareContexts = new [] - { - new CareContextRepresentation("NCP1007", "National Cancer program"), - new CareContextRepresentation("RV-MHD-01.17.0024", "Dept of Psychiatry - Episode 1"), - }, - YearOfBirth = 2001 + BaseUrl = "http://localhost:8003", + PathDiscovery = "/discovery/patients", + PathLink = "/discovery/search/patient" }; - - var patient = patientRepository.PatientWith(patientReferenceNumber); - - patient.ValueOr(new Patient()).Should().BeEquivalentTo(testPatient); + patientConfiguration = Options.Create(dataFlow); } [Fact] - private void ReturnNullForUnknownPatient() + private void ReturnPatient() { - const string patientReferenceNumber = "1234"; + var expectedUri = new Uri("http://localhost:8003/discovery/search/patient"); + const string patientReferenceNumber = "RVH1002"; + var handlerMock = new Mock(MockBehavior.Strict); + var httpClient = new HttpClient(handlerMock.Object); + handlerMock + .Protected() + .Setup>( + "SendAsync", + ItExpr.IsAny(), + ItExpr.IsAny()) + .ReturnsAsync(new HttpResponseMessage + { + StatusCode = HttpStatusCode.OK + }) + .Verifiable(); + var patientRepository = new PatientRepository(httpClient, patientConfiguration.Value); - var patient = patientRepository.PatientWith(patientReferenceNumber); + var patient = patientRepository.PatientWith(patientReferenceNumber); - patient.ValueOr((Patient) null).Should().BeNull(); + handlerMock.Protected().Verify( + "SendAsync", + Times.Exactly(1), + ItExpr.Is(message => message.Method == HttpMethod.Post + && message.RequestUri == expectedUri), + ItExpr.IsAny()); } } } \ No newline at end of file diff --git a/test/In.ProjectEKA.HipServiceTest/Discovery/PatientDiscoveryTest.cs b/test/In.ProjectEKA.HipServiceTest/Discovery/PatientDiscoveryTest.cs index 969c4369..7ae5cbd0 100644 --- a/test/In.ProjectEKA.HipServiceTest/Discovery/PatientDiscoveryTest.cs +++ b/test/In.ProjectEKA.HipServiceTest/Discovery/PatientDiscoveryTest.cs @@ -87,7 +87,7 @@ private async void ShouldReturnPatientForAlreadyLinkedPatient() new List {testLinkAccounts}, null)); patientRepository.Setup(x => x.PatientWith(testPatient.Identifier)) - .Returns(Option.Some(testPatient)); + .ReturnsAsync(Option.Some(testPatient)); var (discoveryResponse, error) = await patientDiscovery.PatientFor(discoveryRequest); diff --git a/test/In.ProjectEKA.HipServiceTest/Link/LinkPatientTest.cs b/test/In.ProjectEKA.HipServiceTest/Link/LinkPatientTest.cs index 1b8b0a47..4f18a7e0 100644 --- a/test/In.ProjectEKA.HipServiceTest/Link/LinkPatientTest.cs +++ b/test/In.ProjectEKA.HipServiceTest/Link/LinkPatientTest.cs @@ -90,8 +90,8 @@ private async void ShouldReturnLinkReferenceResponse() linkReferenceNumber)) .ReturnsAsync(Option.Some(initiatedLinkRequest)); - patientRepository.Setup(x => x.PatientWith(testPatient.Identifier)) - .Returns(Option.Some(testPatient)); + patientRepository.Setup( x => x.PatientWith(testPatient.Identifier)) + .ReturnsAsync(Option.Some(testPatient)); var (response, _) = await linkPatient.LinkPatients(patientReferenceRequest); @@ -131,7 +131,7 @@ private async void ShouldReturnCareContextNotFoundError() var patientReferenceRequest = new PatientLinkEnquiry(TestBuilders.Faker().Random.Hash(), TestBuilders.Faker().Random.Hash(), patient); patientRepository.Setup(e => e.PatientWith(testPatient.Identifier)) - .Returns(Option.Some(testPatient)); + .ReturnsAsync(Option.Some(testPatient)); var expectedError = new ErrorRepresentation( new Error(ErrorCode.CareContextNotFound, ErrorMessage.CareContextNotFound)); @@ -228,7 +228,7 @@ private async void SuccessLinkPatientForValidOtp() linkRepository.Setup(e => e.GetPatientFor(sessionId)) .ReturnsAsync(new Tuple(testLinkRequest, null)); patientRepository.Setup(x => x.PatientWith(testPatient.Identifier)) - .Returns(Option.Some(testPatient)); + .ReturnsAsync(Option.Some(testPatient)); linkRepository.Setup(x => x.Save(testLinkRequest.ConsentManagerUserId, testLinkRequest.PatientReferenceNumber, testLinkRequest.LinkReferenceNumber, @@ -276,7 +276,7 @@ private async void ErrorOnDuplicateRequestId() linkReferenceNumber)) .ReturnsAsync(Option.None()); patientRepository.Setup(x => x.PatientWith(testPatient.Identifier)) - .Returns(Option.Some(testPatient)); + .ReturnsAsync(Option.Some(testPatient)); var (_, errorRepresentation) = await linkPatient.LinkPatients(patientReferenceRequest); patientVerification.Verify(); From 054386bb22973b8a313ee310d2a15765797aeb88 Mon Sep 17 00:00:00 2001 From: nexengineer Date: Mon, 24 Aug 2020 20:03:19 +0530 Subject: [PATCH 09/10] Adding model file in Discovery --- .../Discovery/Model/PatientConfiguration.cs | 9 +++++++++ .../Discovery/Model/PatientResponse.cs | 17 +++++++++++++++++ .../Discovery/Model/PatientResponseResult.cs | 10 ++++++++++ 3 files changed, 36 insertions(+) create mode 100644 src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientConfiguration.cs create mode 100644 src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientResponse.cs create mode 100644 src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientResponseResult.cs diff --git a/src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientConfiguration.cs b/src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientConfiguration.cs new file mode 100644 index 00000000..6bf92449 --- /dev/null +++ b/src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientConfiguration.cs @@ -0,0 +1,9 @@ +namespace In.ProjectEKA.FHIRHip.Discovery.Model +{ + public class PatientConfiguration + { + public string BaseUrl { get; set; } + public string PathDiscovery { get; set; } + public string PathLink { get; set; } + } +} \ No newline at end of file diff --git a/src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientResponse.cs b/src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientResponse.cs new file mode 100644 index 00000000..b9770d2b --- /dev/null +++ b/src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientResponse.cs @@ -0,0 +1,17 @@ +namespace In.ProjectEKA.FHIRHip.Discovery.Model +{ + using System.Collections.Generic; + using HipLibrary.Patient.Model; + + public class PatientResponse + { + public string PhoneNumber { get; set; } + public string Identifier { get; set; } + public string Email { get; set; } + public string Name { get; set; } + public string CaseReferenceNumber { get; set; } + public Gender Gender { get; set; } + public ushort YearOfBirth { get; set; } + public IEnumerable CareContexts { get; set; } + } +} \ No newline at end of file diff --git a/src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientResponseResult.cs b/src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientResponseResult.cs new file mode 100644 index 00000000..8b5f45e6 --- /dev/null +++ b/src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientResponseResult.cs @@ -0,0 +1,10 @@ +namespace In.ProjectEKA.FHIRHip.Discovery.Model +{ + using System.Collections.Generic; + + public class PatientResponseResult + { + public IEnumerable Results { get; set; } + + } +} \ No newline at end of file From 355f69152f218d5a1569c4916797b1684021bf7f Mon Sep 17 00:00:00 2001 From: nexengineer Date: Tue, 25 Aug 2020 11:22:17 +0530 Subject: [PATCH 10/10] Codacy Fix --- src/In.ProjectEKA.HipService/Link/LinkPatient.cs | 6 +++--- .../Discovery/PatientMatchingRepositoryTest.cs | 2 +- .../In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/In.ProjectEKA.HipService/Link/LinkPatient.cs b/src/In.ProjectEKA.HipService/Link/LinkPatient.cs index 2b3d11b2..7b73df5e 100644 --- a/src/In.ProjectEKA.HipService/Link/LinkPatient.cs +++ b/src/In.ProjectEKA.HipService/Link/LinkPatient.cs @@ -40,7 +40,7 @@ public LinkPatient( public virtual async Task> LinkPatients( PatientLinkEnquiry request) { - var (patient, error) = await PatientAndCareContextValidation(request); + var (patient, error) = await PatientAndCareContextValidation(request).ConfigureAwait(false); if (error != null) { Log.Error(error.Error.Message); @@ -99,7 +99,7 @@ private async Task> PatientAndCareConte PatientLinkEnquiry request) { var patientInfo = - await patientRepository.PatientWith(request.Patient.ReferenceNumber); + await patientRepository.PatientWith(request.Patient.ReferenceNumber).ConfigureAwait(false); return patientInfo.Map( patient => { @@ -135,7 +135,7 @@ public virtual async Task { var savedLinkRequests = await linkPatientRepository.Get(request.LinkReferenceNumber); diff --git a/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs b/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs index 9c4de71d..e4573865 100644 --- a/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs +++ b/test/In.ProjectEKA.FHIRHipTest/Discovery/PatientMatchingRepositoryTest.cs @@ -61,7 +61,7 @@ private async void ShouldReturnPatientsBasedOnExpression() var patientMatchingRepository = new PatientMatchingRepository(httpClient, patientConfiguration.Value); - var patientInfo = await patientMatchingRepository.Where(request); + await patientMatchingRepository.Where(request); handlerMock.Protected().Verify( "SendAsync", diff --git a/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs b/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs index 69538d79..d85c6657 100644 --- a/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs +++ b/test/In.ProjectEKA.FHIRHipTest/Link/PatientRepositoryTest.cs @@ -50,7 +50,7 @@ private void ReturnPatient() .Verifiable(); var patientRepository = new PatientRepository(httpClient, patientConfiguration.Value); - var patient = patientRepository.PatientWith(patientReferenceNumber); + patientRepository.PatientWith(patientReferenceNumber); handlerMock.Protected().Verify( "SendAsync",