Merge pull request #2267 from coronasafe/develop

.github/workflows/deploy.yml

@@ -34,6 +34,10 @@ env:
 jobs:
   test:
     uses: ./.github/workflows/reusable-test.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+    with:
+      event_name: ${{ github.event_name }}
 
   build:
     needs: test

.github/workflows/docs.yml

@@ -37,7 +37,7 @@ jobs:
           make -C ./docs html
 
       - name: Upload sphinx documentation
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sphinx-docs
           path: ./docs/_build/html

.github/workflows/reusable-test.yml

@@ -2,6 +2,14 @@ name: Test
 
 on:
   workflow_call:
+    secrets:
+      CODECOV_TOKEN:
+        required: true
+    inputs:
+      event_name:
+        required: false
+        type: string
+        default: 'pull_request'
 
 jobs:
   test:
@@ -12,8 +20,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Cache Docker layers
-        uses: actions/cache@v3
+      - name: Restore Docker layers cache
+        id: cache-restore
+        uses: actions/cache/restore@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('Pipfile.lock', 'docker/dev.Dockerfile') }}
@@ -54,7 +63,14 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
-      - name: Move cache
+      - name: Move new cache
         run: |
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+      - name: Save Docker layers cache
+        if: ${{ inputs.event_name == 'push' || github.event_name == 'push' }}
+        uses: actions/cache/save@v4
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ hashFiles('Pipfile.lock', 'docker/dev.Dockerfile') }}

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

@@ -6,3 +6,7 @@ on:
 jobs:
   test:
     uses: ./.github/workflows/reusable-test.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+    with:
+      event_name: ${{ github.event_name }}

.github/workflows/test-pull-request.yml

@@ -10,3 +10,7 @@ concurrency:
 jobs:
   test:
     uses: ./.github/workflows/reusable-test.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+    with:
+      event_name: ${{ github.event_name }}

Pipfile

@@ -40,10 +40,10 @@ pydantic = "==1.10.15" # fix for fhir.resources < 7.0.2
 pyjwt = "==2.8.0"
 python-slugify = "==8.0.4"
 pywebpush = "==1.14.0"
-redis = { extras = ["hiredis"], version = "==5.0.3" } # constraint for redis-om
+redis = { extras = ["hiredis"], version = "==5.0.5" } # constraint for redis-om
 redis-om = "==0.3.1"
 requests = "==2.32.3"
-sentry-sdk = "==2.3.1"
+sentry-sdk = "==2.5.1"
 whitenoise = "==6.6.0"
 
 [dev-packages]

care/facility/api/serializers/facility.py

@@ -165,7 +165,7 @@ def save(self, **kwargs):
         facility = self.instance
         image = self.validated_data["cover_image"]
         image_extension = image.name.rsplit(".", 1)[-1]
-        config, bucket_name = get_client_config(BucketType.FACILITY, True)
+        config, bucket_name = get_client_config(BucketType.FACILITY)
         s3 = boto3.client("s3", **config)
         image_location = f"cover_images/{facility.external_id}_cover.{image_extension}"
         s3.put_object(

care/facility/tests/test_unlink_district_admins.py

@@ -79,3 +79,10 @@ def test_unlink_faciltity_admin_different_district(self):
         )
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
         self.assertEqual(response.json()["detail"], "User not found")
+
+    def test_unlink_home_facility_by_nurse(self):
+        self.client.force_login(self.staff1)
+        response = self.client.delete(
+            f"/api/v1/users/{self.staff1.username}/clear_home_facility/"
+        )
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)

care/users/api/viewsets/users.py

@@ -287,6 +287,11 @@ def clear_home_facility(self, request, *args, **kwargs):
         if not user.home_facility:
             raise ValidationError({"home_facility": "No Home Facility Present"})
         if (
+            requesting_user.id == user.id
+            and requesting_user.user_type == User.TYPE_VALUE_MAP["Nurse"]
+        ):
+            pass
+        elif (
             requesting_user.user_type < User.TYPE_VALUE_MAP["DistrictAdmin"]
             or requesting_user.user_type in User.READ_ONLY_TYPES
         ):