Merge pull request #68 from OpenLXP/ses_update

Ses update

app/configurations/fixtures/openlxp_email.json

@@ -0,0 +1,13 @@
+[
+{
+    "model": "openlxp_notifications.email",
+    "pk": 1,
+    "fields": {
+        "sender": "[email protected]",
+        "reference": "Subscribed_list_update",
+        "subject": 1,
+        "template_type": 1,
+        "recipients": []
+    }
+}
+]

app/configurations/fixtures/openlxp_email_subject.json

@@ -0,0 +1,9 @@
+[
+{
+    "model": "openlxp_notifications.subject",
+    "pk": 1,
+    "fields": {
+        "subject": "ECC New Resource Alert!"
+    }
+}
+]

app/configurations/fixtures/openlxp_email_templates.json

@@ -0,0 +1,11 @@
+[
+{
+    "model": "openlxp_notifications.template",
+    "pk": 1,
+    "fields": {
+        "template_type": "edlm-subscribed-list-update",
+        "message": "Hi {name:}!!<br></br><br></br>\r\n \r\nA new resource has been added to your list in the Enterprise Course Catalog (ECC): {list_name:} at {date_time:} by {author:}.<br></br>\r\n \r\nDive into the ECC and explore this latest addition to fuel your learning journey. 🌱<br></br>\r\n \r\nTo view your list, hop over to {list_url:}.<br></br><br></br>\r\n \r\nHappy learning!<br></br>\r\n \r\nThe EDLM Team",
+        "template_inputs": null
+    }
+}
+]

app/configurations/tests/test_setup.py

@@ -1,5 +1,6 @@
 from unittest.mock import patch
 
+from openlxp_notifications.models import email
 from rest_framework.test import APITestCase
 
 from configurations.models import XDSConfiguration
@@ -13,11 +14,14 @@ class TestSetUp(APITestCase):
     def setUp(self):
         """Function to set up necessary data for testing"""
 
-        self.patcher = patch('users.models.email_verification')
-        self.mock_email_verification = self.patcher.start()
+        # self.patcher = patch('users.models.email_verification')
+        # self.mock_email_verification = self.patcher.start()
 
-        self.patcher_2 = patch('xds_api.serializers.send_log_email_with_msg')
-        self.mock_send_email = self.patcher_2.start()
+        self.patcher = patch('core.signals.trigger_update')
+        self.mock_send_email = self.patcher.start()
+
+        self.email_not = email(reference='Subscribed_list_update')
+        self.email_not.save()
 
         # create user, save user, login using client
         self.auth_email = "[email protected]"
@@ -103,5 +107,4 @@ def setUp(self):
 
     def tearDown(self):
         self.patcher.stop()
-        self.patcher_2.stop()
         return super().tearDown()

app/configurations/views.py

@@ -1,10 +1,9 @@
+from openlxp_authentication.models import SAMLConfiguration
+from openlxp_authentication.serializers import SAMLConfigurationSerializer
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from social_django.utils import load_strategy
 
-from openlxp_authentication.models import SAMLConfiguration
-from openlxp_authentication.serializers import SAMLConfigurationSerializer
-
 from .models import XDSConfiguration, XDSUIConfiguration
 from .serializers import (XDSConfigurationSerializer,
                           XDSUIConfigurationSerializer)

app/core/signals.py

@@ -1,13 +1,47 @@
+import logging
+from django.conf import settings
 from django.db.models.signals import m2m_changed
 from django.dispatch import receiver
 from notifications.signals import notify
+from openlxp_notifications.management.commands. \
+    trigger_subscribed_list_update import \
+    trigger_update
+from openlxp_notifications.models import email
 
 from .models import InterestList
 
+logger = logging.getLogger('dict_config_logger')
+
 
 @receiver(m2m_changed, sender=InterestList.experiences.through)
 def interest_list_notify(sender, instance, action, reverse, pk_set, **kwargs):
     if action == 'post_add' and not reverse:
         notify.send(instance, recipient=instance.subscribers.all(),
                     verb='experiences added', added=pk_set,
                     list_name=instance.name)
+        #  setting variables for email request
+
+        recipient_list = list(instance.subscribers.values_list(
+            "email", "first_name", 'last_name'))
+        owner = instance.owner
+        list_name = instance.name
+
+        if settings.LOGIN_REDIRECT_URL:
+            list_url = (settings.LOGIN_REDIRECT_URL + "/"
+                        + str(instance.id))
+        else:
+            list_url = "ECC -> Subscribed Lists: " + instance.name
+
+        try:
+            email_type = email.objects.get(
+                    reference='Subscribed_list_update')
+
+            # trigger email notification
+            trigger_update(
+                email_type, recipient_list, owner,
+                list_name, list_url)
+        except email.DoesNotExist:
+            logger.error('Email configuration for subscribed list '
+                         'updates does not exist. Please add a '
+                         '"Subscribed_list_update" email template '
+                         'for the email alert. ')

