Merge branch 'develop' into creating-test-cases-for-asset-bed

ohcnetwork · Oct 22, 2024 · 2d12be6 · 2d12be6
2 parents 204460e + 8bac44a
commit 2d12be6
Show file tree

Hide file tree

Showing 64 changed files with 180 additions and 5,885 deletions.
diff --git a/.env.example b/.env.example
@@ -7,8 +7,6 @@ DATABASE_URL=postgres://postgres:postgres@localhost:5433/care
 REDIS_URL=redis://localhost:6380
 CELERY_BROKER_URL=redis://localhost:6380/0
 
-FIDELIUS_URL=http://localhost:8092
-
 DJANGO_DEBUG=False
 
 BUCKET_REGION=ap-south-1

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1 @@
-* @ohcnetwork/care-developers
-*.yml @tomahawk-pilot
+* @ohcnetwork/care-backend-admins
diff --git a/Pipfile b/Pipfile
@@ -29,7 +29,7 @@ gunicorn = "==23.0.0"
 healthy-django = "==0.1.0"
 jsonschema = "==4.23.0"
 jwcrypto = "==1.5.6"
-newrelic = "==10.0.0"
+newrelic = "==10.1.0"
 pillow = "==10.4.0"
 psycopg = { extras = ["c"], version = "==3.2.2" }
 pycryptodome = "==3.20.0"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/aws/backend.json b/aws/backend.json
@@ -114,29 +114,21 @@
           "value": "True"
         },
         {
-          "name": "ENABLE_ABDM",
-          "value": "True"
-        },
-        {
-          "name": "ABDM_URL",
+          "name": "ABDM_GATEWAY_URL",
           "value": "https://dev.abdm.gov.in"
         },
         {
-          "name": "HEALTH_SERVICE_API_URL",
-          "value": "https://healthidsbx.abdm.gov.in/api"
+          "name": "ABDM_ABHA_URL",
+          "value": "https://abhasbx.abdm.gov.in"
         },
         {
           "name": "ABDM_FACILITY_URL",
           "value": "https://facilitysbx.abdm.gov.in"
         },
         {
-          "name": "X_CM_ID",
+          "name": "ABDM_CM_ID",
           "value": "sbx"
         },
-        {
-          "name": "FIDELIUS_URL",
-          "value": "https://fidelius.ohc.network"
-        },
         {
           "name": "SENTRY_TRACES_SAMPLE_RATE",
           "value": "1.0"

diff --git a/aws/celery.json b/aws/celery.json
@@ -11,9 +11,7 @@
         }
       },
       "portMappings": [],
-      "command": [
-        "/app/celery_beat-ecs.sh"
-      ],
+      "command": ["/app/celery_beat-ecs.sh"],
       "cpu": 128,
       "environment": [
         {
@@ -97,29 +95,21 @@
           "value": "True"
         },
         {
-          "name": "ENABLE_ABDM",
-          "value": "True"
-        },
-        {
-          "name": "ABDM_URL",
+          "name": "ABDM_GATEWAY_URL",
           "value": "https://dev.abdm.gov.in"
         },
         {
-          "name": "HEALTH_SERVICE_API_URL",
-          "value": "https://healthidsbx.abdm.gov.in/api"
+          "name": "ABDM_ABHA_URL",
+          "value": "https://abhasbx.abdm.gov.in"
         },
         {
           "name": "ABDM_FACILITY_URL",
           "value": "https://facilitysbx.abdm.gov.in"
         },
         {
-          "name": "X_CM_ID",
+          "name": "ABDM_CM_ID",
           "value": "sbx"
         },
-        {
-          "name": "FIDELIUS_URL",
-          "value": "https://fidelius.ohc.network"
-        },
         {
           "name": "SENTRY_TRACES_SAMPLE_RATE",
           "value": "1.0"
@@ -296,9 +286,7 @@
           "awslogs-stream-prefix": "ecs"
         }
       },
-      "command": [
-        "/app/celery_worker-ecs.sh"
-      ],
+      "command": ["/app/celery_worker-ecs.sh"],
       "cpu": 384,
       "memory": 1536,
       "memoryReservation": 1536,
@@ -384,24 +372,20 @@
           "value": "True"
         },
         {
-          "name": "ENABLE_ABDM",
-          "value": "True"
-        },
-        {
-          "name": "ABDM_URL",
+          "name": "ABDM_GATEWAY_URL",
           "value": "https://dev.abdm.gov.in"
         },
         {
-          "name": "HEALTH_SERVICE_API_URL",
-          "value": "https://healthidsbx.abdm.gov.in/api"
+          "name": "ABDM_ABHA_URL",
+          "value": "https://abhasbx.abdm.gov.in"
         },
         {
-          "name": "X_CM_ID",
-          "value": "sbx"
+          "name": "ABDM_FACILITY_URL",
+          "value": "https://facilitysbx.abdm.gov.in"
         },
         {
-          "name": "FIDELIUS_URL",
-          "value": "https://fidelius.ohc.network"
+          "name": "ABDM_CM_ID",
+          "value": "sbx"
         },
         {
           "name": "SENTRY_TRACES_SAMPLE_RATE",

diff --git a/care/abdm/__init__.py b/care/abdm/__init__.py
diff --git a/care/abdm/admin.py b/care/abdm/admin.py
diff --git a/care/abdm/api/__init__.py b/care/abdm/api/__init__.py
diff --git a/care/abdm/api/serializers/abha_number.py b/care/abdm/api/serializers/abha_number.py
diff --git a/care/abdm/api/serializers/auth.py b/care/abdm/api/serializers/auth.py
diff --git a/care/abdm/api/serializers/consent.py b/care/abdm/api/serializers/consent.py
diff --git a/care/abdm/api/serializers/health_facility.py b/care/abdm/api/serializers/health_facility.py
diff --git a/care/abdm/api/serializers/healthid.py b/care/abdm/api/serializers/healthid.py