Merge branch 'main' into deploy-workflow-improvements

Author: marcoacierno

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
       - id: django-upgrade
         args: [--target-version, "4.2"]
     - repo: https://github.com/biomejs/pre-commit
-      rev: "v0.4.0"
+      rev: "v0.6.1"
       hooks:
         - id: biome-check
           additional_dependencies: ["@biomejs/[email protected]"]

backend/api/sponsors/tests/test_sponsors_by_level.py

@@ -1,4 +1,5 @@
 from unittest.mock import ANY
+from conferences.tests.factories import ConferenceFactory
 from sponsors.tests.factories import SponsorFactory, SponsorLevelFactory
 from pytest import mark
 
@@ -23,6 +24,7 @@ def _query_sponsors(client, conference_code):
 
 @mark.django_db
 def test_query_sponsors(graphql_client):
+    conference = ConferenceFactory()
     patrick = SponsorFactory(
         name="patrick",
         link="https://patrick.wtf",
@@ -33,12 +35,10 @@ def test_query_sponsors(graphql_client):
         name="marco", link="https://marco.pizza", image=None, order=1
     )
     ester = SponsorFactory(name="ester", link="https://ester.cool", order=0)
-    SponsorLevelFactory(
-        name="gold", conference__code="pycon12", sponsors=[patrick, marco]
-    )
-    SponsorLevelFactory(name="bronze", conference__code="pycon12", sponsors=[ester])
+    SponsorLevelFactory(name="gold", conference=conference, sponsors=[patrick, marco])
+    SponsorLevelFactory(name="bronze", conference=conference, sponsors=[ester])
 
-    resp = _query_sponsors(graphql_client, conference_code="pycon12")
+    resp = _query_sponsors(graphql_client, conference_code=conference.code)
 
     assert not resp.get("errors")
     assert len(resp["data"]["conference"]["sponsorsByLevel"]) == 2

backend/api/tests/schema/test_pages.py

@@ -1,3 +1,4 @@
+from conferences.tests.factories import ConferenceFactory
 from pytest import mark
 
 from i18n.strings import LazyI18nString
@@ -31,13 +32,15 @@ def test_query_pages(
     rf,
     graphql_client,
 ):
-    PageFactory(published=False, conference__code="pycon11")
-    PageFactory(published=True, conference__code="pycon10")
-    page = PageFactory(published=True, conference__code="pycon11")
+    conference_1 = ConferenceFactory(code="pycon11")
+    conference_2 = ConferenceFactory(code="pycon10")
+    PageFactory(published=False, conference=conference_1)
+    PageFactory(published=True, conference=conference_2)
+    page = PageFactory(published=True, conference=conference_1)
 
     request = rf.get("/")
 
-    resp = _query_pages(graphql_client, conference_code="pycon11")
+    resp = _query_pages(graphql_client, conference_code=conference_1.code)
 
     assert not resp.get("errors")
 

backend/api/visa/mutations/update_invitation_letter_document.py

@@ -15,10 +15,23 @@ class UpdateInvitationLetterDocumentPageInput:
     content: str
 
 
+@strawberry.input
+class UpdateInvitationLetterDocumentRunningPartInput:
+    content: str
+    align: str
+    margin: str
+
+
+@strawberry.input
+class UpdateInvitationLetterDocumentPageLayoutInput:
+    margin: str
+
+
 @strawberry.input
 class UpdateInvitationLetterDocumentStructureInput:
-    header: str
-    footer: str
+    header: UpdateInvitationLetterDocumentRunningPartInput
+    footer: UpdateInvitationLetterDocumentRunningPartInput
+    page_layout: UpdateInvitationLetterDocumentPageLayoutInput
     pages: list[UpdateInvitationLetterDocumentPageInput]
 
 
@@ -29,12 +42,12 @@ class UpdateInvitationLetterDocumentInput:
 
 
 @strawberry.type
-class InvitationLetterNotEditable:
+class InvitationLetterDocumentNotEditable:
     message: str = "Invitation letter document is not editable"
 
 
 UpdateInvitationLetterDocumentResult = Annotated[
-    InvitationLetterDocument | InvitationLetterNotEditable | NotFound,
+    InvitationLetterDocument | InvitationLetterDocumentNotEditable | NotFound,
     strawberry.union(name="UpdateInvitationLetterDocumentResult"),
 ]
 
@@ -51,16 +64,19 @@ def update_invitation_letter_document(
         return NotFound()
 
     if invitation_letter_document.document:
-        return InvitationLetterNotEditable()
-
-    invitation_letter_document.dynamic_document = strawberry.asdict(
-        input.dynamic_document
-    )
-    invitation_letter_document.save(update_fields=["dynamic_document"])
-
-    create_change_admin_log_entry(
-        info.context.request.user,
-        invitation_letter_document,
-        change_message="Invitation letter document updated",
-    )
+        return InvitationLetterDocumentNotEditable()
+
+    new_document_data = strawberry.asdict(input.dynamic_document)
+    if invitation_letter_document.dynamic_document != new_document_data:
+        invitation_letter_document.dynamic_document = new_document_data
+        invitation_letter_document.save(update_fields=["dynamic_document"])
+
+        config = invitation_letter_document.invitation_letter_conference_config
+
+        create_change_admin_log_entry(
+            info.context.request.user,
+            config,
+            change_message=f"Updated the content of dynamic document {invitation_letter_document.name}",
+        )
+
     return InvitationLetterDocument.from_model(invitation_letter_document)