Merge pull request #56 from City-of-Helsinki/release/0.2.0

Release/0.2.0

Author: quyenlq

CHANGELOG.md

@@ -0,0 +1,28 @@
+## 0.1.0 - 29 Jan 2020
+### Added
+- API for signup/login and query my profile
+- Send notifications when signed up successfully
+- API to query, add, update and remove children
+- API to query, add, update and remove events
+- API to query, add, update and remove occurrences
+- API to query, add, update and remove venues
+
+## [0.2.0] - 17 Feb 2020
+### Added
+- Add enrolment API for child to enrol event occurrences
+- Add support to update event image
+- Add event capacity validation to event
+- Add publish events API 
+- Add Django Admin publish event action
+- Send notifications to guardians when an event published
+### Updated
+- Update API to support nested fields update/delete
+### Fixed
+- Fix API queries to use RelationshipTypeEnum like mutations do
+
+
+
+
+[Unreleased]: https://github.com/City-of-Helsinki/kukkuu/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/City-of-Helsinki/kukkuu/compare/v0.1.0...v0.2.0
+

README.md

@@ -76,7 +76,7 @@ We follow the basic config, without any modifications. Basic `black` commands:
 Or you can use [`pre-commit`](https://pre-commit.com/) to quickly format your code before committing.
 
 
-1. Install `pre-commit` (there are many ways to do but let's use pip as an example:
+1. Install `pre-commit` (there are many ways to do but let's use pip as an example):
     * `pip install pre-commit`
 2. Set up git hooks from `.pre-commit-config.yaml`, run this command from project root:
     * `pre-commit install`

children/admin.py

@@ -1,5 +1,7 @@
 from django.contrib import admin
 
+from events.models import Enrolment
+
 from .models import Child, Relationship
 
 
@@ -13,6 +15,12 @@ def has_change_permission(self, request, obj=None):
         return False
 
 
+class EnrolmentInline(admin.TabularInline):
+    model = Enrolment
+    extra = 1
+    readonly_fields = ("created_at",)
+
+
 @admin.register(Child)
 class ChildAdmin(admin.ModelAdmin):
     list_display = (
@@ -25,4 +33,4 @@ class ChildAdmin(admin.ModelAdmin):
         "updated_at",
     )
     fields = ("first_name", "last_name", "birthdate", "postal_code")
-    inlines = (RelationshipInline,)
+    inlines = (RelationshipInline, EnrolmentInline)

children/schema.py

@@ -41,18 +41,20 @@ def get_node(cls, info, id):
             return None
 
 
+class RelationshipTypeEnum(graphene.Enum):
+    PARENT = "parent"
+    OTHER_GUARDIAN = "other_guardian"
+    OTHER_RELATION = "other_relation"
+    ADVOCATE = "advocate"
+
+
 class RelationshipNode(DjangoObjectType):
     class Meta:
         model = Relationship
         interfaces = (relay.Node,)
         fields = ("type", "child", "guardian")
 
-
-class RelationshipTypeEnum(graphene.Enum):
-    PARENT = "parent"
-    OTHER_GUARDIAN = "other_guardian"
-    OTHER_RELATION = "other_relation"
-    ADVOCATE = "advocate"
+    type = graphene.Field(RelationshipTypeEnum)
 
 
 class RelationshipInput(graphene.InputObjectType):
@@ -167,7 +169,6 @@ def mutate_and_get_payload(cls, root, info, **kwargs):
             raise KukkuuGraphQLError(
                 'You need to use "SubmitChildrenAndGuardianMutation" first.'
             )
-
         if (
             user.guardian.children.count()
             >= settings.KUKKUU_MAX_NUM_OF_CHILDREN_PER_GUARDIAN

children/tests/test_notifications.py

@@ -2,39 +2,20 @@
 
 import pytest
 from django.core import mail
-from django_ilmoitin.models import NotificationTemplate
-from parler.utils.context import switch_language
 
 from children.tests.test_api import (
     SUBMIT_CHILDREN_AND_GUARDIAN_MUTATION,
     SUBMIT_CHILDREN_AND_GUARDIAN_VARIABLES,
 )
+from common.tests.utils import (
+    assert_mails_match_snapshot,
+    create_notification_template_in_language,
+)
 from users.factories import GuardianFactory
 
 from ..notifications import NotificationType
 
 
-def assert_mails_match_snapshot(snapshot):
-    snapshot.assert_match(
-        [f"{m.from_email}|{m.to}|{m.subject}|{m.body}" for m in mail.outbox]
-    )
-
-
-def create_notification_template_in_language(
-    notification_type, language, **translations
-):
-    try:
-        template = NotificationTemplate.objects.get(type=notification_type)
-    except NotificationTemplate.DoesNotExist:
-        template = NotificationTemplate(type=notification_type)
-    with switch_language(template, language):
-        for field, value in translations.items():
-            setattr(template, field, value)
-            template.save()
-
-    return template
-
-
 @pytest.fixture
 def notification_template_signup_fi():
     return create_notification_template_in_language(

common/models.py

@@ -1,9 +1,13 @@
 import uuid
 
+from django.conf import settings
 from django.db import models, transaction
 from django.utils.translation import ugettext_lazy as _
 from parler.managers import TranslatableQuerySet as ParlerTranslatableQuerySet
 from parler.models import TranslatableModel as ParlerTranslatableModel
+from parler.utils.context import switch_language
+
+from common.utils import update_object
 
 
 class TimestampedModel(models.Model):
@@ -28,9 +32,7 @@ class TranslatableQuerySet(ParlerTranslatableQuerySet):
     def create_translatable_object(self, **kwargs):
         translations = kwargs.pop("translations")
         obj = self.create(**kwargs)
-        for translation in translations:
-            language_code = translation.pop("language_code")
-            obj.create_translation(language_code=language_code, **translation)
+        obj.create_or_update_translations(translations)
         return obj
 
 
@@ -39,3 +41,25 @@ class TranslatableModel(ParlerTranslatableModel):
 
     class Meta:
         abstract = True
+
+    @transaction.atomic
+    def delete_translations(self, language_codes):
+        for code in language_codes:
+            self.delete_translation(code)
+
+    @transaction.atomic
+    def create_or_update_translations(
+        self, translations=None, translations_to_delete=None
+    ):
+        for translation in translations:
+            language_code = translation.pop("language_code")
+            if language_code not in settings.PARLER_SUPPORTED_LANGUAGE_CODES:
+                continue
+            if self.has_translation(language_code):
+                with switch_language(self, language_code):
+                    update_object(self, translation)
+            else:
+                self.create_translation(language_code=language_code, **translation)
+
+        if translations_to_delete:
+            self.delete_translations(translations_to_delete)

common/tests/conftest.py

@@ -1,21 +1,28 @@
+import shutil
+
 import factory.random
 import pytest
 from django.contrib.auth.models import AnonymousUser
 from django.test import RequestFactory
+from django.utils import timezone
 from freezegun import freeze_time
 from graphene.test import Client
 
+from events.factories import EventFactory, OccurrenceFactory
 from kukkuu.schema import schema
 from users.factories import GuardianFactory, UserFactory
+from venues.factories import VenueFactory
 
 
 @pytest.fixture(autouse=True)
 def setup_test_environment(settings):
     factory.random.reseed_random("777")
     settings.DEFAULT_FROM_EMAIL = "kukkuu@example.com"
     settings.ILMOITIN_TRANSLATED_FROM_EMAIL = {}
+    settings.MEDIA_ROOT = "test_media"
     with freeze_time("2020-12-12"):
         yield
+    shutil.rmtree("test_media", ignore_errors=True)
 
 
 @pytest.fixture
@@ -43,6 +50,21 @@ def guardian_api_client():
     return _create_api_client_with_user(UserFactory(guardian=GuardianFactory()))
 
 
+@pytest.fixture
+def event():
+    return EventFactory()
+
+
+@pytest.fixture
+def venue():
+    return VenueFactory()
+
+
+@pytest.fixture
+def occurrence():
+    return OccurrenceFactory(time=timezone.now())
+
+
 def _create_api_client_with_user(user):
     request = RequestFactory().post("/graphql")
     request.user = user

common/tests/utils.py

@@ -1,5 +1,31 @@
+from django.core import mail
+from django_ilmoitin.models import NotificationTemplate
+from parler.utils.context import switch_language
+
+
 def assert_permission_denied(response):
     assert (
         response["errors"][0]["message"]
         == "You do not have permission to perform this action"
     )
+
+
+def assert_mails_match_snapshot(snapshot):
+    snapshot.assert_match(
+        [f"{m.from_email}|{m.to}|{m.subject}|{m.body}" for m in mail.outbox]
+    )
+
+
+def create_notification_template_in_language(
+    notification_type, language, **translations
+):
+    try:
+        template = NotificationTemplate.objects.get(type=notification_type)
+    except NotificationTemplate.DoesNotExist:
+        template = NotificationTemplate(type=notification_type)
+    with switch_language(template, language):
+        for field, value in translations.items():
+            setattr(template, field, value)
+            template.save()
+
+    return template

common/utils.py

@@ -1,6 +1,21 @@
+from django.db import transaction
+
+
 def update_object(obj, data):
     if not data:
         return
     for k, v in data.items():
         setattr(obj, k, v)
     obj.save()
+
+
+@transaction.atomic
+def update_object_with_translations(model, model_data):
+    translations_input = model_data.pop("translations", None)
+    delete_translations_input = model_data.pop("delete_translations", None)
+
+    if translations_input or delete_translations_input:
+        model.create_or_update_translations(
+            translations_input, delete_translations_input
+        )
+    update_object(model, model_data)

docker-entrypoint.sh

@@ -15,7 +15,6 @@ fi
 # Apply database migrations
 if [[ "$APPLY_MIGRATIONS" = "1" ]]; then
     echo "Applying database migrations..."
-    ./manage.py makemigrations
     ./manage.py migrate --noinput
 fi