organizer -> conference

Author: marcoacierno

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

@@ -243,7 +243,7 @@ def test_update_invitation_letter_document_as_staff_without_permission(
             ],
         },
     )
-    ConferenceFactory(organizer=document.invitation_letter_organizer_config.organizer)
+    ConferenceFactory(organizer=document.invitation_letter_conference_config.organizer)
 
     response = _update_invitation_letter_document(
         admin_graphql_api_client,
@@ -297,7 +297,7 @@ def test_update_invitation_letter_document_as_staff_user_with_permission(
             ],
         },
     )
-    ConferenceFactory(organizer=document.invitation_letter_organizer_config.organizer)
+    ConferenceFactory(organizer=document.invitation_letter_conference_config.organizer)
 
     admin_user.admin_all_conferences = True
     admin_user.save()

backend/api/visa/tests/queries/test_invitation_letter_document.py

@@ -151,7 +151,7 @@ def test_cannot_query_invitation_letter_document_as_staff_without_permission(
             ],
         },
     )
-    ConferenceFactory(organizer=document.invitation_letter_organizer_config.organizer)
+    ConferenceFactory(organizer=document.invitation_letter_conference_config.organizer)
 
     response = _invitation_letter_document(admin_graphql_api_client, id=document.id)
 
@@ -178,7 +178,7 @@ def test_query_invitation_letter_document_as_staff(
             ],
         },
     )
-    ConferenceFactory(organizer=document.invitation_letter_organizer_config.organizer)
+    ConferenceFactory(organizer=document.invitation_letter_conference_config.organizer)
     admin_user.admin_all_conferences = True
     admin_user.save()
     admin_user.user_permissions.add(

backend/users/backends.py

@@ -29,7 +29,6 @@ def _get_conference_id(self, obj: Model) -> int:
             case Conference():
                 return obj.id
             case InvitationLetterDocument():
-                # This is a workaround for now. We need to change our permissions system
-                return obj.invitation_letter_organizer_config.organizer.conferences.first().id
+                return obj.invitation_letter_conference_config.conference_id
             case _:
                 return obj.conference_id

backend/visa/admin.py

@@ -16,7 +16,7 @@
 from visa.models import (
     InvitationLetterAsset,
     InvitationLetterDocument,
-    InvitationLetterOrganizerConfig,
+    InvitationLetterConferenceConfig,
     InvitationLetterRequest,
 )
 
@@ -45,12 +45,12 @@ class InvitationLetterRequestAdmin(admin.ModelAdmin):
     )
 
     list_display = (
-        "conference",
         "requester",
         "on_behalf_of",
         "full_name",
         "nationality",
         "status",
+        "conference",
     )
     list_filter = (
         "status",
@@ -140,14 +140,14 @@ def edit_dynamic_document(self, obj):
         url = reverse(
             "admin:edit_dynamic_document",
             kwargs={
-                "config_id": obj.invitation_letter_organizer_config_id,
+                "config_id": obj.invitation_letter_conference_config_id,
                 "document_id": obj.id,
             },
         )
         return mark_safe(f'<a href="{url}">Edit</a>')
 
     def edit_dynamic_document_view(self, request, config_id, document_id):
-        config = InvitationLetterOrganizerConfig.objects.get(id=config_id)
+        config = InvitationLetterConferenceConfig.objects.get(id=config_id)
         document = get_object_or_404(config.attached_documents, id=document_id)
 
         context = dict(
@@ -183,12 +183,14 @@ def _create_builder_breadcrumbs(self, config, document):
             },
             {
                 "title": str(config._meta.verbose_name_plural),
-                "url": reverse("admin:visa_invitationletterorganizerconfig_changelist"),
+                "url": reverse(
+                    "admin:visa_invitationletterconferenceconfig_changelist"
+                ),
             },
             {
                 "title": str(config),
                 "url": reverse(
-                    "admin:visa_invitationletterorganizerconfig_change",
+                    "admin:visa_invitationletterconferenceconfig_change",
                     args=[config.id],
                 ),
             },
@@ -199,12 +201,15 @@ def _create_builder_breadcrumbs(self, config, document):
         ]
 
 
-@admin.register(InvitationLetterOrganizerConfig)
-class InvitationLetterOrganizerConfigAdmin(
+@admin.register(InvitationLetterConferenceConfig)
+class InvitationLetterConferenceConfigAdmin(
     OrderedInlineModelAdminMixin, OrderedModelAdmin
 ):
-    list_display = ("organizer",)
+    list_display = ("conference", "conference__organizer")
     search_fields = [
-        "organizer__name",
+        "conference__name",
+    ]
+    list_filter = [
+        "conference__organizer",
     ]
     inlines = [InvitationLetterAssetInline, InvitationLetterDocumentInline]

backend/visa/migrations/0009_invitationletterconferenceconfig_and_more.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.4 on 2024-12-21 03:18
+
+import django.db.models.deletion
+import django.utils.timezone
+import model_utils.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('conferences', '0051_conference_location'),
+        ('visa', '0008_alter_invitationletterasset_identifier'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='InvitationLetterOrganizerConfig',
+            new_name='InvitationLetterConferenceConfig',
+        ),
+        migrations.AlterField(
+            model_name='invitationletterasset',
+            name='invitation_letter_organizer_config',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='assets', to='visa.invitationletterconferenceconfig', verbose_name='invitation letter organizer config'),
+        ),
+        migrations.AlterField(
+            model_name='invitationletterdocument',
+            name='invitation_letter_organizer_config',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attached_documents', to='visa.invitationletterconferenceconfig', verbose_name='invitation letter organizer config'),
+        ),
+    ]

