Merge pull request #143 from City-of-Helsinki/release/1.4.0

Release 1.4.0

Author: tuomas777

CHANGELOG.md

@@ -1,6 +1,11 @@
 <!-- REMINDER: While updating changelog, also remember to update
 the version in kukkuu/__init.py__ -->
 
+## [1.4.0] - 15 Sep 2020
+### Added
+- Add nullable field `capacityOverride` and API for it which allows setting capacity per occurrence
+- Add ability to search children and guardians in admin UI
+
 ## [1.3.0] - 2 Sep 2020
 ### Added
 - Add occurrence url to event notifications' contexts
@@ -96,7 +101,8 @@ the version in kukkuu/__init.py__ -->
 
 
 
-[Unreleased]: https://github.com/City-of-Helsinki/kukkuu/compare/v1.3.0...HEAD
+[Unreleased]: https://github.com/City-of-Helsinki/kukkuu/compare/v1.4.0...HEAD
+[1.4.0]: https://github.com/City-of-Helsinki/kukkuu/compare/v1.3.0...v1.4.0
 [1.3.0]: https://github.com/City-of-Helsinki/kukkuu/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/City-of-Helsinki/kukkuu/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/City-of-Helsinki/kukkuu/compare/v1.0.0...v1.1.0

children/admin.py

@@ -44,6 +44,7 @@ class ChildAdmin(admin.ModelAdmin):
     )
     list_select_related = ("project",)
     fields = ("project", "first_name", "last_name", "birthdate", "postal_code")
+    search_fields = ("first_name", "last_name")
     inlines = (RelationshipInline, EnrolmentInline, LanguagesSpokenAtHomeInline)
 
     def get_project_year(self, obj):

events/admin.py

@@ -72,14 +72,18 @@ class EnrolmentsInline(admin.TabularInline):
 @admin.register(Occurrence)
 class OccurrenceAdmin(admin.ModelAdmin):
     list_display = (
-        "id",
         "time",
         "event",
         "venue",
+        "get_enrolments",
         "occurrence_language",
         "created_at",
         "updated_at",
     )
-    list_display_links = ("id", "time")
-    fields = ("time", "event", "venue", "occurrence_language")
+    fields = ("time", "event", "venue", "occurrence_language", "capacity_override")
     inlines = [EnrolmentsInline]
+
+    def get_enrolments(self, obj):
+        return f"{obj.get_enrolment_count()} / {obj.get_capacity()}"
+
+    get_enrolments.short_description = _("enrolments")

events/migrations/0014_add_occurrence_capacity_override.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.13 on 2020-09-04 14:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("events", "0013_add_choice_child_and_1_or_2_guardians"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="occurrence",
+            name="capacity_override",
+            field=models.PositiveSmallIntegerField(
+                blank=True,
+                help_text="When set will be used as the capacity of this occurrence instead of the value coming from the event.",
+                null=True,
+                verbose_name="capacity override",
+            ),
+        ),
+    ]

events/models.py

@@ -134,6 +134,16 @@ class Occurrence(TimestampedModel):
         verbose_name=_("occurrence language"),
         default=settings.LANGUAGES[0][0],
     )
+    capacity_override = models.PositiveSmallIntegerField(
+        verbose_name=_("capacity override"),
+        null=True,
+        blank=True,
+        help_text=_(
+            "When set will be used as the capacity of this occurrence instead of "
+            "the value coming from the event."
+        ),
+    )
+
     objects = OccurrenceQueryset.as_manager()
 
     class Meta:
@@ -167,6 +177,9 @@ def get_enrolment_count(self):
         except AttributeError:
             return self.enrolments.count()
 
+    def get_capacity(self):
+        return self.capacity_override or self.event.capacity_per_occurrence
+
     def can_user_administer(self, user):
         # There shouldn't ever be a situation where event.project != venue.project
         # so we can just check one of them

events/schema.py

@@ -48,7 +48,7 @@ def validate_enrolment(child, occurrence):
         )
     if child.occurrences.filter(event=occurrence.event).exists():
         raise ChildAlreadyJoinedEventError("Child already joined this event")
-    if occurrence.enrolments.count() >= occurrence.event.capacity_per_occurrence:
+    if occurrence.enrolments.count() >= occurrence.get_capacity():
         raise OccurrenceIsFullError("Maximum enrolments created")
     if occurrence.time < timezone.now():
         raise PastOccurrenceError("Cannot join occurrence in the past")
