Issue 3

.env.dev.sample

@@ -9,4 +9,13 @@ SQL_PASSWORD=
 SQL_HOST=db
 SQL_PORT=3306
 GOOGLE_MAPS_API_KEY=
-DATABASE=mysql
+DATABASE=mysql
+EMAIL_BACKEND=django.core.mail.backends.smtp.EmailBackend
+EMAIL_HOST=smtp.gmail.com
+EMAIL_HOST_PASSWORD=
+[email protected]
+[email protected],[email protected]
+RABBITMQ_DEFAULT_USER=guest
+RABBITMQ_DEFAULT_PASS=guest
+EMAIL_PORT=587
+EMAIL_USE_TLS=1

Dockerfile

@@ -14,7 +14,7 @@ RUN apk --no-cache add --virtual build-dependencies \
     gcc \
     libc-dev \
     libffi-dev \
-    mariadb-dev
+    mariadb-dev 
 
 # install app dependencies
 RUN pip install --upgrade pip
@@ -28,4 +28,4 @@ COPY ./entrypoint.sh /usr/src/app/entrypoint.sh
 COPY ./ /usr/src/app/
 
 # run entrypoint.sh
-ENTRYPOINT ["/usr/src/app/entrypoint.sh"]
+ENTRYPOINT ["/usr/src/app/entrypoint.sh"]

README.md

