Add ApplicationSectionStatusChoice.REJECTED

refs. TILA-3380

Author: ranta

applications/admin/forms/application_section.py

@@ -29,11 +29,13 @@ class ApplicationSectionAdminForm(forms.ModelForm):
             "%(in_allocation)s: Application round has closed, but the section is not fully allocated. <br>"
             "%(handled)s: Application round is no longer in allocation, section's applied reservations "
             "per week has been fulfilled, or all reservation unit options rejected or locked. <br>"
+            "%(rejected)s: All applied slots for this application section have been locked or rejected. <br>"
         )
         % {
             "unallocated": ApplicationSectionStatusChoice.UNALLOCATED.label,
             "in_allocation": ApplicationSectionStatusChoice.IN_ALLOCATION.label,
             "handled": ApplicationSectionStatusChoice.HANDLED.label,
+            "rejected": ApplicationSectionStatusChoice.REJECTED.label,
         },
     )
 

applications/choices.py

@@ -252,6 +252,9 @@ class ApplicationSectionStatusChoice(models.TextChoices):
     HANDLED = "HANDLED", _("Handled")
     """Application section has been handled fully in the allocation process"""
 
+    REJECTED = "REJECTED", _("Rejected")
+    """All applied slots for this application section have been locked or rejected."""
+
     @DynamicClassAttribute
     def can_allocate(self) -> bool:
         return self in [

applications/models/application_section.py

@@ -150,14 +150,29 @@ def status() -> ApplicationSectionStatusChoice:
                 models.Q(application__application_round__application_period_end__gte=Now()),
                 then=models.Value(ApplicationSectionStatusChoice.UNALLOCATED.value),
             ),
+            models.When(
+                # Application round has moved to handled stage
+                #  AND there are no allocated reservation unit options
+                # OR Application round has NOT moved to rejected stage
+                #  AND all reservation unit options have been locked or rejected
+                condition=(
+                    models.Q(
+                        models.Q(application__application_round__handled_date__isnull=False)
+                        & models.Q(L(allocations=0))
+                    )
+                    | models.Q(
+                        models.Q(application__application_round__handled_date__isnull=True)
+                        & models.Q(L(usable_reservation_unit_options=0))
+                    )
+                ),
+                then=models.Value(ApplicationSectionStatusChoice.REJECTED.value),
+            ),
             models.When(
                 # Application round has moved to handled stage
                 # OR number of allocations equals the number of applied reservations per week
-                # OR all reservation unit options have been locked or rejected
                 condition=(
                     models.Q(application__application_round__handled_date__isnull=False)
                     | models.Q(L(allocations__gte=models.F("applied_reservations_per_week")))
-                    | models.Q(L(usable_reservation_unit_options=0))
                 ),
                 then=models.Value(ApplicationSectionStatusChoice.HANDLED.value),
             ),
@@ -182,12 +197,15 @@ def _(self) -> ApplicationSectionStatusChoice:
         total_allocations = sum(option.num_of_allocations for option in reservation_unit_options)
         all_locked_or_rejected = all(option.locked or option.rejected for option in reservation_unit_options)
 
-        if self.application.application_round.status.past_allocation:
-            return ApplicationSectionStatusChoice.HANDLED
         if total_allocations >= self.applied_reservations_per_week:
             return ApplicationSectionStatusChoice.HANDLED
         if all_locked_or_rejected:
-            return ApplicationSectionStatusChoice.HANDLED
+            return ApplicationSectionStatusChoice.REJECTED
+
+        if self.application.application_round.status.past_allocation:
+            if total_allocations >= 1:
+                return ApplicationSectionStatusChoice.HANDLED
+            return ApplicationSectionStatusChoice.REJECTED
 
         return ApplicationSectionStatusChoice.IN_ALLOCATION
 
@@ -248,9 +266,13 @@ def status_sort_order() -> int:
                 then=models.Value(2),
             ),
             models.When(
-                models.Q(L(status=ApplicationSectionStatusChoice.HANDLED.value)),
+                models.Q(L(status=ApplicationSectionStatusChoice.REJECTED.value)),
                 then=models.Value(3),
             ),
-            default=models.Value(6),
+            models.When(
+                models.Q(L(status=ApplicationSectionStatusChoice.HANDLED.value)),
+                then=models.Value(4),
+            ),
+            default=models.Value(5),
             output_field=models.IntegerField(),
         )

locale/fi/LC_MESSAGES/django.po

@@ -502,24 +502,20 @@ msgstr "Teksti, joka näytetään hakijoille heidän täyttäessään hakemuksia
 msgid "Application this section is in."
 msgstr "Hakemus jolle tämä osa kuuluu."
 
