Merge remote-tracking branch 'origin/master' into issue-1552

.github/workflows/deployment.yaml

@@ -78,6 +78,8 @@ jobs:
           file: docker/prod.Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
+          build-args: |
+            APP_VERSION=${{ github.sha }}
           cache-from: type=gha,scope=cached-stage
           cache-to: type=gha,scope=cached-stage,mode=max
 
@@ -88,7 +90,7 @@ jobs:
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         with:
-          environment: staging
+          version: ${{ github.sha }}
 
   build-production:
     needs: test
@@ -136,6 +138,8 @@ jobs:
           file: docker/prod.Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
+          build-args: |
+            APP_VERSION=${{ github.sha }}
           cache-from: type=gha,scope=cached-stage
           cache-to: type=gha,scope=cached-stage,mode=max
 
@@ -146,7 +150,7 @@ jobs:
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         with:
-          environment: production
+          version: ${{ github.sha }}
 
   deploy-staging-egov:
     needs: build-staging

.github/workflows/linter.yml

@@ -3,6 +3,7 @@ name: Lint Code Base
 on:
   pull_request:
     branches: [master]
+  merge_group:
 
 jobs:
   build:

.github/workflows/test-merge-queue.yml

@@ -0,0 +1,8 @@
+name: Test Pull Request
+
+on:
+  merge_group:
+
+jobs:
+  test:
+    uses: ./.github/workflows/test-base.yml

Pipfile

@@ -18,7 +18,7 @@ django-maintenance-mode = "==0.18.0"
 django-model-utils = "==4.3.*"
 django-multiselectfield = "==0.1.12"
 django-queryset-csv = "==1.1.0"
-django-ratelimit = "==4.0.0"
+django-ratelimit = "==4.1.0"
 django-redis = "==5.*"
 django-rest-passwordreset = "==1.3.0"
 django-simple-history = "==3.3.0"

aws/backend.json

@@ -120,6 +120,14 @@
         {
           "name": "FIDELIUS_URL",
           "value": "https://fidelius.ohc.network"
+        },
+        {
+          "name": "SENTRY_TRACES_SAMPLE_RATE",
+          "value": "1.0"
+        },
+        {
+          "name": "SENTRY_PROFILES_SAMPLE_RATE",
+          "value": "1.0"
         }
       ],
       "repositoryCredentials": {

aws/celery.json

@@ -111,6 +111,14 @@
         {
           "name": "FIDELIUS_URL",
           "value": "https://fidelius.ohc.network"
+        },
+        {
+          "name": "SENTRY_TRACES_SAMPLE_RATE",
+          "value": "1.0"
+        },
+        {
+          "name": "SENTRY_PROFILES_SAMPLE_RATE",
+          "value": "1.0"
         }
       ],
       "repositoryCredentials": {
@@ -358,6 +366,14 @@
         {
           "name": "FIDELIUS_URL",
           "value": "https://fidelius.ohc.network"
+        },
+        {
+          "name": "SENTRY_TRACES_SAMPLE_RATE",
+          "value": "1.0"
+        },
+        {
+          "name": "SENTRY_PROFILES_SAMPLE_RATE",
+          "value": "1.0"
         }
       ],
       "repositoryCredentials": {

care/facility/api/viewsets/prescription.py

@@ -61,6 +61,7 @@ def get_queryset(self):
 class ConsultationPrescriptionFilter(filters.FilterSet):
     is_prn = filters.BooleanFilter()
     prescription_type = CareChoiceFilter(choice_dict=inverse_prescription_type)
+    discontinued = filters.BooleanFilter()
 
 
 class ConsultationPrescriptionViewSet(

care/templates/reports/patient_discharge_summary_pdf.html

@@ -942,7 +942,7 @@ <h4 class="font-medium text-gray-500">
 
   <div class="m-4 mb-12">
     <div class="text-sm leading-5 font-bold text-gray-500">
-      Verified By
+      Treating Physician
     </div>
     <div class="mt-1 text-sm leading-5 text-gray-900">
       {% if consultation.verified_by %}

config/settings/deployment.py

@@ -96,15 +96,14 @@
 if SENTRY_DSN := env("SENTRY_DSN", default=""):
     sentry_sdk.init(
         dsn=SENTRY_DSN,
+        release=env("APP_VERSION", default="unknown"),
         environment=env("SENTRY_ENVIRONMENT", default="deployment-unknown"),
-        traces_sample_rate=env.float("SENTRY_TRACES_SAMPLE_RATE", default=1.0),
+        traces_sample_rate=env.float("SENTRY_TRACES_SAMPLE_RATE", default=0),
+        profiles_sample_rate=env.float("SENTRY_PROFILES_SAMPLE_RATE", default=0),
         integrations=[
-            LoggingIntegration(
-                level=env.int("DJANGO_SENTRY_LOG_LEVEL", logging.INFO),
-                event_level=logging.ERROR,  # Capture info and above as breadcrumbs  # Send errors as events
-            ),
+            LoggingIntegration(event_level=logging.WARNING),
             DjangoIntegration(),
-            CeleryIntegration(),
+            CeleryIntegration(monitor_beat_tasks=True),
             RedisIntegration(),
         ],
     )

docker/prod.Dockerfile

@@ -21,18 +21,20 @@ RUN python -m venv /venv
 RUN pip install pipenv
 
 COPY Pipfile Pipfile.lock ./
-RUN pipenv install --system --deploy
+RUN pipenv sync --system --categories "packages"
 
 
 # ---
 FROM base as runtime
 
 ARG BUILD_ENVIRONMENT=production
 ARG APP_HOME=/app
+ARG APP_VERSION="unknown"
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV BUILD_ENV ${BUILD_ENVIRONMENT}
+ENV APP_VERSION ${APP_VERSION}
 
 ENV PATH /venv/bin:$PATH