Skip to content

First set of commit for infinity labs #121

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.

Sign up for GitHub

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

Draft
ganesanarun wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

First set of commit for infinity labs #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9e641f
Infinity HIP
Mar 12, 2020
5597ac9
Merge branch 'master' into infinity-labs
Mar 19, 2020
92f01c2
Merge branch 'master' into infinity-labs
Mar 20, 2020
871ff61
EKA-150 | Adding test data for diagnosticreports (#131)
angshu Mar 20, 2020
cca41d9
Merge branch 'master' into infinity-labs
Apr 1, 2020
21bf00f
Refactor collect to get the file from constructor
Apr 3, 2020
9fbdc56
Merge branch 'master' into infinity-labs
Apr 23, 2020
46e0ae4
Merging with master
Nexengineer Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: master
name: infinity-labs

on:
push:
branches:
- master
- infinity-labs

jobs:
build:
Expand Down Expand Up @@ -31,12 +31,12 @@ jobs:
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
- name: Build docker image
env:
CONTAINER_REPO_NAME: health-information-provider
CONTAINER_REPO_NAME: infinity-labs-health-information-provider
DOCKER_USERNAME: ${{ secrets.SE_DOCKER_USERNAME }}
run: docker build -t $DOCKER_USERNAME/$CONTAINER_REPO_NAME:$RELEASE_VERSION .
- name: Push Docker Container to Registry
env:
CONTAINER_REPO_NAME: health-information-provider
CONTAINER_REPO_NAME: infinity-labs-health-information-provider
DOCKER_USERNAME: ${{ secrets.SE_DOCKER_USERNAME }}
run: docker push $DOCKER_USERNAME/$CONTAINER_REPO_NAME:$RELEASE_VERSION
sonarCodeAnalysis:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ WORKDIR /app

# Copy csproj and restore as distinct layers
COPY HipServiceSrc.sln ./
COPY src/In.ProjectEKA.DefaultHip/*.csproj ./src/In.ProjectEKA.DefaultHip/
COPY src/In.ProjectEKA.InfinityHip/*.csproj ./src/In.ProjectEKA.InfinityHip/
COPY src/In.ProjectEKA.HipLibrary/*.csproj ./src/In.ProjectEKA.HipLibrary/
COPY src/In.ProjectEKA.HipService/*.csproj ./src/In.ProjectEKA.HipService/
RUN dotnet restore

# Copy everything else and build
COPY . .
WORKDIR /app/src/In.ProjectEKA.DefaultHip
WORKDIR /app/src/In.ProjectEKA.InfinityHip
RUN dotnet build -c Release -o /app

WORKDIR /app/src/In.ProjectEKA.HipService
Expand Down
30 changes: 15 additions & 15 deletions HipServiceSrc.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{461C4BC2-AAF
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.HipService", "src\In.ProjectEKA.HipService\In.ProjectEKA.HipService.csproj", "{3D613EA0-0D56-4B53-89B4-F1035A3934B4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.DefaultHip", "src\In.ProjectEKA.DefaultHip\In.ProjectEKA.DefaultHip.csproj", "{288B99D5-3659-41A3-8098-6A645CE3CEF6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.HipLibrary", "src\In.ProjectEKA.HipLibrary\In.ProjectEKA.HipLibrary.csproj", "{7B3816DD-1B05-4249-91BA-47F40EF8BF78}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.InfinityHip", "src\In.ProjectEKA.InfinityHip\In.ProjectEKA.InfinityHip.csproj", "{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -36,18 +36,6 @@ Global
{3D613EA0-0D56-4B53-89B4-F1035A3934B4}.Release|x64.Build.0 = Release|Any CPU
{3D613EA0-0D56-4B53-89B4-F1035A3934B4}.Release|x86.ActiveCfg = Release|Any CPU
{3D613EA0-0D56-4B53-89B4-F1035A3934B4}.Release|x86.Build.0 = Release|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Debug|x64.ActiveCfg = Debug|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Debug|x64.Build.0 = Debug|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Debug|x86.ActiveCfg = Debug|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Debug|x86.Build.0 = Debug|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Release|Any CPU.Build.0 = Release|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Release|x64.ActiveCfg = Release|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Release|x64.Build.0 = Release|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Release|x86.ActiveCfg = Release|Any CPU
{288B99D5-3659-41A3-8098-6A645CE3CEF6}.Release|x86.Build.0 = Release|Any CPU
{7B3816DD-1B05-4249-91BA-47F40EF8BF78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7B3816DD-1B05-4249-91BA-47F40EF8BF78}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B3816DD-1B05-4249-91BA-47F40EF8BF78}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -60,10 +48,22 @@ Global
{7B3816DD-1B05-4249-91BA-47F40EF8BF78}.Release|x64.Build.0 = Release|Any CPU
{7B3816DD-1B05-4249-91BA-47F40EF8BF78}.Release|x86.ActiveCfg = Release|Any CPU
{7B3816DD-1B05-4249-91BA-47F40EF8BF78}.Release|x86.Build.0 = Release|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Debug|x64.ActiveCfg = Debug|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Debug|x64.Build.0 = Debug|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Debug|x86.ActiveCfg = Debug|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Debug|x86.Build.0 = Debug|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Release|Any CPU.Build.0 = Release|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Release|x64.ActiveCfg = Release|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Release|x64.Build.0 = Release|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Release|x86.ActiveCfg = Release|Any CPU
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{3D613EA0-0D56-4B53-89B4-F1035A3934B4} = {461C4BC2-AAFA-41D1-B508-46D26912A31E}
{288B99D5-3659-41A3-8098-6A645CE3CEF6} = {461C4BC2-AAFA-41D1-B508-46D26912A31E}
{7B3816DD-1B05-4249-91BA-47F40EF8BF78} = {461C4BC2-AAFA-41D1-B508-46D26912A31E}
{0A6FF7F9-4190-4749-ACCE-B3B175F208FB} = {461C4BC2-AAFA-41D1-B508-46D26912A31E}
EndGlobalSection
EndGlobal
18 changes: 9 additions & 9 deletions docker-compose.development.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
version: '3'
services:
hip:
image: "ganesan92/health-information-provider"
hip-infi:
image: "ganesan92/infinity-labs-health-information-provider"
ports:
- "8000:80"
depends_on:
- db
- otp
- rabbitmq
otp:
- db-infi
- otp-infi
- rabbitmq-infi
otp-infi:
image: "ganesan92/otp-service"
depends_on:
- db
db:
- db-infi
db-infi:
image: "postgres:latest"
environment:
- POSTGRES_USER=postgres
Expand All @@ -22,7 +22,7 @@ services:
volumes:
- postgresql:/var/lib/postgresql
- postgresql_data:/var/lib/postgresql/data
rabbitmq:
rabbitmq-infi:
image: "rabbitmq:3"
ports:
- "5672:5672"
Expand Down
18 changes: 9 additions & 9 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
version: '3'
services:
hip:
hip-infi:
build: .
ports:
- "9052:80"
- "9053:80"
depends_on:
- db
- rabbitmq
- otp
otp:
- db-infi
- otp-infi
- rabbitmq-infi
otp-infi:
build: src/In.ProjectEKA.OtpService/.
depends_on:
- db
db:
- db-infi
db-infi:
image: "postgres:latest"
environment:
- POSTGRES_USER=postgres
Expand All @@ -22,7 +22,7 @@ services:
volumes:
- postgresql:/var/lib/postgresql
- postgresql_data:/var/lib/postgresql/data
rabbitmq:
rabbitmq-infi:
image: "rabbitmq:3"
ports:
- "5672:5672"
Expand Down
4 changes: 2 additions & 2 deletions hip-service.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.DefaultHip", "src\In.ProjectEKA.DefaultHip\In.ProjectEKA.DefaultHip.csproj", "{23976B61-FBF9-41B8-AEA2-B70AD47F00A8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "In.ProjectEKA.InfinityHip", "src\In.ProjectEKA.InfinityHip\In.ProjectEKA.InfinityHip.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.InfinityHipTest", "test\In.ProjectEKA.InfinityHipTest\In.ProjectEKA.InfinityHipTest.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
Expand Down
195 changes: 0 additions & 195 deletions src/In.ProjectEKA.DefaultHip/Resources/patients.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/In.ProjectEKA.HipLibrary/Matcher/EmptyMatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ namespace In.ProjectEKA.HipLibrary.Matcher
{
using System;
using System.Linq.Expressions;
using Patient;
using Patient.Model;

public class EmptyMatcher : IIdentifierMatcher
Expand Down
3 changes: 2 additions & 1 deletion src/In.ProjectEKA.HipService/Consent/ConsentController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public ConsentController(IConsentRepository consentRepository)

[HttpPost]
public async Task<ActionResult> StoreConsent(
[FromHeader(Name = "X-ConsentManagerID")] string consentManagerId,
[FromHeader(Name = "X-ConsentManagerID")]
string consentManagerId,
[FromBody] ConsentArtefactRequest consentArtefactRequest)
{
if (consentArtefactRequest.Status == ConsentStatus.GRANTED)
Expand Down
Loading