-#: applications/admin/forms/application_section.py
-#, python-format
 msgid ""
 "%(unallocated)s: Section has been created, but application round is still "
 "open. <br>%(in_allocation)s: Application round has closed, but the section "
 "is not fully allocated. <br>%(handled)s: Application round is no longer in "
 "allocation, section's applied reservations per week has been fulfilled, or "
-"all reservation unit options rejected or locked. <br>%(failed)s: At least "
-"one reservation was not possible for some allocation. <br>%(reserved)s: All "
-"allocations have successful reservations. <br>"
+"all reservation unit options rejected or locked. <br>%(rejected)s: All "
+"applied slots for this application section have been locked or rejected. <br>"
 msgstr ""
 "%(unallocated)s: Hakemuksen osa luotu, mutta kausivarauskierroksen hakuaika "
 "on vielä auki. <br>%(in_allocation)s: Hakuaika on sulkeutunut, mutta osaa ei "
 "ole vielä kokonaan käsitelty. <br>%(handled)s: Kausivarauskierros on "
 "käsitelty, tai osan toistokerrat on täytetty, tai kaikki varausyksikkö-"
-"vaihtoehdot on hylätty tai lukittu. <br>%(failed)s: Ainakin yhtä varausta ei "
-"ollut mahdollista luoda jollekin vuorolle. <br>%(reserved)s: Kaikki "
-"varaukset jaetuille vuoroille on luotu. <br>"
+"vaihtoehdot on hylätty tai lukittu. <br>%(rejected)s: Kaikki "
+"haetut toistokerrat tälle hakemuksen osalle ovat lukittu tai hylätty. <br>"
 
 #: applications/admin/forms/application_section.py reservations/admin.py
 #: reservations/models/reservation_statistic.py
@@ -709,7 +705,7 @@ msgstr "Varausyksikkö tälle vaihtoehdolle."
 msgid "Preferred order"
 msgstr "Suosittu järjestys"
 
-#: applications/admin/forms/reservation_unit_option.py
+#: applications/admin/forms/reservation_unit_option.py applications/choices.py
 msgid "Rejected"
 msgstr "Hylätty"
 
@@ -871,10 +867,6 @@ msgstr "Peruttu"
 msgid "Unallocated"
 msgstr "Vastaanotettu"
 
-#: applications/choices.py
-msgid "Reserved"
-msgstr "Varattu"
-
 #: applications/choices.py
 msgid "Internal"
 msgstr "Sisäinen"

pyproject.toml

@@ -229,6 +229,7 @@ lint.ignore = [
     "N801",     # Allow whatever class names in tests
     "N802",     # Allow whatever function names in tests
     "N815",     # Allow whatever variable names in tests
+    "S311",     # Pseudo-random generators are fine here.
 ]
 
 [tool.ruff.lint.isort]

tests/factories/application_section.py

@@ -1,4 +1,5 @@
 import datetime
+import random
 from collections.abc import Iterable
 from typing import Any
 
@@ -47,6 +48,8 @@ def create_in_status(cls, status: ApplicationSectionStatusChoice, **kwargs: Any)
                 return cls.create_in_status_in_allocation(**kwargs)
             case ApplicationSectionStatusChoice.HANDLED:
                 return cls.create_in_status_handled(**kwargs)
+            case ApplicationSectionStatusChoice.REJECTED:
+                return cls.create_in_status_rejected(**kwargs)
 
     @classmethod
     def create_in_status_unallocated(cls, **kwargs: Any) -> ApplicationSection:
@@ -111,6 +114,31 @@ def create_in_status_handled(cls, **kwargs: Any) -> ApplicationSection:
 
         return cls.create(**kwargs)
 
