Merge pull request #131 from crypotex/revert-130-feature/129

Revert "Add celery server setup and tasks (feature/129)"

setup.py

@@ -19,8 +19,7 @@
     'django-widget-tweaks==1.4.1',
     'pytz==2015.6',
     'freezegun==0.3.5',
-    'django-tables2==1.0.4',
-    'celery==3.1.19'
+    'django-tables2==1.0.4'
 ]
 
 setup(

taas/server/__init__.py

@@ -1 +0,0 @@
-from taas.server.celery import app as celery_app

taas/server/base_settings.py

@@ -4,8 +4,6 @@
 
 import os
 
-from datetime import timedelta
-
 from django.conf import global_settings
 from django.core.urlresolvers import reverse_lazy
 
@@ -98,14 +96,6 @@
     }
 }
 
-# CELERY SETTINGS
-BROKER_URL = 'redis://localhost:6379/0'
-CELERY_ACCEPT_CONTENT = ['json']
-CELERY_TASK_SERIALIZER = 'json'
-CELERY_RESULT_SERIALIZER = 'json'
-
-CELERY_TIMEZONE = 'Europe/Tallinn'
-
 LANGUAGE_CODE = 'en-us'
 
 TIME_ZONE = 'Europe/Tallinn'

taas/server/settings.py.example

@@ -19,13 +19,6 @@ EMAIL_HOST_PASSWORD = 'blablabla'
 
 ADMIN_EMAILS = ['example@gmail.com']
 
-CELERYBEAT_SCHEDULE = {
-    'remove-expired-reservations': {
-        'task': 'taas.reservation.tasks.remove_expired_reservations',
-        'schedule': timedelta(minutes=5),
-    },
-}
-
 if DEBUG:
     EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
     EMAIL_FILE_PATH = os.path.join(PROJECT_ROOT, 'inbox')

taas/server/test_settings.py

@@ -1,5 +1,5 @@
-from taas.server.base_settings import *
-from taas.server.email_settings import *
+from .base_settings import *
+from .email_settings import *
 
 SECRET_KEY = 'test-key'
 
@@ -14,26 +14,3 @@
         'NAME': ':memory:',
     }
 }
-
-CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
-CELERY_ALWAYS_EAGER = True
-BROKER_BACKEND = 'memory'
-
-CELERYBEAT_SCHEDULE = {
-    'remove-expired-reservations': {
-        'task': 'taas.reservation.tasks.remove_expired_reservations',
-        'schedule': timedelta(minutes=5),
-    },
-}
-
-EMAIL_HOST = 'smtp.example.com'
-
-EMAIL_HOST_USER = 'test.user@example.com'
-
-EMAIL_HOST_PASSWORD = 'test'
-
-ADMIN_EMAILS = ['test.admin@example.com']
-
-if DEBUG:
-    EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
-    EMAIL_FILE_PATH = os.path.join(PROJECT_ROOT, 'inbox')

taas/user/handlers.py

@@ -1,27 +1,23 @@
 import logging
 
-from taas.user import tasks
-
 logger = logging.getLogger(__name__)
 
-
 def send_emails_to_users(sender, instance=None, created=False, **kwargs):
     if created:
-        tasks.email_user_on_registration.delay(instance.id)
+        instance.email_user_on_registration()
 
         if instance.is_active:
-            tasks.email_user_on_activation.delay(instance.id)
+            instance.email_user_on_activation()
 
         return
 
     old_active = instance.tracker.previous('is_active')
     new_active = instance.is_active
 
     if (old_active, new_active) == (False, True):
-        tasks.email_user_on_activation.delay(instance.id)
+        instance.email_user_on_activation()
     elif (old_active, new_active) == (True, False):
-        tasks.email_user_on_deactivation.delay(instance.id)
-
+        instance.email_user_on_deactivation()
 
 def check_user_activation(sender, instance=None, created=False, **kwargs):
 

taas/user/models.py

@@ -1,6 +1,8 @@
 import logging
 
+from django.conf import settings
 from django.contrib.auth.models import AbstractBaseUser, UserManager, PermissionsMixin
+from django.core.mail import send_mail
 from django.core.validators import RegexValidator, MinValueValidator
 from django.db import models
 from django.utils import timezone
@@ -34,7 +36,6 @@ def create_user(self, email=None, password=None, **extra_fields):
     def create_superuser(self, email, password, **extra_fields):
         return self._create_user(email, password, True, True, **extra_fields)
 