backend/visa/migrations/0010_remove_invitationletterconferenceconfig_organizer_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.4 on 2024-12-21 03:22
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('conferences', '0051_conference_location'),
+        ('visa', '0009_invitationletterconferenceconfig_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='invitationletterconferenceconfig',
+            name='conference',
+            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='invitation_letter_config', to='conferences.conference', verbose_name='conference'),
+        ),
+        migrations.RemoveField(
+            model_name='invitationletterconferenceconfig',
+            name='organizer',
+        ),
+    ]

backend/visa/migrations/0011_alter_invitationletterconferenceconfig_conference.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.4 on 2024-12-21 03:24
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('conferences', '0051_conference_location'),
+        ('visa', '0010_remove_invitationletterconferenceconfig_organizer_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invitationletterconferenceconfig',
+            name='conference',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='invitation_letter_config', to='conferences.conference', verbose_name='conference'),
+        ),
+    ]

backend/visa/migrations/0012_remove_invitationletterasset_invitation_letter_organizer_config_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.4 on 2024-12-21 03:31
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('visa', '0011_alter_invitationletterconferenceconfig_conference'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='invitationletterasset',
+            old_name='invitation_letter_organizer_config',
+            new_name='invitation_letter_conference_config',
+        ),
+        migrations.RenameField(
+            model_name='invitationletterdocument',
+            old_name='invitation_letter_organizer_config',
+            new_name='invitation_letter_conference_config',
+        ),
+    ]

backend/visa/migrations/0013_alter_invitationletterasset_invitation_letter_conference_config_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.4 on 2024-12-21 03:31
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('visa', '0012_remove_invitationletterasset_invitation_letter_organizer_config_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invitationletterasset',
+            name='invitation_letter_conference_config',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='assets', to='visa.invitationletterconferenceconfig', verbose_name='Invitation letter conference config'),
+        ),
+        migrations.AlterField(
+            model_name='invitationletterdocument',
+            name='invitation_letter_conference_config',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attached_documents', to='visa.invitationletterconferenceconfig', verbose_name='Invitation letter conference config'),
+        ),
+    ]

backend/visa/models.py

@@ -148,9 +148,7 @@ def schedule(self):
         )
 
     def get_config(self):
-        return InvitationLetterOrganizerConfig.objects.get(
-            organizer=self.conference.organizer
-        )
+        return self.conference.invitation_letter_config
 
     class Meta:
         constraints = [
@@ -162,29 +160,29 @@ class Meta:
         ]
 
 
-class InvitationLetterOrganizerConfig(TimeStampedModel):
-    organizer = models.ForeignKey(
-        "organizers.Organizer",
+class InvitationLetterConferenceConfig(TimeStampedModel):
+    conference = models.OneToOneField(
+        "conferences.Conference",
         on_delete=models.CASCADE,
-        related_name="+",
-        verbose_name=_("organizer"),
+        related_name="invitation_letter_config",
+        verbose_name=_("conference"),
     )
 
     def __str__(self):
-        return f"{self.organizer.name} - Invitation Letter Config"
+        return f"{self.conference.name} - Invitation Letter Config"
 
 
 def invitation_letter_attached_document_upload_to(instance, filename):
-    return f"invitation_letter_attached_documents/{instance.invitation_letter_organizer_config.organizer.slug}/{filename}"
+    return f"invitation_letter_attached_documents/{instance.invitation_letter_conference_config.conference.code}/{filename}"
 
 
 class InvitationLetterDocument(OrderedModel, TimeStampedModel):
     name = models.CharField(_("name"), max_length=300)
-    invitation_letter_organizer_config = models.ForeignKey(
-        "InvitationLetterOrganizerConfig",
+    invitation_letter_conference_config = models.ForeignKey(
+        "InvitationLetterConferenceConfig",
         on_delete=models.CASCADE,
         related_name="attached_documents",
-        verbose_name=_("invitation letter organizer config"),
+        verbose_name=_("Invitation letter conference config"),
     )
     document = models.FileField(
         _("document"),
@@ -194,18 +192,18 @@ class InvitationLetterDocument(OrderedModel, TimeStampedModel):
         blank=True,
     )
     dynamic_document = models.JSONField(_("dynamic document"), null=True, blank=True)
-    order_with_respect_to = "invitation_letter_organizer_config"
+    order_with_respect_to = "invitation_letter_conference_config"
 
     def __str__(self):
         return f"Document: {self.name}"
 
 
 class InvitationLetterAsset(TimeStampedModel):
-    invitation_letter_organizer_config = models.ForeignKey(
-        "InvitationLetterOrganizerConfig",
+    invitation_letter_conference_config = models.ForeignKey(
+        "InvitationLetterConferenceConfig",
         on_delete=models.CASCADE,
         related_name="assets",
-        verbose_name=_("invitation letter organizer config"),
+        verbose_name=_("Invitation letter conference config"),
     )
     identifier = models.CharField(_("identifier"), max_length=100)
     image = models.ImageField(