Issue 3

app/email.py

@@ -0,0 +1,22 @@
+
+from django.template import Context
+from django.template.loader import render_to_string
+from django.core.mail import EmailMessage
+from django.conf import settings
+
+def send_new_email_registration(name, ci, email):
+
+    context = {
+        'name': name,
+        'email': email,
+        'ci': ci,
+    }
+
+    email_subject = 'New registration (cipe)'
+    email_body = render_to_string('email/new_email_registration.txt', context)
+
+    email = EmailMessage(
+        email_subject, email_body,
+        settings.DEFAULT_FROM_EMAIL,settings.EMAILS_FROM_MODERATOR,
+    )
+    return email.send(fail_silently=False)

app/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 from app.constants import SEX, SCIENTIFIC_AREA, POSITION, COMMUNICATION_CHANNELS
-
+from app.tasks import send_new_registration_email_task
 SEX_EMPTY = [('','Indique su sexo')] + list(SEX)
 SCI_AREA_EMPTY = [('','Seleccione un área')] + list(SCIENTIFIC_AREA)
 POSITION_EMPTY = [('','Seleccione su nivel académico')] + list(POSITION)
@@ -144,7 +144,8 @@ class RegistrationForm(forms.Form):
     location_name = forms.CharField(widget=forms.HiddenInput(), required=False)
     location_lat = forms.CharField(widget=forms.HiddenInput(), required=False)
     location_lng = forms.CharField(widget=forms.HiddenInput(), required=False)
-
+    def send_email(self):
+        send_new_registration_email_task.delay(self.cleaned_data['first_name']+self.cleaned_data['last_name'],self.cleaned_data['ci'],self.cleaned_data['email'])
 
 class RegistrationEditForm(forms.Form):
     first_name = forms.CharField(label='Nombre *', widget=forms.TextInput(

app/tasks.py

@@ -0,0 +1,15 @@
+from celery import shared_task
+from celery.decorators import task
+from celery.utils.log import get_task_logger
+from .email import send_new_email_registration
+
+logger=get_task_logger(__name__)
+
+@task(name="send_new_registration_email_task")
+def send_new_registration_email_task(name,ci,email):
+    print("Sent new registration email")
+    logger.info("Sent new registration email")
+    return send_new_email_registration(name,ci,email)
+@shared_task
+def add(x, y):
+    return x + y

app/templates/email/new_email_registration.txt

@@ -0,0 +1,9 @@
+Hello Moderator
+Just notify you {{name|safe}} join the community
+Here some info from the new user:
+Nombre completo : {{name|safe}}
+CI : {{ci|safe}}
+email : {{email|safe}}
+
+
+Thank you!

app/views.py

@@ -220,6 +220,13 @@ def registration(request):
                                                                                        'institution': inst_obj})
                 msg = f"Registro exitoso! Luego de su aprobación, los datos podrán ser " \
                       f"visualizados en el mapa de investigadores."
+                #Notify moderator of the new register
+                try:
+                    form.send_email()
+                    print("Succesfuly sent email new regitration")
+                except:
+                    print("Fail to sent email new registration")
+
                 form = RegistrationForm()
                 registration_error = 0
         else:

cipe/__init__.py

@@ -0,0 +1,3 @@
+from .celery import app as celery_app
+
+__all__ = ('celery_app',)

cipe/celery.py

@@ -0,0 +1,22 @@
+import os
+
+from celery import Celery
+
+# set the default Django settings module for the 'celery' program.
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cipe.settings')
+
+app = Celery('cipe')
+
+# Using a string here means the worker doesn't have to serialize
+# the configuration object to child processes.
+# - namespace='CELERY' means all celery-related configuration keys
+#   should have a `CELERY_` prefix.
+app.config_from_object('django.conf:settings', namespace='CELERY')
+
+# Load task modules from all registered Django app configs.
+app.autodiscover_tasks()
+
+
+@app.task(bind=True)
+def debug_task(self):
+    print(f'Request: {self.request!r}')

docker-compose.yml

@@ -1,6 +1,15 @@
 version: '3.7'
 
 services:
+  rabbit:
+    hostname: rabbit
+    image: rabbitmq:3-management
+    environment:
+      - RABBITMQ_DEFAULT_USER=guest
+      - RABBITMQ_DEFAULT_PASS=guest
+    ports:
+      - "5672:5672"  
+      - "15672:15672"  
   app:
     restart: always
     build: .
@@ -25,4 +34,4 @@ services:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT}
       - MYSQL_DATABASE=${SQL_DATABASE}
       - MYSQL_USER=${SQL_USER}
-      - MYSQL_PASSWORD=${SQL_PASSWORD}
+      - MYSQL_PASSWORD=${SQL_PASSWORD}

requirements.txt

@@ -1,11 +1,26 @@
+amqp==5.0.5
+billiard==3.6.3.0
+celery==5.0.5
 certifi==2019.6.16
 chardet==3.0.4
+click==7.1.2
+click-didyoumean==0.0.3
+click-plugins==1.1.1
+click-repl==0.1.6
 Django==2.2.10
 googlemaps==3.0.2
+gunicorn==19.9.0
 idna==2.8
+importlib-metadata==3.7.3
+kombu==5.0.2
 mysqlclient==1.4.2.post1
+prompt-toolkit==3.0.18
 pytz==2019.1
 requests==2.22.0
+six==1.15.0
 sqlparse==0.3.0
+typing-extensions==3.7.4.3
 urllib3==1.25.3
-gunicorn==19.9.0
+vine==5.0.0
+wcwidth==0.2.5
+zipp==3.4.1