Merge remote-tracking branch 'origin/develop' into feature/dev_env

* origin/develop:
  add env variables to Dockerfile
  Add connect src configuration
  Fix CSP configuration
  github fixes
  Update django-celery-boost version
  Add docstring to DataGetter
  AB#241769: aurora import according to use beneficiary groups (#63)
  Add few more tests
  removes parrallel tests due to fale positive
  Fix tests
  Add cache for Kobo data
  add tests
  Household/Individual change history
  history initial commit

Author: saxix

.github/workflows/test.yml

@@ -142,14 +142,12 @@ jobs:
               -e CELERY_BROKER_URL=${CELERY_BROKER_URL} \
               -e CACHE_URL=${CACHE_URL} \
               -e SECRET_KEY=super-secret-key-just-for-testing \
-              -e HOPE_API_URL="https://dev-hope.unitst.org/api/rest/" \
-              -e AURORA_API_URL="https://uni-hope-ukr-sr-dev.unitst.org/api/" \
               -v "./output/:/app/output" \
               -v "./src/:/app/src" \
               -v "./tests:/app/tests" \
               -v "./pytest.ini:/app/pytest.ini" \
               -t ${{env.IMAGE}} \
-              pytest tests/ --create-db --selenium -n auto -v --maxfail=5 --migrations --cov-report xml:./output/coverage.xml --record-mode none
+              pytest tests/ --create-db --selenium -v --maxfail=5 --migrations --cov-report xml:./output/coverage.xml --record-mode none
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4

docker/Dockerfile

@@ -131,7 +131,9 @@ ENV PATH=/venv/bin:/usr/local/bin/:/usr/bin:/bin \
     PGSSLCERT="/tmp/postgresql.crt" \
     UV_PROJECT_ENVIRONMENT=/venv \
     VIRTUAL_ENV=/venv \
-    UWSGI_PROCESSES=4
+    UWSGI_PROCESSES=4 \
+    MEDIA_ROOT="${MEDIA_ROOT:-/var/run/app/media}" \
+    STATIC_ROOT="${STATIC_ROOT:-/var/run/app/static}"
 
 RUN <<EOF cat> /RELEASE
 {"version": "$VERSION",

docker/bin/docker-entrypoint.sh

@@ -1,8 +1,6 @@
 #!/bin/sh -e
 
 
-export MEDIA_ROOT="${MEDIA_ROOT:-/var/run/app/media}"
-export STATIC_ROOT="${STATIC_ROOT:-/var/run/app/static}"
 export UWSGI_PROCESSES="${UWSGI_PROCESSES:-"4"}"
 export DJANGO_SETTINGS_MODULE="country_workspace.config.settings"
 mkdir -p "${MEDIA_ROOT}" "${STATIC_ROOT}" || echo "Cannot create dirs ${MEDIA_ROOT} ${STATIC_ROOT}"

pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "django-adminfilters>=2.5.2",
     "django-cacheops>=7.1",
     "django-celery-beat>=2.6.0",
-    "django-celery-boost>=0.5.0",
+    "django-celery-boost>=0.6.2",
     "django-celery-results>=2.5.1",
     "django-concurrency>=2.6.0",
     "django-constance>=4.1.3",
@@ -51,6 +51,7 @@ dependencies = [
     "sentry-sdk>=2.7.1",
     "social-auth-app-django",
     "unicef-security>=1.5.1",
+    "django-pghistory>=3.5.4",
 ]
 [project.scripts]
 celery-monitor = "country_workspace.__monitor__:run"

ruff.toml

@@ -90,3 +90,4 @@ section-order = ["future", "standard-library", "third-party", "first-party",  "l
 [lint.per-file-ignores]
 "tests/**.py" = ["S101", "PLR2004", "S", "SIM117", "D", "UP", "PLR0913", "ANN", "N999"]
 "src/**/versioning/**.py" = ["N999", ]
+"src/**/migrations/**.py" = ["E501", ]

src/country_workspace/admin/beneficiary_group.py

@@ -2,6 +2,7 @@
 from django.http import HttpRequest
 
 from country_workspace.models import BeneficiaryGroup
+
 from .base import BaseModelAdmin
 
 

src/country_workspace/admin/user.py

@@ -3,6 +3,7 @@
 from django.db.models import Q, QuerySet
 from django.http import HttpRequest, JsonResponse
 from unicef_security.admin import UserAdminPlus
+
 from ..models import User
 
 

src/country_workspace/cache/middleware.py

@@ -36,8 +36,11 @@ def process_response(self, request: HttpRequest, response: HttpResponse) -> Http
         timeout = self.page_timeout
         patch_response_headers(response, timeout)
         if response.status_code == 200:
-            cache_key = self.manager.build_key_from_request(request, "view", getattr(request.user, "pk", ""))
-            response.headers["Etag"] = cache_key
+            if "Etag" in response.headers:
+                cache_key = response.headers["Etag"]
+            else:
+                cache_key = self.manager.build_key_from_request(request, "view", getattr(request.user, "pk", ""))
+                response.headers["Etag"] = cache_key
             if hasattr(response, "render") and callable(response.render):
                 response.add_post_render_callback(lambda r: self.manager.store(cache_key, r))
             else:

src/country_workspace/config/fragments/constance.py

@@ -51,6 +51,7 @@
     "KOBO_MASTER_API_TOKEN": (KOBO_MASTER_API_TOKEN, "Kobo API Master Access Token", "write_only_input"),
     "KOBO_PROJECT_VIEW_ID": (KOBO_PROJECT_VIEW_ID, "Kobo Project View ID", str),
     "KOBO_KF_URL": (KOBO_KF_URL, "Kobo Server address", str),
+    "KOBO_CACHE_TTL": (86400, "Kobo data cache TTL", int),
     "CACHE_TIMEOUT": (86400, "Cache Redis TTL", int),
     "CACHE_BY_VERSION": (False, "Invalidate Cache on CW version change", bool),
     "CONCURRENCY_GUARD": (
@@ -74,6 +75,7 @@
         "KOBO_MASTER_API_TOKEN",
         "KOBO_PROJECT_VIEW_ID",
         "KOBO_KF_URL",
+        "KOBO_CACHE_TTL",
     ),
     "Data consistency": ("CONCURRENCY_GUARD",),
 }

src/country_workspace/config/fragments/csp.py

@@ -1,16 +1,9 @@
-CSP_DEFAULT_SRC = [
-    "'self'",
-    "'unsafe-inline'",
-    "cdnjs.cloudflare.com",
-    "saunihopedev.blob.core.windows.net",
-    "saunihopestg.blob.core.windows.net",
-    "saunihopetrn.blob.core.windows.net",
-    "saunihopeprd.blob.core.windows.net",
-]
+CSP_DEFAULT_SRC = ["'none'"]
 CSP_STYLE_SRC = [
     "'self'",
     "'unsafe-inline'",
     "same-origin",
+    "cdnjs.cloudflare.com",
     "fonts.googleapis.com",
     "fonts.gstatic.com",
     "saunihopedev.blob.core.windows.net",
@@ -43,7 +36,6 @@
 ]
 CSP_FONT_SRC = [
     "'self'",
-    "fonts.googleapis.com",
     "same-origin",
     "fonts.googleapis.com",
     "fonts.gstatic.com",
@@ -53,3 +45,4 @@
     "saunihopetrn.blob.core.windows.net",
     "saunihopeprd.blob.core.windows.net",
 ]
+CSP_CONNECT_SRC = ["'self'"]