-
 class User(AbstractBaseUser, PermissionsMixin):
     first_name = models.CharField(_('first name'), max_length=30)
     last_name = models.CharField(_('last name'), max_length=30)
@@ -80,6 +81,7 @@ def display_budget_money(self):
         """
         return '%d€' % self.budget
 
+
     def create_pin(self):
         """
         Generates a pin for user
@@ -89,3 +91,67 @@ def create_pin(self):
         used_pins = set(User.objects.values_list('pin', flat=True))
         all_pins.difference(used_pins)
         self.pin = sample(all_pins, 1)[0]
+
+    def email_user_on_registration(self):
+        """
+        Sends an email to this user, when he is created.
+        """
+        message = settings.USER_REGISTRATION_MESSAGE
+        message = message % {'first_name': self.first_name}
+        subject = settings.REGISTRATION_SUBJECT
+        from_email = settings.EMAIL_HOST_USER
+
+        send_mail(subject, message, from_email, [self.email])
+        logger.info('Registration message for user with email %s has been sent.' % self.email)
+
+    def email_user_on_activation(self):
+        """
+        Sends an email to this user, when he is verified.
+        """
+        message = settings.USER_VERIFICATION_MESSAGE
+        message = message % {'first_name': self.first_name}
+        subject = settings.USER_STATUS_SUBJECT
+        from_email = settings.EMAIL_HOST_USER
+
+        send_mail(subject, message, from_email, [self.email])
+        logger.info('Activation message for user with email %s has been sent.' % self.email)
+
+    def email_user_on_deactivation(self):
+        """
+        Sends an email to this user, when he is disabled.
+        """
+        message = settings.USER_DISABLE_MESSAGE
+        message = message % {'first_name': self.first_name}
+        subject = settings.USER_STATUS_SUBJECT
+        from_email = settings.EMAIL_HOST_USER
+
+        send_mail(subject, message, from_email, [self.email])
+        logger.info('Deactivation message for user with email %s has been sent.' % self.email)
+
+    def email_admin_on_user_registration(self):
+        """
+        Sends an email to the admin users, when new user was created.
+        """
+        message = settings.ADMIN_REGISTRATION_MESSAGE
+        message = message % {'email': self.email}
+        subject = settings.REGISTRATION_SUBJECT
+        from_email = settings.EMAIL_HOST_USER
+        to_emails = settings.ADMIN_EMAILS
+
+        send_mail(subject, message, from_email, to_emails)
+        logger.info('User with email %s registration message has been sent to admin emails: %s.'
+                    % (self.email, ', '.join(to_emails)))
+
+    def email_admin_on_user_deactivation(self):
+        """
+        Sends an email to the admin users, when new user was deactivated.
+        """
+        message = settings.ADMIN_USER_DISABLE_MESSAGE
+        message = message % {'email': self.email}
+        subject = settings.USER_STATUS_SUBJECT
+        from_email = settings.EMAIL_HOST_USER
+        to_emails = settings.ADMIN_EMAILS
+
+        send_mail(subject, message, from_email, to_emails)
+        logger.info('User with email %s deactivation message has been sent to admin emails: %s.'
+                    % (self.email, ', '.join(to_emails)))

taas/user/tests/test_user_update.py

@@ -63,6 +63,7 @@ def test_deactivated_user_has_None_pin(self):
         user.save()
         self.assertEqual(user.pin, None)
 
+
     def test_logged_in_user_can_update_his_last_name(self):
         self.client.login(username=self.user.email, password='isherenow', follow=True)
 

taas/user/views.py

@@ -18,7 +18,6 @@
 from taas.user import forms
 from taas.user import mixins
 from taas.user import models
-from taas.user import tasks
 
 logger = logging.getLogger(__name__)
 
@@ -32,7 +31,7 @@ class UserCreateView(CreateView):
 
     def form_valid(self, form):
         self.object = form.save()
-        tasks.email_admin_on_user_registration.delay(self.object.id)
+        self.object.email_admin_on_user_registration()
 
         messages.success(self.request, self.success_message)
         logger.info('Unverified user with email %s has been successfully registered.'
@@ -79,7 +78,7 @@ def get_form_kwargs(self):
     def form_valid(self, form):
         self.request.user.is_active = False
         self.request.user.save()
-        tasks.email_admin_on_user_deactivation.delay(self.request.user.id)
+        self.request.user.email_admin_on_user_deactivation()
         logger.info('User with email %s has been been deactivated.' % form.cleaned_data.get('email'))
 
         logout(self.request)