@@ -116,6 +116,7 @@ class OccurrenceNode(DjangoObjectType):
     remaining_capacity = graphene.Int()
     occurrence_language = LanguageEnum(required=True)
     enrolment_count = graphene.Int(required=True)
+    capacity = graphene.Int()
 
     @classmethod
     @login_required
@@ -132,15 +133,33 @@ def get_node(cls, info, id):
         return super().get_node(info, id)
 
     def resolve_remaining_capacity(self, info, **kwargs):
-        return self.event.capacity_per_occurrence - self.get_enrolment_count()
+        return max(self.get_capacity() - self.get_enrolment_count(), 0)
 
     def resolve_enrolment_count(self, info, **kwargs):
         return self.get_enrolment_count()
 
+    def resolve_capacity(self, info, **kwargs):
+        return self.get_capacity()
+
     class Meta:
         model = Occurrence
         interfaces = (relay.Node,)
         filterset_class = OccurrenceFilter
+        fields = (
+            "id",
+            "created_at",
+            "updated_at",
+            "time",
+            "event",
+            "venue",
+            "children",
+            "occurrence_language",
+            "enrolments",
+            "capacity",
+            "capacity_override",
+            "remaining_capacity",
+            "enrolment_count",
+        )
 
 
 class EnrolmentNode(DjangoObjectType):
@@ -347,6 +366,7 @@ class Input:
         event_id = graphene.GlobalID()
         venue_id = graphene.GlobalID()
         occurrence_language = LanguageEnum()
+        capacity_override = graphene.Int()
 
     occurrence = graphene.Field(OccurrenceNode)
 
@@ -381,6 +401,7 @@ class Input:
         event_id = graphene.GlobalID(required=False)
         venue_id = graphene.GlobalID(required=False)
         occurrence_language = LanguageEnum()
+        capacity_override = graphene.Int()
 
     occurrence = graphene.Field(OccurrenceNode)
 

events/tests/snapshots/snap_test_api.py

@@ -420,6 +420,8 @@
     "data": {
         "addOccurrence": {
             "occurrence": {
+                "capacity": 50,
+                "capacityOverride": None,
                 "event": {"createdAt": "2020-12-12T00:00:00+00:00"},
                 "occurrenceLanguage": "FI",
                 "time": "1986-12-12T16:40:48+00:00",
@@ -433,10 +435,12 @@
     "data": {
         "updateOccurrence": {
             "occurrence": {
+                "capacity": 5,
+                "capacityOverride": 5,
                 "enrolmentCount": 0,
                 "event": {"createdAt": "2020-12-12T00:00:00+00:00"},
                 "occurrenceLanguage": "SV",
-                "remainingCapacity": 43,
+                "remainingCapacity": 5,
                 "time": "1986-12-12T16:40:48+00:00",
                 "venue": {"createdAt": "2020-12-12T00:00:00+00:00"},
             }
@@ -719,3 +723,91 @@
 snapshots["test_set_enrolment_attendance[None] 1"] = {
     "data": {"setEnrolmentAttendance": {"enrolment": {"attended": None}}}
 }
+
+snapshots["test_occurrence_capacity[5-0] 1"] = {
+    "data": {
+        "occurrence": {
+            "capacity": 5,
+            "capacityOverride": 5,
+            "enrolmentCount": 0,
+            "remainingCapacity": 5,
+        }
+    }
+}
+
+snapshots["test_occurrence_capacity[5-4] 1"] = {
+    "data": {
+        "occurrence": {
+            "capacity": 5,
+            "capacityOverride": 5,
+            "enrolmentCount": 4,
+            "remainingCapacity": 1,
+        }
+    }
+}
+
+snapshots["test_occurrence_capacity[5-5] 1"] = {
+    "data": {
+        "occurrence": {
+            "capacity": 5,
+            "capacityOverride": 5,
+            "enrolmentCount": 5,
+            "remainingCapacity": 0,
+        }
+    }
+}
+
+snapshots["test_occurrence_capacity[5-6] 1"] = {
+    "data": {
+        "occurrence": {
+            "capacity": 5,
+            "capacityOverride": 5,
+            "enrolmentCount": 6,
+            "remainingCapacity": 0,
+        }
+    }
+}
+
+snapshots["test_occurrence_capacity[None-0] 1"] = {
+    "data": {
+        "occurrence": {
+            "capacity": 10,
+            "capacityOverride": None,
+            "enrolmentCount": 0,
+            "remainingCapacity": 10,
+        }
+    }
+}
+
+snapshots["test_occurrence_capacity[None-9] 1"] = {
+    "data": {
+        "occurrence": {
+            "capacity": 10,
+            "capacityOverride": None,
+            "enrolmentCount": 9,
+            "remainingCapacity": 1,
+        }
+    }
+}
+
+snapshots["test_occurrence_capacity[None-10] 1"] = {
+    "data": {
+        "occurrence": {
+            "capacity": 10,
+            "capacityOverride": None,
+            "enrolmentCount": 10,
+            "remainingCapacity": 0,
+        }
+    }
+}
+
+snapshots["test_occurrence_capacity[None-11] 1"] = {
+    "data": {
+        "occurrence": {
+            "capacity": 10,
+            "capacityOverride": None,
+            "enrolmentCount": 11,
+            "remainingCapacity": 0,
+        }
+    }
+}

events/tests/snapshots/snap_test_notifications.py

@@ -24,10 +24,10 @@
 
 snapshots["test_occurrence_enrolment_notifications_on_model_level 1"] = [
     """kukkuu@example.com|['mperez@cox.com']|Occurrence enrolment FI|
-        Event FI: Up always sport return. Light a point charge stand store.
-        Guardian FI: Kathryn Scott
+        Event FI: Free heart significant machine try.
+        Guardian FI: Willie Frey
         Occurrence: 2020-12-12 00:00:00+00:00
-        Child: Jessica Sanders (2020-09-25)
+        Child: Andrea Ward (2020-06-23)
         Occurrence URL: http://localhost:3000/fi/profile/child/Q2hpbGROb2RlOjU0NWM1ZmU1LTIzNWItNDZmZC1hYTJhLWNkNWRlNmZkZDBmYw==/occurrence/T2NjdXJyZW5jZU5vZGU6NzQ="""
 ]
 

events/tests/test_api.py

@@ -371,6 +371,8 @@ def autouse_db(db):
       }
       time
       occurrenceLanguage
+      capacity
+      capacityOverride
     }
   }
 }
@@ -395,6 +397,8 @@ def autouse_db(db):
       occurrenceLanguage
       enrolmentCount
       remainingCapacity
+      capacity
+      capacityOverride
     }
   }
 }