app/core/tests/test_setup.py

@@ -1,5 +1,6 @@
 from unittest.mock import patch
 
+from openlxp_notifications.models import email
 from rest_framework.test import APITestCase
 
 
@@ -9,11 +10,11 @@ class TestSetUp(APITestCase):
     def setUp(self):
         """Function to set up necessary data for testing"""
 
-        self.patcher = patch('users.models.email_verification')
-        self.mock_email_verification = self.patcher.start()
+        self.patcher = patch('core.signals.trigger_update')
+        self.mock_send_email = self.patcher.start()
 
-        self.patcher_2 = patch('xds_api.serializers.send_log_email_with_msg')
-        self.mock_send_email = self.patcher_2.start()
+        self.email_not = email(reference='Subscribed_list_update')
+        self.email_not.save()
 
         self.email = "[email protected]"
         self.password = "test1234"
@@ -39,5 +40,4 @@ def setUp(self):
 
     def tearDown(self):
         self.patcher.stop()
-        self.patcher_2.stop()
         return super().tearDown()

app/openlxp_xds_project/settings.py

@@ -100,7 +100,10 @@
         'PASSWORD': os.environ.get('DB_PASSWORD'),
         'HOST': os.environ.get('DB_HOST'),
         'PORT': 3306,
-    }
+        'OPTIONS': {
+            'charset': 'utf8mb4',
+        }
+    },
 }
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'

app/users/models.py

@@ -11,9 +11,6 @@
 from rest_framework import exceptions
 from rest_framework.permissions import DjangoModelPermissions
 
-from openlxp_notifications.management.utils.ses_client import \
-    email_verification
-
 
 class Organization(TimeStampedModel):
     """Model to store an organization for filtering"""
@@ -91,7 +88,6 @@ def __str__(self):
         return self.email
 
     def save(self, *args, **kwargs):
-        email_verification(self.email)
         return super(XDSUser, self).save(*args, **kwargs)
 
 

app/users/tests/test_setup.py

@@ -1,5 +1,6 @@
 from unittest.mock import patch
 
+from openlxp_notifications.models import email
 from rest_framework.test import APITestCase
 
 from configurations.models import XDSConfiguration
@@ -13,11 +14,14 @@ class TestSetUp(APITestCase):
     def setUp(self):
         """Function to set up necessary data for testing"""
 
-        self.patcher = patch('users.models.email_verification')
-        self.mock_email_verification = self.patcher.start()
+        # self.patcher = patch('users.models.email_verification')
+        # self.mock_email_verification = self.patcher.start()
 
-        self.patcher_2 = patch('xds_api.serializers.send_log_email_with_msg')
-        self.mock_send_email = self.patcher_2.start()
+        self.patcher = patch('core.signals.trigger_update')
+        self.mock_send_email = self.patcher.start()
+
+        self.email_not = email(reference='Subscribed_list_update')
+        self.email_not.save()
 
         # create user, save user, login using client
         self.auth_email = "[email protected]"
@@ -103,5 +107,4 @@ def setUp(self):
 
     def tearDown(self):
         self.patcher.stop()
-        self.patcher_2.stop()
         return super().tearDown()

app/xds_api/serializers.py

@@ -1,7 +1,5 @@
 import logging
 
-from openlxp_notifications.management.commands.conformance_alerts import \
-    send_log_email_with_msg
 from rest_framework import serializers
 
 from configurations.models import CourseInformationMapping
@@ -107,14 +105,13 @@ def update(self, instance, validated_data):
                 instance.experiences.remove(exp)
 
         #  writing content to file
-        msg = ("Count of New Courses added: " + str(course_added_count))
+        # msg = ("Count of New Courses added: " + str(course_added_count))
 
         list_subscribers = []
         for each_subscriber in instance.subscribers.all():
             list_subscribers.append(each_subscriber.email)
 
         instance.save()
-        send_log_email_with_msg(list_subscribers, msg)
         return instance
 
 

app/xds_api/tests/test_setup.py

@@ -1,5 +1,6 @@
 from unittest.mock import patch
 
+from openlxp_notifications.models import email
 from rest_framework.test import APITestCase
 
 from configurations.models import XDSConfiguration
@@ -13,11 +14,14 @@ class TestSetUp(APITestCase):
     def setUp(self):
         """Function to set up necessary data for testing"""
 
