Merge pull request #1082 from kawazrepos/develop

2016年09月04日のリリース

config/requirements.txt

@@ -13,6 +13,7 @@ django-contrib-comments
 django-debug-toolbar
 django-debug-toolbar-template-timings
 django-debug-toolbar-vcs-info>=1.1.0
+django-slack-invitation
 requests
 django-appconf
 honcho

src/kawaz/apps/products/fixtures/production.yaml

@@ -46,10 +46,17 @@
   pk: 12
   fields:
     label: その他ゲーム
+    order: 99
 - model: products.category
   pk: 13
   fields:
     label: その他企画
+    order: 100
+- model: products.category
+  pk: 14
+  fields:
+    label: Kawaz Compilation
+    order: 10
 - model: products.platform
   pk: 1
   fields:

src/kawaz/core/personas/models/persona.py

@@ -1,7 +1,9 @@
 import re
 import os
+import logging
 
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.db.models.base import ModelBase
 from django.contrib.auth.models import AbstractUser
@@ -230,3 +232,22 @@ def get_absolute_url(self):
 from ..activities.persona import PersonaActivityMediator
 from activities.registry import registry
 registry.register(Persona, PersonaActivityMediator())
+
+from django.dispatch import receiver
+from slack_invitation.slack import SlackInvitationClient, SlackInvitationException
+from registration.signals import user_accepted
+
+
+@receiver(user_accepted)
+def invite_to_slack(user, profile, request, **kwargs):
+    try:
+        team = getattr(settings, 'DJANGO_SLACK_INVITATION_TEAM', None)
+        token = getattr(settings, 'DJANGO_SLACK_INVITATION_TOKEN', None)
+        if not team or not token:
+            raise ImproperlyConfigured('Both DJANGO_SLACK_INVITATION_TEAM and '
+                                       'DJANGO_SLACK_INVITATION_TOKEN must be set')
+        client = SlackInvitationClient(team, token)
+        client.invite(user.email)
+    except (ImproperlyConfigured, SlackInvitationException) as e:
+        logger = logging.getLogger(__name__)
+        logger.error(e)

src/kawaz/core/personas/tests/test_models/test_persona.py

@@ -1,5 +1,9 @@
-from django.test import TestCase
+from unittest.mock import patch
+from django.test import TestCase, override_settings
 from django.core.exceptions import ValidationError
+from registration.backends.default import DefaultRegistrationBackend
+from registration.tests.mock import mock_request
+from slack_invitation.slack import SlackInvitationClient
 
 from ..factories import PersonaFactory
 from kawaz.core.personas.models import Persona, PersonaManager
@@ -101,3 +105,24 @@ def test_is_superuser_return_corresponding_value(self):
         self.assertFalse(user.is_superuser)
         user = PersonaFactory(role='wille')
         self.assertFalse(user.is_superuser)
+
+    @override_settings(
+        DJANGO_SLACK_INVITATION_TEAM='teamname',
+        DJANGO_SLACK_INVITATION_TOKEN='token'
+    )
+    def test_invite_to_slack(self):
+        """
+        Personaがacceptされたとき、Slackに自動的に招待する
+        """
+        request = mock_request()
+        backend = DefaultRegistrationBackend()
+
+        with patch.object(SlackInvitationClient, 'invite') as invite:
+            new_user = backend.register(
+                username='bob', email='bob@example.com',
+                request=request)
+
+            profile = new_user.registration_profile
+            backend.accept(profile, request=request)
+
+            invite.assert_called_with('bob@example.com')

src/kawaz/settings.py

@@ -42,6 +42,7 @@
     'crispy_forms',
     'compressor',
     'activities',
+    'slack_invitation',
     'google_calendar',
     'kawaz.core.management',
     'kawaz.core.db',
@@ -361,7 +362,7 @@ def show_debug_toolbar(request):
 }
 
 # 神、いわゆるゴッド
-GEEKDRUMS_NAME = 'CollapsedPlug, lyrica09, miio'
+GEEKDRUMS_NAME = 'miio'
 
 # 環境依存の設定（デプロイサーバー固有の設定など）を読み込む
 LOCAL_SETTINGS_LOADED = False