-
Notifications
You must be signed in to change notification settings - Fork 19
Network Hip initial implementation(AIIMS) #373
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Nexengineer
wants to merge
13
commits into
master
Choose a base branch
from
NetworkHip
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
9ca4c9b
Network hip intial implementation
Nexengineer 534a294
Fixing test case
Nexengineer 638b03c
PR Fixes
Nexengineer 4154fee
Test case fixes
Nexengineer 98242ee
Codacy fix
Nexengineer b661805
PR Review Fixes
Nexengineer 26f01d2
PR fixes
Nexengineer f91981c
Adding network call for Discovery
Nexengineer 054386b
Adding model file in Discovery
Nexengineer 97517bf
Merge branch 'master' into NetworkHip
Nexengineer 355f691
Codacy Fix
Nexengineer 6305715
Merge branch 'NetworkHip' of https://github.com/ProjectEKA/hip-servic…
Nexengineer d56e534
Merging with master
Nexengineer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 0 additions & 26 deletions
26
src/In.ProjectEKA.DefaultHip/Discovery/PatientMatchingRepository.cs
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
....DefaultHip/DataFlow/CareContextRecord.cs → ...EKA.FHIRHip/DataFlow/CareContextRecord.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| namespace In.ProjectEKA.FHIRHip.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 Serilog; | ||
|
|
||
| public class Collect : ICollect | ||
| { | ||
| private readonly DataFlowConfiguration DataFlowConfiguration; | ||
| private readonly HttpClient HttpClient; | ||
|
|
||
| public Collect(DataFlowConfiguration dataFlowConfiguration, HttpClient httpClient) | ||
| { | ||
| DataFlowConfiguration = dataFlowConfiguration; | ||
| HttpClient = httpClient; | ||
| } | ||
|
|
||
| public async Task<Option<Entries>> CollectData(TraceableDataRequest dataRequest) | ||
| { | ||
| var bundles = new List<CareBundle>(); | ||
| 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<Bundle>(result))); | ||
| } | ||
| } | ||
| var entries = new Entries(bundles); | ||
| return Option.Some(entries); | ||
| } | ||
|
|
||
| private async Task<Dictionary<string, List<string>>> FindPatientsData(TraceableDataRequest 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)).ConfigureAwait(false); | ||
| var structuredData = new Dictionary<string, List<string>>(); | ||
| return dataResponse.Map(content => | ||
| { | ||
| foreach (var result in content.Results) | ||
| { | ||
| if (structuredData.ContainsKey(result.CareContext)) | ||
| { | ||
| structuredData[result.CareContext].Add(result.FHIRData); | ||
| } | ||
| else | ||
| { | ||
| structuredData.Add(result.CareContext, new List<string> {result.FHIRData}); | ||
| } | ||
| } | ||
| return structuredData; | ||
| }).ValueOr(structuredData); | ||
| } | ||
|
|
||
| private async Task<Option<NetworkDataResponse>> 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($"{DataFlowConfiguration.Url}")) | ||
| { | ||
| Content = new StringContent(json, Encoding.UTF8, MediaTypeNames.Application.Json) | ||
| }; | ||
| var response = await HttpClient.SendAsync(httpRequestMessage).ConfigureAwait(false); | ||
| if (!response.IsSuccessStatusCode) | ||
| { | ||
| return Option.None<NetworkDataResponse>(); | ||
| } | ||
| var responseContent = response.Content; | ||
| using var reader = new StreamReader(await responseContent.ReadAsStreamAsync()); | ||
| var result = await reader.ReadToEndAsync().ConfigureAwait(false); | ||
| return Option.Some(JsonConvert.DeserializeObject<NetworkDataResponse>(result)); | ||
| } | ||
| catch (Exception exception) | ||
| { | ||
| Log.Error(exception, exception.StackTrace); | ||
| return Option.None<NetworkDataResponse>(); | ||
| } | ||
| } | ||
|
|
||
| private static void LogDataRequest(TraceableDataRequest 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}"); | ||
| } | ||
| } | ||
| } |
11 changes: 11 additions & 0 deletions
11
src/In.ProjectEKA.FHIRHip/DataFlow/Model/DataFlowConfiguration.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| namespace In.ProjectEKA.FHIRHip.DataFlow.Model | ||
| { | ||
| using HipLibrary.Patient.Model; | ||
|
|
||
| public class NetworkData | ||
| { | ||
| public string CareContext { get; set; } | ||
| public HiType HiType { get; set; } | ||
| public string FHIRData { get; set; } | ||
|
|
||
| public NetworkData(string careContext, HiType hiType, string fhirData) | ||
| { | ||
| CareContext = careContext; | ||
| HiType = hiType; | ||
| FHIRData = fhirData; | ||
| } | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataRequest.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| namespace In.ProjectEKA.FHIRHip.DataFlow.Model | ||
| { | ||
| using System.Collections.Generic; | ||
| using HipLibrary.Patient.Model; | ||
|
|
||
| public class NetworkDataRequest | ||
| { | ||
| public string PatientReference { get; set; } | ||
| public IEnumerable<string> CareContexts { get; set; } | ||
| public DateRange DataRange { get; set; } | ||
| public IEnumerable<HiType> HiTypes { get; set; } | ||
|
|
||
| public NetworkDataRequest(string patientReference, IEnumerable<string> careContexts, DateRange dataRange, IEnumerable<HiType> hiTypes) | ||
| { | ||
| PatientReference = patientReference; | ||
| CareContexts = careContexts; | ||
| DataRange = dataRange; | ||
| HiTypes = hiTypes; | ||
| } | ||
| } | ||
| } | ||
14 changes: 14 additions & 0 deletions
14
src/In.ProjectEKA.FHIRHip/DataFlow/Model/NetworkDataResponse.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| namespace In.ProjectEKA.FHIRHip.DataFlow.Model | ||
| { | ||
| using System.Collections.Generic; | ||
|
|
||
| public class NetworkDataResponse | ||
| { | ||
| public IEnumerable<NetworkData> Results { get; set; } | ||
|
|
||
| public NetworkDataResponse(IEnumerable<NetworkData> results) | ||
| { | ||
| Results = results; | ||
| } | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientConfiguration.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; } | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientResponse.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<CareContextRepresentation> CareContexts { get; set; } | ||
| } | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/In.ProjectEKA.FHIRHip/Discovery/Model/PatientResponseResult.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| namespace In.ProjectEKA.FHIRHip.Discovery.Model | ||
| { | ||
| using System.Collections.Generic; | ||
|
|
||
| public class PatientResponseResult | ||
| { | ||
| public IEnumerable<PatientResponse> Results { get; set; } | ||
|
|
||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
src/In.ProjectEKA.FHIRHip/Discovery/PatientMatchingRepository.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +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 Model; | ||
| using Newtonsoft.Json; | ||
| using Serilog; | ||
|
|
||
| public class PatientMatchingRepository : IMatchingRepository | ||
| { | ||
| private readonly HttpClient client; | ||
| private readonly PatientConfiguration patientConfiguration; | ||
|
|
||
|
|
||
| public PatientMatchingRepository(HttpClient client, PatientConfiguration patientConfiguration) | ||
| { | ||
| this.client = client; | ||
| this.patientConfiguration = patientConfiguration; | ||
| } | ||
|
|
||
| public async Task<IQueryable<Patient>> Where(DiscoveryRequest predicate) | ||
| { | ||
| 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<PatientResponseResult>(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; | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.