-        self.patcher = patch('users.models.email_verification')
-        self.mock_email_verification = self.patcher.start()
+        # self.patcher = patch('users.models.email_verification')
+        # self.mock_email_verification = self.patcher.start()
 
-        self.patcher_2 = patch('xds_api.serializers.send_log_email_with_msg')
-        self.mock_send_email = self.patcher_2.start()
+        self.patcher = patch('core.signals.trigger_update')
+        self.mock_send_email = self.patcher.start()
+
+        self.email_not = email(reference='Subscribed_list_update')
+        self.email_not.save()
 
         # create user, save user, login using client
         self.auth_email = "[email protected]"
@@ -106,5 +110,4 @@ def setUp(self):
 
     def tearDown(self):
         self.patcher.stop()
-        self.patcher_2.stop()
         return super().tearDown()

app/xds_api/views.py

@@ -1,6 +1,6 @@
-from collections import OrderedDict
 import json
 import logging
+from collections import OrderedDict
 
 import requests
 from django.core.exceptions import ObjectDoesNotExist
@@ -9,9 +9,9 @@
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from core.management.utils.xds_internal import bleach_data_to_json
 
 from configurations.models import XDSConfiguration
+from core.management.utils.xds_internal import bleach_data_to_json
 from core.models import CourseSpotlight, Experience, InterestList, SavedFilter
 from xds_api.serializers import InterestListSerializer, SavedFilterSerializer
 from xds_api.utils.xds_utils import (get_request,

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   db:
-    image: mysql:5.7
+    image: mysql:8.4
     ports:
       - '3306:3306'
     environment:
@@ -33,15 +33,16 @@ services:
       AWS_ACCESS_KEY_ID: "${AWS_ACCESS_KEY_ID}"
       AWS_SECRET_ACCESS_KEY: "${AWS_SECRET_ACCESS_KEY}"
       AWS_DEFAULT_REGION: "${AWS_DEFAULT_REGION}"
-      REQUESTS_CA_BUNDLE: '/etc/ssl/certs/ca-certificates.pem'
-      AWS_CA_BUNDLE: '/etc/ssl/certs/ca-certificates.pem'
+      REQUESTS_CA_BUNDLE: '/etc/ssl/certs/ca-certificates.crt'
+      AWS_CA_BUNDLE: '/etc/ssl/certs/ca-certificates.crt'
       SECRET_KEY_VAL: "${SECRET_KEY_VAL}"
       LOG_PATH: "${LOG_PATH}"
       ENTITY_ID: "${ENTITY_ID}"
       SP_PUBLIC_CERT: "${SP_PUBLIC_CERT}"
       SP_PRIVATE_KEY: "${SP_PRIVATE_KEY}"
       BAD_HOST: "${BAD_HOST}"
       OVERIDE_HOST: "${OVERIDE_HOST}"
+      LOGIN_REDIRECT_URL: "${LOGIN_REDIRECT_URL}"
     volumes:
       - ./app:/opt/app/openlxp-xds
     depends_on:

requirements.txt

@@ -4,6 +4,10 @@ boto3~=1.16.54
 
 coverage>=5.5,<6.0
 
+mysql-connector-python == 8.0.28
+
+django-mysql==4.4.0
+
 Django>=3.2.3,<4.0
 
 django-admin-interface>=0.28.3
@@ -14,9 +18,11 @@ django-cors-headers>=3.7.0,<3.8.0
 
 django-elasticsearch-dsl>=7.2.2,<7.3.0
 
-django-model-utils>=4.1.1,<4.2.0
+isort==5.11.5
 
-django-mysql>=3.10.0,<3.11.0
+martor>=1.5.8,<1.6.0
+
+django-model-utils>=4.1.1,<4.2.0
 
 django-notifications-hq>=1.8.3, <2.0
 
@@ -34,11 +40,9 @@ gunicorn>=22.0.0, <22.1.0
 
 martor>=1.5.8,<1.6.0
 
-mysql-connector-python>=8.4.0, <8.5.0
-
 openlxp-authentication >=1.1.2, <1.2
 
-openlxp-notification>=1.3.0
+openlxp-notification>=1.4.0, <1.5.0
 
 Pillow>=10.2.0
 

start-app.sh

@@ -3,7 +3,11 @@
 
 python manage.py waitdb 
 python manage.py migrate 
+python manage.py createcachetable 
 python manage.py loaddata admin_theme_data.json 
+python manage.py loaddata openlxp_email_templates.json 
+python manage.py loaddata openlxp_email_subject.json 
+python manage.py loaddata openlxp_email.json 
 cd /opt/app/ 
 pwd 
 ./start-server.sh