@@ -14,14 +14,11 @@ A live version of CIPE can be accessed [here](https://investigadoresparaguayosen
 
 ## Installation
 
-Install docker and docker-compose in your local machine. Check the official installation [guidelines](https://docs.docker.com/install/); 
-
-### Production
-
-For the impatient: The only key you need to get a **really quick start**, is a valid Google Map API KEY, all the others default credentials will be used. However your are encouraged to complete the setup process if your planning to use this proyect in the long run.
-1. Obtain a google maps api key by following the instructions [here](https://developers.google.com/maps/documentation/embed/get-api-key);
-2. Clone the repository `git clone https://github.com/joausaga/cipe.git`;
-3. Get into the directory `cipe`;
+0. For the impatient: The only key you need to get a **really quick start**, is a valid Google Map API KEY, all the others default credentials will be used. However your are encouraged to complete the setup process if your planning to use this proyect in the long run.
+1. Install docker and docker-compose in your local machine. Check the official installation [guidelines](https://docs.docker.com/install/); 
+2. Obtain a google maps api key by following the instructions [here](https://developers.google.com/maps/documentation/embed/get-api-key);
+3. Clone the repository `git clone https://github.com/joausaga/cipe.git`;
+4. Get into the directory `cipe`;
 4. Run `scripts/prepare-config-templates.sh`
 5. Set the configuration parameters of the database in `.env.prod.db`;
 6. Set the SECRET_KEY and GOOGLE_MAPS_API_KEY obtained before as well as the configuration parameters 
@@ -59,6 +56,8 @@ for  accessing public information about the [BECAL](http://www.becal.gov.py/) fe
 2. [MySQL Community Server](https://www.mysql.com/downloads/)
 3. [Django 2.2](https://www.djangoproject.com)
 4. Google Maps
+5. [Rabbitmqctl](https://www.rabbitmq.com)
+6. [Celery](https://docs.celeryproject.org)
 
 ## Issues
 

app/admin.py

@@ -13,6 +13,7 @@
 import logging
 import re
 
+from app.tasks import send_approved_email_task
 
 logger = logging.getLogger(__name__)
 
@@ -54,10 +55,26 @@ def affiliation(self, obj):
         except:
             return ''
     affiliation.short_description = 'Affiliation'
+    def save_model(self, request, obj, form, change):
+        if(change):
+            try:
+                current_obj=Scientist.objects.get(id=obj.id)
+                self.notify_user_approved(obj,current_obj)
+            except:
+                logger.info("Error ocurred sending email of aproven user")
+
+            super().save_model(request, obj, form, change)
+
+    def notify_user_approved(self,obj,current_obj):
+        if(obj.approved and obj.approved != current_obj.approved):
+            send_approved_email_task.delay(obj.first_name ,obj.slug,obj.email)
+
 
     def approve_scientists(self, request, queryset):
         for scientist in queryset:
             scientist.approved = True
+            current_scientist=Scientist.objects.get(id=scientist.id)
+            self.notify_user_approved(scientist,current_scientist)
             scientist.save()
     approve_scientists.short_description = 'Approve scientists'
 

app/email.py

@@ -0,0 +1,41 @@
+
+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,position, institution):
+
+    context = {
+        'name': name,
+        'position':position,
+        'institution':institution
+    }
+    email_subject = 'Nuevo Registro ingresado'
+    html_message = render_to_string('email/new_email_registration.html', context)
+    email = EmailMessage(
+        subject=email_subject,
+        body=html_message,
+        from_email= settings.DEFAULT_FROM_EMAIL,
+        to=[settings.MODERATOR_EMAIL_ADDRESSES],
+        )
+    email.content_subtype = 'html' 
+    return email.send()
+
+def send_approved_email(name,slug,to_email):
+
+    context = {
+        'name': name,
+        'slug': slug,
+    }
+    email_subject = 'Tu registro en el sitio Investigadores Paraguayos en el Mundo ha sido aprobado'
+    html_message = render_to_string('email/approved_email.html', context)
+    email = EmailMessage(
+        subject=email_subject,
+        body=html_message,
+        from_email= settings.DEFAULT_FROM_EMAIL,
+        to=[to_email],
+        )
+    email.content_subtype = 'html' 
+    return email.send()
+

app/forms.py

@@ -144,8 +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)
-
-
+ 
+    
 class RegistrationEditForm(forms.Form):
     first_name = forms.CharField(label='Nombre *', widget=forms.TextInput(
         attrs={

app/tasks.py

@@ -0,0 +1,16 @@
+from celery.decorators import task
+from celery.utils.log import get_task_logger
+from .email import send_new_email_registration,send_approved_email
+
+logger=get_task_logger(__name__)
+
+@task(name="send_new_registration_email_task")
+def send_new_registration_email_task(name,position,institution):
+    logger.info("Sending email to moderators ... ")
+    return send_new_email_registration(name,position,institution)
+
+
+@task(name="send_approved_email_task")
+def send_approved_email_task(name,slug,email):
+    logger.info("Sent approve email task")
+    return send_approved_email(name,slug,email)

app/templates/email/approved_email.html

@@ -0,0 +1,30 @@
+
+ <div style="max-width: 1088px;">
+    <img src="https://user-images.githubusercontent.com/2123231/112866846-8c792b00-90ba-11eb-85ae-9fd161c93f83.png" style="display:block;    width: 100%;
+    max-width: 1088px;">
+    <br><br>
+    Hola <strong> {{ name }}</strong>.
+    <br><br>
+    Tu registro en el sitio <a href="https://investigadoresparaguayosenelmundo.com"  target="_blank">
+        Investigadores Paraguayos en el Mundo</a> ha sido aprobado. Puedes verificar tu información en el sitio accediendo al mapa 
+        <a href="https://investigadoresparaguayosenelmundo.com/map" targe="_blank">aquí</a>.
+    <br><br>
+    Puedes modificar datos de tu registro <a href="https://investigadoresparaguayosenelmundo.com/registration/edit/{{ slug }}">aqui</a>. 
+    <br><br>
+    <strong>
+        Recuerda que el objetivo del sitio es:
+    </strong>
+    <br><br>
+    <ol>
+        <li> Generar colaboraciones entre académicos paraguayos residiendo en el extranjero y trabajando en áreas afines con el potencial de iniciar lineas de investigación que puedan derivar en investigaciones conjuntas en el futuro;</li>
+        <li>Fortalecer vínculos entre investigadores paraguayos residiendo en lugares próximos propiciando la creación de comunidades locales para el intercambio de ideas, conocimientos, y experiencias</li>
+    </ol>
+    <br><br>
+   <strong> Te animo a aprovechar la información del sitio para establecer contacto y colaboración que puedan ayudarte en tus actividades académicas..</strong>
+    <br><br>
+    Cualquier otra cosa, estoy a las órdenes.
+    <br><br>
+Saludos!
+<br><br>
+Jorge Saldivar Galli
+</div>

app/templates/email/new_email_registration.html

@@ -0,0 +1,13 @@
+<div>
+<br><br>
+Hola!
+<br><br>
+
+<strong> {{name|safe}}  </strong>  afiliado a  <strong> {{institution|safe}} </strong>  en calidad de  <strong> {{position|safe}} </strong>  desea registrarse en la plataforma Investigadores Paraguayos en el Mundo.
+<br><br>
+
+Favor ingrese al panel de administración para aprobar el registro.
+<br><br>
+
+<strong>Gracias</strong>
+</div>

app/views.py

@@ -9,8 +9,7 @@
 from django.forms.models import model_to_dict
 from django.shortcuts import render
 from django.http import HttpResponse
-
-
+from app.tasks import send_new_registration_email_task
 logger = logging.getLogger(__name__)
 countries_iso2 = load_countries_iso2()
 
@@ -220,6 +219,11 @@ 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."
+
+                #Send mail to notify new registration to moderator
+                send_new_registration_email_task.delay(scientist_obj.first_name+' '+scientist_obj.last_name,scientist_obj.position,inst_obj.name)
+
+
                 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}')

cipe/settings.py.sample

@@ -170,3 +170,17 @@ LOGGING = {
         }
     }
 }
+
+
+CELERY_BROKER_URL = "amqp://{}:{}@rabbit:5672/%2F".format(os.environ.get('RABBITMQ_DEFAULT_USER'),os.environ.get('RABBITMQ_DEFAULT_PASS'))
+
+
+EMAIL_BACKEND = os.environ.get("EMAIL_BACKEND")
+EMAIL_HOST =  os.environ.get("EMAIL_HOST")
+EMAIL_PORT = os.environ.get("EMAIL_PORT")
+EMAIL_USE_TLS = int(os.environ.get("EMAIL_PORT"))
+
+EMAIL_HOST_USER = os.environ.get('ADMIN_EMAIL_ADDRESS')
+EMAIL_HOST_PASSWORD=os.environ.get('EMAIL_HOST_PASSWORD')
+DEFAULT_FROM_EMAIL=os.environ.get('ADMIN_EMAIL_ADDRESS')
+MODERATOR_EMAIL_ADDRESSES= os.environ.get('MODERATOR_EMAIL_ADDRESSES').split(",")

docker-compose.yml

@@ -1,6 +1,15 @@
 version: '3.7'
 
 services:
+  rabbit:
+    hostname: rabbit
+    image: rabbitmq:3.8.14-management
+    environment:
+      - RABBITMQ_DEFAULT_USER=${RABBITMQ_DEFAULT_USER}
+      - RABBITMQ_DEFAULT_PASS=${RABBITMQ_DEFAULT_PASS}
+    ports:
+      - "5672:5672"  
+      - "15672:15672"  
   app:
     restart: always
     build: .
@@ -25,4 +34,19 @@ services:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT}
       - MYSQL_DATABASE=${SQL_DATABASE}
       - MYSQL_USER=${SQL_USER}
-      - MYSQL_PASSWORD=${SQL_PASSWORD}
+      - MYSQL_PASSWORD=${SQL_PASSWORD}
+  celery_worker:
+    build: .
+    command: celery -A cipe  worker --loglevel=info
+    volumes:
+      - .:/usr/src/app/ 
+    environment:
+      - DEBUG=${DEBUG}
+      - DJANGO_ALLOWED_HOSTS=${DJANGO_ALLOWED_HOSTS}
+      - CELERY_BROKER=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@rabbit:5672/%2F
+    depends_on:
+      - app
+      - rabbit
+    env_file:
+      - ./.env.dev
+

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