Merge pull request #12 from ukhsa-collaboration/feature/A10N-2356

mike-severs-flp · web-flow · commit 5d91878ec95a · 2026-06-04T14:48:04.000+01:00
Feature/a10 n 2356
diff --git a/.python-version b/.python-version
@@ -1 +1 @@
-3.11
+3.11.14
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11.9-slim-bullseye
+FROM python:3.11.14-slim-bookworm
 ENV PYTHONUNBUFFERED=1
 
 RUN apt-get update &&\
diff --git a/active10/middleware.py b/active10/middleware.py
@@ -54,9 +54,8 @@ class SecurityHeadersMiddleware(MiddlewareMixin):
     def process_response(self, request, response):
         response["Permissions-Policy"] = "geolocation=(), microphone=(), camera=()"
 
-        # these headers do not necessarily apply to this app
-        # response['Cross-Origin-Embedder-Policy'] = 'require-corp'
-        # response['Cross-Origin-Resource-Policy'] = 'same-origin'
+        response['Cross-Origin-Embedder-Policy'] = 'require-corp'
+        response['Cross-Origin-Resource-Policy'] = 'same-origin'
         return response
 
 
diff --git a/active10/settings.py b/active10/settings.py
@@ -401,6 +401,7 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
 
+AWS_S3_CUSTOM_DOMAIN = None
 if getenv("AWS_STORAGE_BUCKET_NAME", None) is not None:
     REDIRECT_STATIC_TO_CDN = True
     AWS_ACCESS_KEY_ID = getenv("AWS_ACCESS_KEY_ID", "")
@@ -476,3 +477,10 @@
 )
 CSP_IMG_SRC = ("'self'", "*.s3.amazonaws.com", AWS_S3_CUSTOM_DOMAIN, "https://www.gravatar.com")
 CSP_FONT_SRC = ("'self'", "*.s3.amazonaws.com", AWS_S3_CUSTOM_DOMAIN, "https://www.gravatar.com")
+if AWS_S3_CUSTOM_DOMAIN:
+    CSP_DEFAULT_SRC.append(AWS_S3_CUSTOM_DOMAIN)
+    CSP_STYLE_SRC.append(AWS_S3_CUSTOM_DOMAIN)
+    CSP_SCRIPT_SRC.append(AWS_S3_CUSTOM_DOMAIN)
+    CSP_IMG_SRC.append(AWS_S3_CUSTOM_DOMAIN)
+    CSP_FONT_SRC.append(AWS_S3_CUSTOM_DOMAIN)
+
diff --git a/applications/articles/serializers.py b/applications/articles/serializers.py
@@ -1,6 +1,6 @@
 from rest_framework import serializers
 
-from .models import Article, ArticleCategory, ContentView
+from .models import Article, ArticleCategory
 from .utils import html_text_to_json
 
 
@@ -28,14 +28,10 @@ def get_destination(self, obj):
         return {"ios": ios, "android": android}
 
     def get_view_ids(self, obj):
-        return obj.views.through.objects.filter(article=obj.id).order_by("order").values_list("view_id", flat=True)
+        return [av.view_id for av in obj.articleview_set.all()]
 
     def get_related_article_ids(self, obj):
-        return (
-            obj.related.through.objects.filter(article=obj.id)
-            .order_by("order")
-            .values_list("related_article", flat=True)
-        )
+        return [ar.related_article_id for ar in obj.parent_article.all()]
 
     def get_category_name(self, obj):
         return obj.category.name
@@ -50,7 +46,7 @@ def get_content_as_json(self, obj):
         return html_text_to_json(obj.content)
 
     def get_content_view_ids(self, obj):
-        return ContentView.objects.filter(article__id=obj.id).order_by("order").values_list("view_id", flat=True)
+        return [cv.view_id for cv in obj.contentview_set.all()]
 
     class Meta:
         model = Article
diff --git a/applications/articles/views.py b/applications/articles/views.py
@@ -1,15 +1,22 @@
+from django.db.models import Prefetch
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_page
 from rest_framework import viewsets
 from rest_framework.response import Response
 
-from .models import Article, ArticleCategory
+from .models import Article, ArticleCategory, ArticleView, ArticleRelated, ContentView
 from .serializers import ArticleCategorySerializer, ArticleSerializer
 
 
 @method_decorator(cache_page(60), name="dispatch")
 class ArticlesViewSet(viewsets.ModelViewSet):
-    queryset = Article.objects.filter(published=True)
+    queryset = Article.objects.filter(published=True).select_related(
+        'category', 'image'
+    ).prefetch_related(
+        Prefetch('articleview_set', queryset=ArticleView.objects.order_by('order')),
+        Prefetch('parent_article', queryset=ArticleRelated.objects.order_by('order')),
+        Prefetch('contentview_set', queryset=ContentView.objects.order_by('order')),
+    )
     serializer_class = ArticleSerializer
     http_method_names = ["get", "options"]  # noqa: RUF012
     lookup_field = "id"
