Remove application round target group

City-of-Helsinki · Sep 3, 2024 · bc3f4ad · bc3f4ad
1 parent b22aca6
commit bc3f4ad
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 27 deletions.
diff --git a/api/graphql/types/application_round/types.py b/api/graphql/types/application_round/types.py
@@ -54,7 +54,6 @@ class Meta:
         fields = [
             "pk",
             "name",
-            "target_group",
             "terms_of_use",
             "criteria",
             "notes_when_applying",

diff --git a/applications/admin/application_round/form.py b/applications/admin/application_round/form.py
@@ -57,7 +57,6 @@ class Meta:
             "name_fi": _("Name (Finnish)"),
             "name_en": _("Name (English)"),
             "name_sv": _("Name (Swedish)"),
-            "target_group": _("Target group"),
             "reservation_units": _("Reservation units"),
             "application_period_begin": _("Application period begin date and time"),
             "application_period_end": _("Application period end date and time"),
@@ -83,7 +82,6 @@ class Meta:
             "name_fi": _("Name that describes the application round in Finnish."),
             "name_en": _("Name that describes the application round in English."),
             "name_sv": _("Name that describes the application round in Swedish."),
-            "target_group": _("Target group of the application round."),
             "reservation_units": _("Reservation units that can be applied for in this application round."),
             "application_period_begin": _("Start date and time of the period when application can be sent."),
             "application_period_end": _("End date and time of the period when application can be sent."),

diff --git a/applications/enums.py b/applications/enums.py
@@ -14,7 +14,6 @@
     "ApplicationStatusChoice",
     "OrganizationTypeChoice",
     "Priority",
-    "TargetGroupChoice",
     "Weekday",
     "WeekdayChoice",
 ]
@@ -276,12 +275,6 @@ def can_reset(self) -> bool:
         ]
 
 
-class TargetGroupChoice(models.TextChoices):
-    INTERNAL = "INTERNAL", pgettext_lazy("TargetGroup", "Internal")
-    PUBLIC = "PUBLIC", pgettext_lazy("TargetGroup", "Public")
-    ALL = "ALL", pgettext_lazy("TargetGroup", "All")
-
-
 class OrganizationTypeChoice(models.TextChoices):
     COMPANY = "COMPANY", pgettext_lazy("OrganizationType", "Company")
     REGISTERED_ASSOCIATION = "REGISTERED_ASSOCIATION", pgettext_lazy("OrganizationType", "Registered association")

diff --git a/applications/migrations/0093_remove_applicationround_target_group.py b/applications/migrations/0093_remove_applicationround_target_group.py
@@ -0,0 +1,16 @@
+# Generated by Django 5.0.7 on 2024-08-07 06:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("applications", "0092_remove_applicationround_service_sector"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="applicationround",
+            name="target_group",
+        ),
+    ]
diff --git a/applications/models/application_round.py b/applications/models/application_round.py
@@ -11,7 +11,6 @@
     ApplicationRoundReservationCreationStatusChoice,
     ApplicationRoundStatusChoice,
     ApplicationStatusChoice,
-    TargetGroupChoice,
 )
 from applications.querysets.application_round import ApplicationRoundQuerySet
 from common.connectors import ApplicationRoundActionsConnector
@@ -33,7 +32,6 @@ class ApplicationRound(models.Model):
     """
 
     name: str = models.CharField(max_length=255)
-    target_group: str = models.CharField(choices=TargetGroupChoice.choices, max_length=50)
     criteria: str = models.TextField(default="")
     notes_when_applying: str = models.TextField(blank=True, default="")
 
@@ -96,7 +94,7 @@ def __str__(self) -> str:
 
     @lookup_property(skip_codegen=True)
     def status() -> ApplicationRoundStatusChoice:
-        return models.Case(
+        return models.Case(  # type: ignore[return-value]
             models.When(
                 models.Q(sent_date__isnull=False),
                 then=models.Value(ApplicationRoundStatusChoice.RESULTS_SENT.value),
@@ -132,7 +130,7 @@ def _(self) -> ApplicationRoundStatusChoice:
 
     @lookup_property(skip_codegen=True)
     def status_timestamp() -> datetime:
-        return models.Case(
+        return models.Case(  # type: ignore[return-value]
             models.When(
                 models.Q(sent_date__isnull=False),  # RESULTS_SENT
                 then=models.F("sent_date"),

diff --git a/common/management/commands/data_creation/create_seasonal_booking.py b/common/management/commands/data_creation/create_seasonal_booking.py
@@ -4,14 +4,7 @@
 from datetime import UTC, datetime, time, timedelta
 from itertools import cycle
 
-from applications.enums import (
-    ApplicantTypeChoice,
-    OrganizationTypeChoice,
-    Priority,
-    TargetGroupChoice,
-    Weekday,
-    WeekdayChoice,
-)
+from applications.enums import ApplicantTypeChoice, OrganizationTypeChoice, Priority, Weekday, WeekdayChoice
 from applications.models import (
     Address,
     AllocatedTimeSlot,
@@ -95,7 +88,6 @@ def _create_application_rounds(
             name_fi=f"Application Round {i}",
             name_en=f"Application Round {i}",
             name_sv=f"Application Round {i}",
-            target_group=random.choice(TargetGroupChoice.values),
             application_period_begin=period[0],
             application_period_end=period[1],
             reservation_period_begin=period[0],

diff --git a/tests/factories/application_round.py b/tests/factories/application_round.py
@@ -5,7 +5,7 @@
 import factory
 from factory import fuzzy
 
-from applications.enums import ApplicationRoundStatusChoice, TargetGroupChoice
+from applications.enums import ApplicationRoundStatusChoice
 from applications.models import ApplicationRound
 from common.date_utils import utc_start_of_day
 from reservation_units.models import Purpose, ReservationUnit
@@ -23,7 +23,6 @@ class Meta:
         exclude = ["timestamp"]
 
     name = fuzzy.FuzzyText()
-    target_group = fuzzy.FuzzyChoice(choices=TargetGroupChoice.values)
 
     timestamp = factory.LazyFunction(utc_start_of_day)  # private helper (see Meta.exclude)
 

diff --git a/tests/test_graphql_api/test_application_round/test_query.py b/tests/test_graphql_api/test_application_round/test_query.py
@@ -30,7 +30,6 @@ def test_application_round_query__all_fields(graphql):
         nameFi
         nameEn
         nameSv
-        targetGroup
         criteriaFi
         criteriaEn
         criteriaSv
@@ -72,7 +71,6 @@ def test_application_round_query__all_fields(graphql):
         "nameFi": application_round.name_fi,
         "nameEn": application_round.name_en,
         "nameSv": application_round.name_sv,
-        "targetGroup": application_round.target_group,
         "criteriaFi": application_round.criteria_fi,
         "criteriaEn": application_round.criteria_en,
         "criteriaSv": application_round.criteria_sv,