First set of commit for infinity labs

ProjectEKA · Mar 12, 2020 · cc47d8d · cc47d8d
1 parent 54b6756
commit cc47d8d
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 155 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - infinity-labs
 
 jobs:
   build:
@@ -31,12 +32,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:

diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -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
@@ -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"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,18 +1,18 @@
 version: '3'
 services:
-  hip:
+  hip-infi:
     build: .
     ports:
-      - "9052:80"
+      - "9053:80"
     depends_on:
-      - db
-      - otp
-      - rabbitmq
-  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
@@ -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"

diff --git a/src/In.ProjectEKA.DefaultHip/Resources/patients.json b/src/In.ProjectEKA.DefaultHip/Resources/patients.json
@@ -1,23 +1,4 @@
 [
-  {
-    "phoneNumber": "+91-9605417827",
-    "identifier": "1",
-    "firstName": "Anushree",
-    "lastName": "Raman",
-    "Gender": "F",
-    "dateOfBirth": "1995-12-06",
-    "email": "abc@tw.com",
-    "careContexts": [
-      {
-        "referenceNumber": "123",
-        "display": "National Cancer program"
-      },
-      {
-        "referenceNumber": "124",
-        "display": "National TB program"
-      }
-    ]
-  },
   {
     "phoneNumber": "+91-9036346499",
     "identifier": "3423",
@@ -28,36 +9,17 @@
     "email": "abc@tw.com",
     "careContexts": [
       {
-        "referenceNumber": "12131231",
-        "display": "National Cancer program"
-      },
-      {
-        "referenceNumber": "324242489",
-        "display": "National TB program"
-      }
-    ]
-  },
-  {
-    "phoneNumber": "+91-9036346498",
-    "identifier": "123",
-    "firstName": "TestFirstName",
-    "lastName": "TestLastName",
-    "Gender": "M",
-    "dateOfBirth": "1991-11-04",
-    "email": "abc@tw.com",
-    "careContexts": [
-      {
-        "referenceNumber": "121",
-        "display": "Test Display for 121"
+        "referenceNumber": "TBAccount-123",
+        "display": "TB Account"
       },
       {
-        "referenceNumber": "989",
-        "display": "Test Display for 989"
+        "referenceNumber": "Diabetes-11",
+        "display": "Diabetes Program"
       }
     ]
   },
   {
-    "phoneNumber": "+91-8888888888",
+    "phoneNumber": "+91-9999999999",
     "identifier": "2",
     "email": "ijk@def.com",
     "firstName": "Jane",
@@ -77,7 +39,7 @@
     ]
   },
   {
-    "phoneNumber": "+91-77777777777",
+    "phoneNumber": "+91-1111111111",
     "identifier": "3",
     "email": "def@def.com",
     "firstName": "Olivia",
@@ -95,77 +57,5 @@
         "display": "National TB program"
       }
     ]
-  },
-  {
-    "phoneNumber": "+91-666666666666",
-    "identifier": "4",
-    "email": "ghi@def.com",
-    "firstName": "Ron",
-    "lastName": "Doe",
-    "caseReferenceNumber": "341909",
-    "Gender": "M",
-    "dateOfBirth": "2019-12-03",
-    "careContexts": [
-      {
-        "referenceNumber": "129",
-        "display": "National Cancer program"
-      },
-      {
-        "referenceNumber": "130",
-        "display": "National TB program"
-      }
-    ]
-  },
-  {
-    "phoneNumber": "+91-8340289040",
-    "identifier": "5",
-    "email": "ghi@def.com",
-    "firstName": "Ron",
-    "lastName": "Doe",
-    "caseReferenceNumber": "341909",
-    "Gender": "M",
-    "dateOfBirth": "2019-12-03",
-    "careContexts": [
-      {
-        "referenceNumber": "131",
-        "display": "National Cancer program"
-      }
-    ]
-  },
-  {
-    "phoneNumber": "+91-9611727707",
-    "identifier": "6",
-    "email": "qwe@def.com",
-    "firstName": "Jane",
-    "lastName": "Doe",
-    "caseReferenceNumber": "341909",
-    "Gender": "M",
-    "dateOfBirth": "2019-12-03",
-    "careContexts": [
-      {
-        "referenceNumber": "132",
-        "display": "National Cancer program"
-      }
-    ]
-  },
-  {
-    "phoneNumber": "+91-9620004135",
-    "identifier": "7",
-    "email": "jnh@def.com",
-    "firstName": "Philip",
-    "lastName": "Doe",
-    "caseReferenceNumber": "341909",
-    "Gender": "M",
-    "dateOfBirth": "2019-12-03",
-    "careContexts": [
-      {
-        "referenceNumber": "133",
-        "display": "National Cancer program"
-      },
-      {
-        "referenceNumber": "134",
-        "display": "National TB program"
-      }
-    ]
   }
 ]
diff --git a/src/In.ProjectEKA.HipService/appsettings.Development.json b/src/In.ProjectEKA.HipService/appsettings.Development.json
@@ -11,22 +11,8 @@
     "Enrich": ["FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId"],
     "WriteTo": [
       { "Name": "Console" }
-    ]
+    ] 
   },
   "ConnectionStrings": {
-  },
-  "OtpService": {
-    "BaseUrl":"http://otp"
-  },
-  "rabbit": {
-    "HostName": "localhost",
-    "Port": 5672
-  },
-  "dataFlow": {
-    "dataSizeLimitInMbs": 5,
-    "dataLinkTTLInMinutes": 10
-  },
-  "hip": {
-    "url": "http://localhost:8000"
   }
 }
diff --git a/src/In.ProjectEKA.HipService/appsettings.json b/src/In.ProjectEKA.HipService/appsettings.json
@@ -16,21 +16,21 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     "DefaultConnection":
-    "Host=db;Port=5432;Username=postgres;Password=welcome;Database=hipservice;"
+    "Host=db;Port=5432;Username=postgres;Password=welcome;Database=infi-hip;"
   },
   "OtpService": {
     "BaseUrl":"http://otp",
     "OffsetInMinutes": 5
   },
   "rabbit": {
-    "HostName": "rabbitmq",
+    "HostName": "rabbitmq-infinity",
     "Port": 5672
   },
   "dataFlow": {
     "dataSizeLimitInMbs": 5
   },
   "hip": {
-    "url": "http://hip:8000"
+    "url": "http://hip-infi"
   },
   "authserver": {
     "url": "https://ncg-dev.projecteka.in/central-registry"

diff --git a/src/In.ProjectEKA.OtpService/appsettings.json b/src/In.ProjectEKA.OtpService/appsettings.json
@@ -16,7 +16,7 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     "DefaultConnection":
-    "Host=db;Port=5432;Username=postgres;Password=welcome;Database=otpservice;",
+    "Host=db;Port=5432;Username=postgres;Password=welcome;Database=infi-otp;",
     "TextLocaleApiKey": "fXHYhJXUUx8-QBzRD4BkZI9PPrD7rAkJnuHgNZfzoD"
   },
   "whitelisted": {