Remove require_introduction from the reservation unit model

City-of-Helsinki · Feb 5, 2025 · 5b68dc2 · 5b68dc2
1 parent 5b53221
commit 5b68dc2
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 21 deletions.
diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
@@ -1735,10 +1735,6 @@ msgstr "Tarkenteet"
 msgid "Reservation unit type"
 msgstr "Varausyksikön tyyppi"
 
-#: tilavarauspalvelu/admin/reservation_unit/form.py
-msgid "Require introduction"
-msgstr "Vaatii perehdytyksen"
-
 #: tilavarauspalvelu/admin/reservation_unit/form.py
 msgid "Equipments"
 msgstr "Varusteet"

diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po
@@ -1686,10 +1686,6 @@ msgstr ""
 msgid "Reservation unit type"
 msgstr ""
 
-#: tilavarauspalvelu/admin/reservation_unit/form.py
-msgid "Require introduction"
-msgstr ""
-
 #: tilavarauspalvelu/admin/reservation_unit/form.py
 msgid "Equipments"
 msgstr ""

diff --git a/tests/factories/reservation_unit.py b/tests/factories/reservation_unit.py
@@ -99,7 +99,6 @@ class Meta:
     # Booleans
     is_draft = False
     is_archived = False
-    require_introduction = False
     require_adult_reservee = False
     require_reservation_handling = False
     reservation_block_whole_day = False

diff --git a/tests/test_csv_exporters/test_reservation_unit_export.py b/tests/test_csv_exporters/test_reservation_unit_export.py
@@ -130,7 +130,6 @@ def test_reservation_unit_export_multiple():
     assert row_2[next(index)] == reservation_unit_1.allow_reservations_without_opening_hours
     assert row_2[next(index)] == reservation_unit_1.is_archived
     assert row_2[next(index)] == reservation_unit_1.purposes.first().name_fi
-    assert row_2[next(index)] == reservation_unit_1.require_introduction
     assert row_2[next(index)] == reservation_unit_1.equipments.first().name_fi
     assert row_2[next(index)] == reservation_unit_1.publishing_state
     assert row_2[next(index)] == reservation_unit_1.reservation_state

diff --git a/tests/test_graphql_api/test_reservation_unit/test_query.py b/tests/test_graphql_api/test_reservation_unit/test_query.py
@@ -139,7 +139,6 @@ def test_reservation_unit__query__all_fields(graphql):
 
         isDraft
         isArchived
-        requireIntroduction
         requireReservationHandling
         reservationBlockWholeDay
         canApplyFreeOfCharge
@@ -220,7 +219,6 @@ def test_reservation_unit__query__all_fields(graphql):
         #
         "isDraft": reservation_unit.is_draft,
         "isArchived": reservation_unit.is_archived,
-        "requireIntroduction": reservation_unit.require_introduction,
         "requireReservationHandling": reservation_unit.require_reservation_handling,
         "reservationBlockWholeDay": reservation_unit.reservation_block_whole_day,
         "canApplyFreeOfCharge": reservation_unit.can_apply_free_of_charge,

diff --git a/tilavarauspalvelu/admin/reservation_unit/admin.py b/tilavarauspalvelu/admin/reservation_unit/admin.py
@@ -94,7 +94,6 @@ class ReservationUnitAdmin(SortableAdminMixin, TabbedTranslationAdmin):
                     "metadata_set",
                     "origin_hauki_resource",
                     "allow_reservations_without_opening_hours",
-                    "require_introduction",
                     "require_adult_reservee",
                     "require_reservation_handling",
                     "reservation_block_whole_day",

diff --git a/tilavarauspalvelu/admin/reservation_unit/form.py b/tilavarauspalvelu/admin/reservation_unit/form.py
@@ -63,7 +63,6 @@ class Meta:
             "purposes": _("Purposes"),
             "qualifiers": _("Qualifiers"),
             "reservation_unit_type": _("Reservation unit type"),
