use types

Author: marcoacierno

backend/api/types.py

@@ -141,3 +141,8 @@ def paginate_list(
             ),
             items=items,
         )
+
+
+@strawberry.type
+class NotFound:
+    message: str = "Not found"

backend/api/visa/mutations.py

@@ -1,4 +1,6 @@
+from typing import Annotated
 from api.context import Context
+from api.types import NotFound
 from custom_admin.audit import create_change_admin_log_entry
 from visa.models import InvitationLetterDocument as InvitationLetterDocumentModel
 from api.visa.permissions import CanEditInvitationLetterDocument
@@ -27,19 +29,30 @@ class UpdateInvitationLetterDocumentInput:
     dynamic_document: UpdateInvitationLetterDocumentStructureInput
 
 
+@strawberry.type
+class InvitationLetterNotEditable:
+    message: str = "Invitation letter document is not editable"
+
+
+UpdateInvitationLetterDocumentResult = Annotated[
+    InvitationLetterDocument | InvitationLetterNotEditable | NotFound,
+    strawberry.union(name="UpdateInvitationLetterDocumentResult"),
+]
+
+
 @strawberry.field(permission_classes=[CanEditInvitationLetterDocument])
 def update_invitation_letter_document(
     info: strawberry.Info[Context], input: UpdateInvitationLetterDocumentInput
-) -> InvitationLetterDocument:
+) -> UpdateInvitationLetterDocumentResult:
     invitation_letter_document = InvitationLetterDocumentModel.objects.filter(
-        id=input.id
+        id=input.id,
     ).first()
 
     if not invitation_letter_document:
-        raise ValueError("Invitation letter document not found")
+        return NotFound()
 
     if invitation_letter_document.document:
-        raise ValueError("Invitation letter document has a file attached")
+        return InvitationLetterNotEditable()
 
     invitation_letter_document.dynamic_document = strawberry.asdict(
         input.dynamic_document

backend/api/visa/tests/mutations/test_update_invitation_letter_document.py

@@ -9,14 +9,17 @@ def _update_invitation_letter_document(client, **input):
     return client.query(
         """mutation UpdateInvitationLetterDocument($input: UpdateInvitationLetterDocumentInput!) {
         updateInvitationLetterDocument(input: $input) {
-            id
-            dynamicDocument {
-                header
-                footer
-                pages {
-                    id
-                    title
-                    content
+            __typename
+            ... on InvitationLetterDocument {
+                id
+                dynamicDocument {
+                    header
+                    footer
+                    pages {
+                        id
+                        title
+                        content
+                    }
                 }
             }
         }
@@ -114,8 +117,8 @@ def test_cannot_update_invitation_letter_document_with_static_doc(
     )
 
     assert (
-        response["errors"][0]["message"]
-        == "Invitation letter document has a file attached"
+        response["data"]["updateInvitationLetterDocument"]["__typename"]
+        == "InvitationLetterNotEditable"
     )
     document.refresh_from_db()
     assert document.dynamic_document is None
@@ -159,7 +162,9 @@ def test_update_non_existent_invitation_letter_document(
         },
     )
 
-    assert response["errors"][0]["message"] == "Invitation letter document not found"
+    assert (
+        response["data"]["updateInvitationLetterDocument"]["__typename"] == "NotFound"
+    )
     document.refresh_from_db()
     assert document.dynamic_document == {
         "header": "header",

backend/custom_admin/src/components/invitation-letter-document-builder/update-invitation-letter-document.graphql

@@ -2,14 +2,16 @@ mutation UpdateInvitationLetterDocument(
   $input: UpdateInvitationLetterDocumentInput!
 ) {
   updateInvitationLetterDocument(input: $input) {
-    id
-    dynamicDocument {
-      header
-      footer
-      pages {
-        id
-        title
-        content
+    ... on InvitationLetterDocument {
+      id
+      dynamicDocument {
+        header
+        footer
+        pages {
+          id
+          title
+          content
+        }
       }
     }
   }

infrastructure/applications/pretix/main.tf

@@ -191,7 +191,7 @@ resource "aws_ecs_service" "pretix" {
   name                               = "pretix"
   cluster                            = var.cluster_id
   task_definition                    = aws_ecs_task_definition.pretix.arn
-  desired_count                      = 1
+  desired_count                      = local.is_prod ? 1 : 0
   deployment_minimum_healthy_percent = 100
   deployment_maximum_percent         = 200
 }