+    @classmethod
+    def create_in_status_rejected(cls, **kwargs: Any) -> ApplicationSection:
+        """
+        Create a rejected application section:
+        - in an application in allocation
+        - in an application round in allocation
+        - without any allocated reservation unit options
+        """
+        from .application import ApplicationFactory
+
+        kwargs["applied_reservations_per_week"] = 1
+
+        if "application" not in kwargs:
+            sub_kwargs = cls.pop_sub_kwargs("application", kwargs)
+            sub_kwargs["application_sections"] = []
+            kwargs["application"] = ApplicationFactory.create_in_status_in_allocation(**sub_kwargs)
+
+        if not cls.has_sub_kwargs("reservation_unit_options", kwargs):
+            # All options are either locked or rejected
+            is_rejected = random.choice([True, False])
+            kwargs["reservation_unit_options__rejected"] = is_rejected
+            kwargs["reservation_unit_options__locked"] = not is_rejected
+
+        return cls.create(**kwargs)
+
     @factory.post_generation
     def reservation_unit_options(
         self,

tests/test_factories/test_application_round.py

@@ -1,6 +1,8 @@
 import pytest
+from lookup_property import L
 
 from applications.choices import ApplicationRoundStatusChoice
+from applications.models import ApplicationRound
 from tests.factories import ApplicationRoundFactory
 
 # Applied to all tests
@@ -11,5 +13,6 @@
 
 @pytest.mark.parametrize("status", ApplicationRoundStatusChoice.values)
 def test_application_round_factory_create_in_status(status):
-    application = ApplicationRoundFactory.create_in_status(status=status)
-    assert application.status == status
+    application_round = ApplicationRoundFactory.create_in_status(status=status)
+    assert application_round.status == status
+    assert ApplicationRound.objects.filter(L(status=status)).exists()

tests/test_factories/test_application_section.py

@@ -1,6 +1,8 @@
 import pytest
+from lookup_property import L
 
-from applications.choices import ApplicationSectionStatusChoice
+from applications.choices import ApplicationSectionStatusChoice, ApplicationStatusChoice
+from applications.models import ApplicationSection
 from tests.factories import ApplicationSectionFactory
 
 # Applied to all tests
@@ -10,13 +12,17 @@
 
 
 @pytest.mark.parametrize(
-    "status",
+    ("status", "application_status"),
     [
-        ApplicationSectionStatusChoice.UNALLOCATED,
-        ApplicationSectionStatusChoice.IN_ALLOCATION,
-        ApplicationSectionStatusChoice.HANDLED,
+        (ApplicationSectionStatusChoice.UNALLOCATED, ApplicationStatusChoice.DRAFT),
+        (ApplicationSectionStatusChoice.IN_ALLOCATION, ApplicationStatusChoice.IN_ALLOCATION),
+        (ApplicationSectionStatusChoice.HANDLED, ApplicationStatusChoice.HANDLED),
+        (ApplicationSectionStatusChoice.REJECTED, ApplicationStatusChoice.HANDLED),
     ],
 )
-def test_application_section_factory_create_in_status(status):
+def test_application_section_factory_create_in_status(status, application_status):
     section = ApplicationSectionFactory.create_in_status(status=status)
     assert section.status == status
+    assert ApplicationSection.objects.filter(L(status=status.value)).exists()
+
+    assert section.application.status == application_status

tests/test_graphql_api/test_allocated_time_slot/test_create.py

@@ -124,12 +124,12 @@ def test_allocated_time_slot__create__application_not_yet_in_allocation(graphql)
     ]
 
 
-def test_allocated_time_slot__create__application_not_in_allocation_anymore(graphql):
+def test_allocated_time_slot__create__application_not_in_allocation_anymore__HANDLED(graphql):
     # given:
     # - There is an open application that is already allocated
     # - A superuser is using the system
     application_round = ApplicationRoundFactory.create_in_status_handled()
-    application = ApplicationFactory.create_application_ready_for_allocation(application_round)
+    application = ApplicationFactory.create_application_ready_for_allocation(application_round, pre_allocated=True)
     section = application.application_sections.first()
     option = section.reservation_unit_options.first()
     graphql.login_user_based_on_type(UserType.SUPERUSER)
@@ -146,6 +146,28 @@ def test_allocated_time_slot__create__application_not_in_allocation_anymore(grap
     assert response.field_error_messages() == ["Cannot allocate to application section in status: 'HANDLED'"]
 
 
+def test_allocated_time_slot__create__application_not_in_allocation_anymore__REJECTED(graphql):
+    # given:
+    # - There is an open application that is already allocated
+    # - A superuser is using the system
+    application_round = ApplicationRoundFactory.create_in_status_handled()
+    application = ApplicationFactory.create_application_ready_for_allocation(application_round)
+    section = application.application_sections.first()
+    option = section.reservation_unit_options.first()
+    graphql.login_user_based_on_type(UserType.SUPERUSER)
+
+    assert application.status == ApplicationStatusChoice.HANDLED
+
+    # when:
+    # - The user tries to make an allocation for a reservation unit option
+    input_data = allocation_create_data(option)
+    response = graphql(CREATE_ALLOCATION, input_data=input_data)
+
+    # then:
+    # - The response complains about the application being in the wrong status
+    assert response.field_error_messages() == ["Cannot allocate to application section in status: 'REJECTED'"]
+
+
 @pytest.mark.parametrize("force", [True, False])
 def test_allocated_time_slot__create__approve_duration_longer_than_section_maximum(graphql, force):
     # given:

tests/test_graphql_api/test_application_section/test_delete.py

@@ -16,6 +16,7 @@
     [
         ApplicationSectionStatusChoice.IN_ALLOCATION,
         ApplicationSectionStatusChoice.HANDLED,
+        ApplicationSectionStatusChoice.REJECTED,
     ],
 )
 def test_cannot_delete_application_event_not_unallocated(graphql, status):