Refresh dev environment on deploy

.env.test

@@ -19,4 +19,4 @@ FIND_THEMES_BATCH_JOB_QUEUE=i-dot-ai-dev-consult-sign-off-FARGATE-batch-job-queu
 FIND_THEMES_BATCH_JOB_DEFINITION=i-dot-ai-dev-consult-sign-off-FARGATE-batch-job-definition
 LITELLM_CONSULT_OPENAI_API_KEY=insert-litellm-api-key-here
 LLM_GATEWAY_URL=https://llm-gateway.i.ai.gov.uk
-ADMIN_USERS=email@example.com
+ADMIN_USERS=admin@example.com,policy@example.com

Makefile

@@ -77,8 +77,7 @@ test-end-to-end: ## Run end-to-end tests with Playwright
 	# Run the tests, then ALWAYS clean up, then re-raise the tests' exit status so CI
 	# still fails on failure. Without this wrapper a failure mid-run (e.g. a service
 	# health-check timeout or a failing test) would skip cleanup and leave
-	# docker-compose.override.yml behind, silently repointing every later
-	# `docker compose` command at the E2E database.
+	# the e2e test database behind or a stale Astro dev.json lock file.
 	@$(MAKE) _run-e2e-tests; status=$$?; $(MAKE) _clean-e2e; exit $$status
 
 .PHONY: _run-e2e-tests
@@ -89,18 +88,14 @@ _run-e2e-tests:
 	@docker exec -i $$(docker compose ps -q postgres) psql -U postgres -c "CREATE DATABASE consult_e2e_test;"
 	@echo "Initializing test data..."
 	@docker compose run --rm -e DATABASE_URL=$(E2E_DB_URL) backend venv/bin/python manage.py migrate
-	@docker compose run --rm -e DATABASE_URL=$(E2E_DB_URL) -e ADMIN_USERS=admin@example.com backend venv/bin/python manage.py createadminusers
+	@docker compose run --rm -e DATABASE_URL=$(E2E_DB_URL) backend venv/bin/python manage.py createadminusers
 	@docker compose run --rm -e DATABASE_URL=$(E2E_DB_URL) backend venv/bin/python manage.py shell -c \
 		"from authentication.models import User; from consultations.models import Consultation; \
 		user = User.objects.get(email='admin@example.com'); \
 		[c.users.add(user) for c in Consultation.objects.all()]"
 	@echo "Starting services..."
-	@echo "services:" > docker-compose.override.yml
-	@echo "  backend:" >> docker-compose.override.yml
-	@echo "    environment:" >> docker-compose.override.yml
-	@echo "      - DATABASE_URL=$(E2E_DB_URL)" >> docker-compose.override.yml
-	@docker compose down backend 2>/dev/null || true
-	@docker compose up -d backend frontend
+	@rm -f frontend/.astro/dev.json
+	@DATABASE_URL=$(E2E_DB_URL) docker compose up -d backend frontend
 	@echo "Waiting for services to be ready..."
 	@timeout 120 sh -c 'until curl -s http://localhost:3000 > /dev/null; do sleep 2; done' || \
 		(echo "Frontend failed to start" && docker compose logs frontend && exit 1)
@@ -116,6 +111,7 @@ _clean-e2e: ## Internal: always-run cleanup for test-end-to-end (drop test DB, r
 	@echo "Cleaning up..."
 	@docker exec -i $$(docker compose ps -q postgres) psql -U postgres -c "DROP DATABASE IF EXISTS consult_e2e_test;" 2>/dev/null || true
 	@rm -f docker-compose.override.yml
+	@rm -f frontend/.astro/dev.json
 
 
 .PHONY: build-consultation-template
@@ -178,7 +174,8 @@ dummy_data: ## Generate dummy consultations. Only works in dev
 	cd backend && PYTHONPATH=.. uv run python manage.py generate_dummy_data
 
 .PHONY: dev_environment
-dev_environment: reset_db migrate dummy_data ## set up the database with dummy data
+dev_environment: setup_db ## set up the database with dummy data
+	cd backend && PYTHONPATH=.. uv run python manage.py prepare_environment
 
 # Docker
 AWS_REGION=eu-west-2

backend/consultations/admin.py

@@ -6,7 +6,7 @@
 from django.urls import path, reverse
 from simple_history.admin import SimpleHistoryAdmin
 
-from consultations.dummy_data import create_dummy_consultation_from_yaml_job
+from consultations.dummy_data import create_dummy_consultation_job
 from consultations.models import (
     CandidateTheme,
     Consultation,
@@ -55,9 +55,7 @@ def create_dummy_consultation(modeladmin, request, queryset, size=10):
         )
         return
 
-    create_dummy_consultation_from_yaml_job.delay(
-        number_respondents=size, consultation=consultation
-    )
+    create_dummy_consultation_job.delay(number_respondents=size, consultation=consultation)
 
 
 @admin.action(description="create small dummy consultation")

backend/consultations/api/serializers.py

@@ -38,9 +38,7 @@ def validate_is_staff(self, value):
 
         # Check if this is an update operation and user is updating themselves
         if self.instance and request and request.user == self.instance and value is False:
-            raise serializers.ValidationError(
-                "You cannot remove admin privileges from yourself"
-            )
+            raise serializers.ValidationError("You cannot remove admin privileges from yourself")
 
         return value
 
@@ -150,7 +148,14 @@ class SelectedThemeSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = SelectedTheme
-        fields: ClassVar[list] = ["id", "name", "description", "version", "modified_at", "last_modified_by"]
+        fields: ClassVar[list] = [
+            "id",
+            "name",
+            "description",
+            "version",
+            "modified_at",
+            "last_modified_by",
+        ]
         read_only_fields: ClassVar[list] = ["id", "version", "modified_at", "last_modified_by"]
 
     def get_last_modified_by(self, obj):

backend/consultations/api/views/consultation.py

@@ -946,9 +946,7 @@ def evaluation(self, request, pk=None):
             SelectedTheme.objects.filter(
                 question__consultation=consultation,
             )
-            .filter(
-                Q(name__iexact=NO_REASON_GIVEN_THEME_NAME) | Q(name__iexact=OTHER_THEME_NAME)
-            )
+            .filter(Q(name__iexact=NO_REASON_GIVEN_THEME_NAME) | Q(name__iexact=OTHER_THEME_NAME))
             .values_list("id", flat=True)
         )
 

backend/consultations/api/views/question.py

@@ -142,9 +142,7 @@ def themes(self, request, pk=None, consultation_pk=None):
                 )
             )
         else:
-            themes = themes.annotate(
-                count=Count("responseannotation", distinct=True)
-            )
+            themes = themes.annotate(count=Count("responseannotation", distinct=True))
 
         serializer = QuestionThemeSerializer(themes, many=True)
         return Response({"themes": serializer.data})

backend/consultations/api/views/response.py

@@ -253,11 +253,7 @@ def mark_read_bulk(self, request, consultation_pk=None, **kwargs):
 
         if len(requested_response_ids) > MAX_BULK_MARK_READ:
             return Response(
-                {
-                    "message": (
-                        f"Too many response IDs provided. Maximum is {MAX_BULK_MARK_READ}."
-                    )
-                },
+                {"message": (f"Too many response IDs provided. Maximum is {MAX_BULK_MARK_READ}.")},
                 status=status.HTTP_400_BAD_REQUEST,
             )