Added Admin Email for Journal Response

api/app/events/repository.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from app import db
-from app.events.models import Event, EventFee, EventType
+from app.events.models import Event, EventFee, EventType, EventRole
 from app.organisation.models import Organisation
 from app.responses.models import Response
 from app.applicationModel.models import ApplicationForm
@@ -72,3 +72,12 @@ def get_event_fees(event_id, event_fee_ids):
                 EventFee.is_active==True)
             .all()
         )
+
+    @staticmethod
+    def get_event_admins(event_id):
+        return (
+            db.session.query(AppUser)
+            .join(EventRole, EventRole.user_id == AppUser.id)
+            .filter_by(event_id=event_id, role='admin')
+            .all()
+        )

api/app/responses/api.py

@@ -106,6 +106,12 @@ def post(self):
                 user = user_repository.get_by_id(user_id)
                 response = response_repository.get_by_id_and_user_id(response.id, user_id)
                 self.send_confirmation(user, response)
+
+                event = event_repository.get_event_by_response_id(response.id)
+                if event.event_type == EventType.CONTINUOUS_JOURNAL:
+                    event_admins = event_repository.get_event_admins(event_id=event.id)
+                    for event_admin in event_admins:
+                        self.send_confirmation(event_admin, response)
         except:
             LOGGER.warn('Failed to send confirmation email for response with ID : {id}, but the response was submitted succesfully'.format(id=response.id))
         finally:
@@ -152,6 +158,12 @@ def put(self):
                 user = user_repository.get_by_id(user_id)
                 response = response_repository.get_by_id_and_user_id(response.id, user_id)
                 self.send_confirmation(user, response)
+
+                event = event_repository.get_event_by_response_id(response.id)
+                if event.event_type == EventType.CONTINUOUS_JOURNAL:
+                    event_admins = event_repository.get_event_admins(event_id=event.id)
+                    for event_admin in event_admins:
+                        self.send_confirmation(event_admin, response)
         except:                
             LOGGER.warn('Failed to send confirmation email for response with ID : {id}, but the response was submitted succesfully'.format(id=response.id))
         finally:
@@ -215,15 +227,26 @@ def send_confirmation(self, user, response):
             else:
                 event_description = event.get_description('en')
 
-            emailer.email_user(
-                'confirmation-response-call' if event.event_type == EventType.CALL else 'confirmation-response',
+            if user.is_event_admin(event.id):
+                emailer.email_user(
+                'assign-action-editor',
                 template_parameters=dict(
                     event_description=event_description,
                     question_answer_summary=question_answer_summary,
                 ),
                 event=event,
                 user=user
             )
+            else:
+                emailer.email_user(
+                    'confirmation-response-call' if event.event_type == EventType.CALL else 'confirmation-response',
+                    template_parameters=dict(
+                        event_description=event_description,
+                        question_answer_summary=question_answer_summary,
+                    ),
+                    event=event,
+                    user=user
+                )
 
         except Exception as e:
             LOGGER.error('Could not send confirmation email for response with id : {response_id} due to: {e}'.format(response_id=response.id, e=e))

api/migrations/versions/cebfdfef31cd_assign_action_editor_email_template.py

@@ -0,0 +1,71 @@
+"""Adding email templates for assigning an action editor to a journal application
+
+Revision ID: cebfdfef31cd
+Revises: 6a073dd1e30d
+Create Date: 2023-03-02 14:03:29.661901
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'cebfdfef31cd'
+down_revision = '6a073dd1e30d'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import orm
+from sqlalchemy.ext.declarative import declarative_base
+from app import db
+
+Base = declarative_base()
+
+
+
+class EmailTemplate(Base):
+
+    __tablename__ = 'email_template'
+    __table_args__ = {'extend_existing': True}
+
+    id = db.Column(db.Integer(), primary_key=True)
+    key = db.Column(db.String(50), nullable=False)
+    event_id = db.Column(db.Integer(), nullable=True)
+    language = db.Column(db.String(2), nullable=False)
+    template = db.Column(db.String(), nullable=False)
+    subject = db.Column(db.String(), nullable=False)
+
+    def __init__(self, key, event_id, subject, template, language):
+        self.key = key
+        self.event_id = event_id
+        self.subject = subject
+        self.template = template
+        self.language = language
+
+
+def upgrade():
+    Base.metadata.bind = op.get_bind()
+    session = orm.Session(bind=Base.metadata.bind)
+
+    template = """Dear {title} {firstname} {lastname},
+
+A new application for {event_name} was received. Please assign an action editor to this application as soon as possible.
+
+"""
+
+    session.add(EmailTemplate('assign-action-editor', None, '{event_name} Response Receieved', template, 'en'))
+
+    template = """Dear {title} {firstname} {lastname},
+
+A new application for {event_name} was received but has not been assigned to an action editor yet. Please assign an action editor to this application as soon as possible.
+
+"""
+
+    session.add(EmailTemplate('action-editor-not-assigned', None, '{event_name} Action Editor ', template, 'en'))
+
+    session.commit()
+
+
+
+def downgrade():
+    added_keys = ['assign-action-editor', 'action-editor-not-assigned']
+    op.execute("""DELETE FROM email_template WHERE key in ({})""".format(', '.join(["'" + k + "'" for k in added_keys])))
+    op.execute("""SELECT setval('email_template_id_seq', (SELECT max(id) FROM email_template));""")
+