diff --git a/applications/discover/views.py b/applications/discover/views.py
@@ -10,14 +10,6 @@
 @method_decorator(name="get", decorator=discover_doc())
 class DiscoverView(GenericAPIView):
     def get(self, request, *args, **kwargs):
-        discover_serializer = DiscoverSerializer(
-            Discover.objects.filter(published=True),
-            many=True,
-            context=self.get_serializer_context(),
-        )
-        tip_serializer = TipSerializer(
-            Carousel.objects.filter(published=True),
-            many=True,
-            context=self.get_serializer_context(),
-        )
+        discover_serializer = DiscoverSerializer(Discover.objects.filter(published=True).select_related('splash_screen'), many=True, context=self.get_serializer_context())
+        tip_serializer = TipSerializer(Carousel.objects.filter(published=True).select_related('cta'), many=True, context=self.get_serializer_context())
         return Response(dict(discover=discover_serializer.data, tips=tip_serializer.data))
diff --git a/applications/global_rules/serializers.py b/applications/global_rules/serializers.py
@@ -69,7 +69,7 @@ def to_representation(self, instance):
         )
 
         serialized_app_version = AppVersionSerializer(
-            AppVersion.objects.all(), many=True, context=self.context
+            AppVersion.objects.select_related('app').all(), many=True, context=self.context
         )
 
         # Flaten the list of dictionaries
diff --git a/applications/my_walks/serializers.py b/applications/my_walks/serializers.py
@@ -46,7 +46,7 @@ def get_my_walks_dynamic_text(self, obj):
         return MyWalkDynamicTextSerializer(MyWalk.objects.all(), many=True).data
 
     def get_todays_walks_dynamic_text(self, obj):
-        return TodayWalkDynamicTextSerializer(TodayWalk.objects.all(), many=True).data
+        return TodayWalkDynamicTextSerializer(TodayWalk.objects.prefetch_related('target_set').all(), many=True).data
 
     def to_representation(self, instance):
         original_representation = super(MyWalksSerializer, self).to_representation(instance)  # noqa: UP008
diff --git a/applications/notifications/serializers.py b/applications/notifications/serializers.py
@@ -5,7 +5,6 @@
     LocalNotification,
     Onboarding,
     Reminder,
-    UserInfo,
 )
 
 
@@ -26,7 +25,7 @@ class Meta:
 
     def get_userinfo(self, obj):
         serializer = UserInfoSerializer(
-            UserInfo.objects.filter(lapsed=obj.id), many=True, context=self.context
+            obj.userinfo.all(), many=True, context=self.context
         )
 
         # Flaten the list of dictionaries
@@ -46,7 +45,7 @@ class Meta:
 
     def get_userinfo(self, obj):
         serializer = UserInfoSerializer(
-            UserInfo.objects.filter(onboarding=obj.id), many=True, context=self.context
+            obj.userinfo.all(), many=True, context=self.context
         )
 
         # Flaten the list of dictionaries
@@ -75,10 +74,10 @@ def __init__(self, instance=None, data=dict(), **kwargs):  # noqa: B006
 
     def to_representation(self, instance):
         serialized_onboarding = OnboardingSerializer(
-            Onboarding.objects.all(), many=True, context=self.context
+            Onboarding.objects.prefetch_related('userinfo').all(), many=True, context=self.context
         )
 