-            "require_introduction": _("Require introduction"),
             "equipments": _("Equipments"),
             "terms_of_use": _("Terms of use"),
             "terms_of_use_fi": _("Terms of use (Finnish)"),
@@ -141,7 +140,6 @@ class Meta:
             "purposes": _("Purposes"),
             "qualifiers": _("Qualifiers"),
             "reservation_unit_type": _("Reservation unit type"),
-            "require_introduction": _("Require introduction"),
             "equipments": _("Equipments"),
             "terms_of_use": _("Terms of use"),
             "terms_of_use_fi": _("Terms of use (Finnish)"),

diff --git a/tilavarauspalvelu/api/graphql/types/reservation_unit/serializers.py b/tilavarauspalvelu/api/graphql/types/reservation_unit/serializers.py
@@ -77,7 +77,6 @@ class Meta:
             # Booleans
             "is_draft",
             "is_archived",
-            "require_introduction",
             "require_reservation_handling",
             "reservation_block_whole_day",
             "can_apply_free_of_charge",

diff --git a/tilavarauspalvelu/api/graphql/types/reservation_unit/types.py b/tilavarauspalvelu/api/graphql/types/reservation_unit/types.py
@@ -125,7 +125,6 @@ class Meta:
             # Booleans
             "is_draft",
             "is_archived",
-            "require_introduction",
             "require_reservation_handling",
             "reservation_block_whole_day",
             "can_apply_free_of_charge",

diff --git a/tilavarauspalvelu/migrations/0066_remove_reservationunit_require_introduction.py b/tilavarauspalvelu/migrations/0066_remove_reservationunit_require_introduction.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.1.3 on 2024-12-11 08:26
+from __future__ import annotations
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tilavarauspalvelu", "0065_reservation_access_code_generated_at_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="reservationunit",
+            name="require_introduction",
+        ),
+    ]
diff --git a/tilavarauspalvelu/models/reservation_unit/model.py b/tilavarauspalvelu/models/reservation_unit/model.py
@@ -98,7 +98,6 @@ class ReservationUnit(models.Model):
 
     is_draft: bool = models.BooleanField(default=False, blank=True, db_index=True)
     is_archived: bool = models.BooleanField(default=False, db_index=True)
-    require_introduction: bool = models.BooleanField(default=False)
     require_adult_reservee: bool = models.BooleanField(default=False, blank=True)
     require_reservation_handling: bool = models.BooleanField(default=False, blank=True)
     reservation_block_whole_day: bool = models.BooleanField(default=False, blank=True)

diff --git a/tilavarauspalvelu/services/csv_export/reservation_unit_exporter.py b/tilavarauspalvelu/services/csv_export/reservation_unit_exporter.py
@@ -88,7 +88,6 @@ class ReservationUnitExportRow(BaseExportRow):
     allow_reservations_without_opening_hours: str | bool = ""
     is_reservation_unit_archived: str | bool = ""
     purposes: str = ""
-    require_introduction: str | bool = ""
     equipments: str = ""
     state: str = ""
     reservation_state: str = ""
@@ -224,7 +223,6 @@ def get_header_rows(self) -> Iterable[ReservationUnitExportRow]:
                 allow_reservations_without_opening_hours="Allow reservations without opening hours",
                 is_reservation_unit_archived="Is reservation unit archived",
                 purposes="Purposes",
-                require_introduction="Require introduction",
                 equipments="Equipments",
                 state="State",
                 reservation_state="Reservation state",
@@ -331,7 +329,6 @@ def get_data_rows(self, instance: ReservationUnit) -> Iterable[ReservationUnitEx
                 allow_reservations_without_opening_hours=instance.allow_reservations_without_opening_hours,
                 is_reservation_unit_archived=instance.is_archived,
                 purposes=", ".join(purpose.name_fi for purpose in instance.purposes.all()),
-                require_introduction=instance.require_introduction,
                 equipments=", ".join(equipment.name_fi for equipment in instance.equipments.all()),
                 state=instance.publishing_state,
                 reservation_state=instance.reservation_state,