@@ -408,6 +412,7 @@ def autouse_db(db):
         "venueId": "",
         "time": "1986-12-12T16:40:48+00:00",
         "occurrenceLanguage": "SV",
+        "capacityOverride": 5,
     }
 }
 
@@ -1281,3 +1286,38 @@ def test_set_enrolment_attendance_another_project_child(
     )
 
     assert_match_error_code(executed, OBJECT_DOES_NOT_EXIST_ERROR)
+
+
+@pytest.mark.parametrize(
+    "capacity_override, enrolment_count",
+    ((5, 0), (5, 4), (5, 5), (5, 6), (None, 0), (None, 9), (None, 10), (None, 11),),
+)
+def test_occurrence_capacity(
+    snapshot, guardian_api_client, project, capacity_override, enrolment_count
+):
+    occurrence = OccurrenceFactory(
+        event__project=project,
+        venue__project=project,
+        event__published_at=now(),
+        event__capacity_per_occurrence=10,
+        capacity_override=capacity_override,
+    )
+    EnrolmentFactory.create_batch(
+        enrolment_count, occurrence=occurrence, child__project=project
+    )
+
+    executed = guardian_api_client.execute(
+        """
+            query OccurrenceCapacity($id: ID!) {
+              occurrence(id: $id){
+                capacity
+                capacityOverride
+                enrolmentCount
+                remainingCapacity
+              }
+            }
+        """,
+        variables={"id": get_global_id(occurrence)},
+    )
+
+    snapshot.assert_match(executed)

events/tests/test_notifications.py

@@ -110,9 +110,9 @@ def test_occurrence_enrolment_notifications_on_model_level(
     user_api_client,
     notification_template_occurrence_unenrolment_fi,
     notification_template_occurrence_enrolment_fi,
-    occurrence,
     project,
 ):
+    occurrence = OccurrenceFactory(id=74, time=now())
     child = ChildWithGuardianFactory(
         pk="545c5fe5-235b-46fd-aa2a-cd5de6fdd0fc",
         relationship__guardian__user=user_api_client.user,