-        serialized_lapsed = LapsedSerializer(Lapsed.objects.all(), many=True, context=self.context)
+        serialized_lapsed = LapsedSerializer(Lapsed.objects.prefetch_related('userinfo').all(), many=True, context=self.context)
 
         serialized_reminder = ReminderSerializer(
             Reminder.objects.all(),
diff --git a/applications/views/serializers.py b/applications/views/serializers.py
@@ -43,25 +43,17 @@ class Meta:
         lookup_field = "slug"
 
     def get_children_ids(self, obj):
-        return (
-            obj.views.through.objects.filter(parent=obj.id)
-            .order_by("order")
-            .values_list("child", flat=True)
-        )
+        return [r.child_id for r in obj.parents.all()]
 
     def get_article_ids(self, obj):
-        return (
-            obj.articles.through.objects.filter(view=obj.id)
-            .order_by("order")
-            .values_list("article", flat=True)
-        )
+        return [av.article_id for av in obj.articleview_set.all()]
 
     def get_media(self, obj):
         return ViewMediaSerializer(
-            ViewMedia.objects.filter(view=obj.id), many=True, context=self.context
+            obj.view_media.all(),many=True,context=self.context
         ).data
 
     def get_properties(self, obj):
         return ViewPropertySerializer(
-            ViewProperty.objects.filter(view=obj.id), many=True, context=self.context
+            obj.view_property.all(),many=True,context=self.context
         ).data
diff --git a/applications/views/views.py b/applications/views/views.py
@@ -1,18 +1,24 @@
+from django.db.models import Prefetch
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_page
-from rest_framework import mixins, viewsets
+from rest_framework import viewsets, mixins
 from rest_framework.response import Response
 
+from applications.articles.models import ArticleView
 from utils.converter import convert
-
-from .models import View, ViewMedia, ViewProperty
+from .models import View, ViewProperty, ViewMedia, ViewsRelation
 from .serializers import ViewSerializer
 
 
 @method_decorator(cache_page(60), name="dispatch")
 class ViewsViewSet(viewsets.ModelViewSet):
     models = View
-    queryset = View.objects.all()
+    queryset = View.objects.prefetch_related(  # pylint: disable=E1101
+        Prefetch("parents", queryset=ViewsRelation.objects.order_by("order")),  # pylint: disable=E1101
+        Prefetch("articleview_set", queryset=ArticleView.objects.order_by("order")),  # pylint: disable=E1101
+        "view_media",
+        "view_property",
+    ).all()
     serializer_class = ViewSerializer
     http_method_names = ["get", "head", "options"]  # noqa: RUF012
     lookup_field = "id"
@@ -26,7 +32,7 @@ def create(self, request, *args, **kwargs):
         for item in request.data:
             data = convert(item)
 
-            if View.objects.filter(type="popup", slug=data["slug"]).count() != 0:
+            if View.objects.filter(type="popup", slug=data["slug"]).count() != 0:  # pylint: disable=E1101
                 continue
 
             serializer = ViewSerializer(data=data)
@@ -38,14 +44,18 @@ def create(self, request, *args, **kwargs):
                 return Response(serializer.errors, 404)
 
             for properties in data["properties"]:
-                properties_obj = ViewProperty.objects.create(
-                    key=properties["key"], value=properties["value"], view=created_view
+                properties_obj = ViewProperty.objects.create(  # pylint: disable=E1101
+                    key=properties["key"],
+                    value=properties["value"],
+                    view=created_view,
                 )
                 properties_obj.save()
 
             for image in data["media"]:
-                image_obj = ViewMedia.import_from_json(image, created_view)
-                image_obj.save()
+                imported_media = ViewMedia.import_from_json(image, created_view)
+                if imported_media is not None:
+                    image_obj: ViewMedia = imported_media
+                    image_obj.save()
 
         return Response({"message": "success"}, 200)
 
diff --git a/applications/walking_plans/serializers.py b/applications/walking_plans/serializers.py
@@ -45,21 +45,19 @@ class Meta:
 
     def get_category_details(self, obj):
         result = {
-            "sex": obj.sex.values_list("label", flat=True),
-            "age": obj.age.values_list("label", flat=True),
-            "activity_level": obj.activity_level.values_list("label", flat=True),
-            "motivation": obj.motivation.values_list("text", flat=True),
+            "sex": [s.label for s in obj.sex.all()],
+            "age": [a.label for a in obj.age.all()],
+            "activity_level": [al.label for al in obj.activity_level.all()],
+            "motivation": [m.text for m in obj.motivation.all()],
         }
 
         return result
 
     def get_inferior_plan_ids(self, obj):
-        return obj.inferior_plans.values_list("id", flat=True)
+        return [p.id for p in obj.inferior_plans.all()]
 
     def get_superior_plan_ids(self, obj):
-        return obj.superior_plans.values_list("id", flat=True)
+        return [p.id for p in obj.superior_plans.all()]
 
     def get_plan_itinerary_items(self, obj):
-        return PlanItineraryItemSerializer(
-            obj.plan_itinerary_items.order_by("ordering"), many=True
-        ).data
+        return PlanItineraryItemSerializer(obj.plan_itinerary_items.all(), many=True).data
diff --git a/applications/walking_plans/views.py b/applications/walking_plans/views.py
@@ -1,12 +1,17 @@
+from django.db.models import Prefetch
 from rest_framework import viewsets
 
-from .models import WalkingPlan
+from .models import PlanItineraryItem, WalkingPlan
 from .serializers import WalkingPlanSerializer
 
 
 class WalkingPlanViewSet(viewsets.ModelViewSet):
     models = WalkingPlan
-    queryset = WalkingPlan.objects.all()
+    queryset = WalkingPlan.objects.prefetch_related(
+        'sex', 'age', 'activity_level', 'motivation',
+        'inferior_plans', 'superior_plans',
+        Prefetch('plan_itinerary_items', queryset=PlanItineraryItem.objects.order_by('ordering')),
+    ).all()
     serializer_class = WalkingPlanSerializer
     http_method_names = ["get", "options"]  # noqa: RUF012
     lookup_field = "id"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.11.9-slim-bullseye`
	`1`	`+FROM python:3.11.14-slim-bookworm`
`2`	`2`	`ENV PYTHONUNBUFFERED=1`
`3`	`3`
`4`	`4`	`RUN apt-get update &&\`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ def to_representation(self, instance):`
`69`	`69`	`)`
`70`	`70`
`71`	`71`	`serialized_app_version = AppVersionSerializer(`
`72`		`- AppVersion.objects.all(), many=True, context=self.context`
	`72`	`+ AppVersion.objects.select_related('app').all(), many=True, context=self.context`
`73`	`73`	`)`
`74`	`74`
`75`	`75`	`# Flaten the list of dictionaries`