Test marshal sync

forms-flow-web/src/constants/FOI/statusEnum.js

@@ -413,6 +413,13 @@ const AttachmentCategories = Object.freeze({
       bgcolor: "#595959",
       type: ["tag"],
     },
+    {
+      name: "rrt",
+      tags: ["rrt"],
+      display: "RRT",
+      bgcolor: "#003366",
+      type: ["tag"],
+    },
     {
       // transition: Response -> On hold
       name: "response-onhold",

notification-manager/common/notificationtypes.json

@@ -86,5 +86,9 @@
     "oipcduereminder": {
         "name": "OIPC Due Reminder",
         "notificationtypelabel": "oipcduereminder"    
+    },
+    "attachmentuploadevent": {
+        "name": "Attachment Upload Event",
+        "notificationtypelabel": "attachmentuploadevent"
     }
 }

request-management-api/common/notificationtypes.json

@@ -86,5 +86,9 @@
     "oipcduereminder": {
         "name": "OIPC Due Reminder",
         "notificationtypelabel": "oipcduereminder"    
+    },
+    "attachmentuploadevent": {
+        "name": "Attachment Upload Event",
+        "notificationtypelabel": "attachmentuploadevent"
     }
 }

request-management-api/migrations/versions/e698b39da6bd_add_rtt_tag.py

@@ -0,0 +1,22 @@
+"""Add RTT tag
+
+Revision ID: e698b39da6bd
+Revises: c590239f1b2f
+Create Date: 2024-04-15 08:17:20.554269
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e698b39da6bd'
+down_revision = 'c590239f1b2f'
+branch_labels = None
+depends_on = None
+
+def upgrade():
+    op.execute('INSERT INTO public."NotificationTypes"(name, description, isactive,notificationtypelabel ) VALUES (\'Attachment Upload Event\', \'Attachment Upload Event\', true, \'attachmentuploadevent\');')
+
+def downgrade():
+    op.execute('DELETE FROM public."NotificationTypes" WHERE name = \'Attachment Upload Event\';')

request-management-api/request_api/models/FOIMinistryRequests.py

@@ -176,7 +176,7 @@ def getrequests(cls, group = None):
         elif (group in ProcessingTeamWithKeycloackGroup.list()):
             _ministryrequestids = _session.query(distinct(FOIMinistryRequest.foiministryrequestid)).filter(and_(FOIMinistryRequest.isactive == True), and_(and_(FOIMinistryRequest.assignedgroup == group),and_(FOIMinistryRequest.requeststatuslabel.in_([StateName.open.name,StateName.callforrecords.name,StateName.closed.name,StateName.recordsreview.name,StateName.feeestimate.name,StateName.consult.name,StateName.ministrysignoff.value,StateName.onhold.name,StateName.response.name,StateName.peerreview.name,StateName.tagging.name,StateName.readytoscan.name])))).all()           
         else:
-            _ministryrequestids = _session.query(distinct(FOIMinistryRequest.foiministryrequestid)).filter(and_(FOIMinistryRequest.isactive == True), or_(and_(FOIMinistryRequest.assignedgroup == group),and_(FOIMinistryRequest.assignedministrygroup == group,or_(FOIMinistryRequest.requeststatuslabel.in_([StateName.callforrecords.name,StateName.recordsreview.name,StateName.feeestimate.name,StateName.consult.name,StateName.ministrysignoff.name,StateName.onhold.name,StateName.deduplication.name,StateName.harmsassessment.name,StateName.response.name,StateName.peerreview.name,StateName.tagging.name,StateName.readytoscan.name]))))).all()
+            _ministryrequestids = _session.query(distinct(FOIMinistryRequest.foiministryrequestid)).filter(and_(FOIMinistryRequest.isactive == True), or_(and_(FOIMinistryRequest.assignedgroup == group),and_(FOIMinistryRequest.assignedministrygroup == group,or_(FOIMinistryRequest.requeststatuslabel.in_([StateName.callforrecords.name,StateName.recordsreview.name,StateName.recordsreadyforreview.name,StateName.feeestimate.name,StateName.consult.name,StateName.ministrysignoff.name,StateName.onhold.name,StateName.deduplication.name,StateName.harmsassessment.name,StateName.response.name,StateName.peerreview.name,StateName.tagging.name,StateName.readytoscan.name]))))).all()
 
         _requests = []
         ministryrequest_schema = FOIMinistryRequestSchema()

request-management-api/request_api/resources/foidocument.py

@@ -23,6 +23,7 @@
 from request_api.utils.util import  cors_preflight, allowedorigins
 from request_api.exceptions import BusinessException, Error
 from request_api.services.documentservice import documentservice
+from request_api.services.eventservice import eventservice
 from request_api.schemas.foidocument import  CreateDocumentSchema, RenameDocumentSchema, ReplaceDocumentSchema, ReclassifyDocumentSchema
 import json
 from marshmallow import Schema, fields, validate, ValidationError
@@ -73,6 +74,8 @@ def post(requestid, requesttype):
             requestjson = request.get_json() 
             documentschema = CreateDocumentSchema().load(requestjson)
             result = documentservice().createrequestdocument(requestid, documentschema, AuthHelper.getuserid(), requesttype)
+            if result.success == True:
+                eventservice().attachmenteventservice(requestid, documentschema['documents'], AuthHelper.getuserid(), requesttype)
             return {'status': result.success, 'message':result.message} , 200 
         except ValidationError as err:
              return {'status': False, 'message': str(err)}, 400

request-management-api/request_api/services/documentservice.py

@@ -9,6 +9,7 @@
 from request_api.schemas.foidocument import CreateDocumentSchema
 from request_api.services.external.storageservice import storageservice
 from request_api.models.FOIApplicantCorrespondenceAttachments import FOIApplicantCorrespondenceAttachment
+from request_api.services.eventservice import eventservice
 from request_api.utils.enums import RequestType
 import logging
 

request-management-api/request_api/services/events/attachment.py

@@ -0,0 +1,60 @@
+
+from request_api.services.commons.duecalculator import duecalculator
+from request_api.services.notificationservice import notificationservice
+from request_api.services.commentservice import commentservice
+from request_api.models.FOIMinistryRequests import FOIMinistryRequest
+from request_api.models.FOIRequestComments import FOIRequestComment
+from request_api.models.FOIRawRequests import FOIRawRequest
+from request_api.models.NotificationTypes import NotificationType
+from request_api.exceptions import BusinessException
+from request_api.models.default_method_result import DefaultMethodResult
+from flask import current_app
+
+class attachmentevent():
+    """ FOI Attachment Event management service
+
+    """
+    def createattachmentevent(self, requestid, userid, documents, requesttype):
+        try:
+            for document in documents:
+                if 'rrt' in document['category']:
+                    #Create notification event for RRT document
+                    ministryversion = self.__getversionforrequest(requestid, requesttype)
+                    message = self.notificationmessage('RRT', requestid)
+                    notificationtype = NotificationType().getnotificationtypeid(self.__notificationtype())
+                    ret = self.__createnotification(message, requestid, notificationtype, userid, requesttype)
+                    comment = self.__createcomment(requestid, message, ministryversion, userid, requesttype)
+                    return DefaultMethodResult(True, 'Attachment notification succedded', requestid) # ad the request id to the message             
+            return DefaultMethodResult(True, 'No RTT attachment found' , requestid)             
+        except BusinessException as exception:            
+            current_app.logger.error("%s,%s" % ('Attachment upload notification error', exception.message))
+            return DefaultMethodResult(False,'Attachemnt notifications failed')     
+
+    def __createnotification(self, message, requestid, notificationtype, userid, requesttype):
+        if message is not None: 
+            return notificationservice().createnotification({"message" : message}, requestid, requesttype , notificationtype, userid)
+
+    def __createcomment(self, requestid, message, ministryversion, userid, requesttype):
+        if message is not None:
+            if requesttype == "ministryrequest":
+                _comment = {"ministryrequestid": requestid, "version": ministryversion, "comment": message}        
+                return commentservice().createcomments(_comment, userid, 2)
+            else:
+                _comment = {"requestid": requestid, "version": ministryversion, "comment": message}   
+                return commentservice().createrawrequestcomment(_comment, userid, 2)
+
+    def notificationmessage(self, type, ministryrequestid):
+        return f"{type} Attachment Uploaded on FOI Request {ministryrequestid}"
+
+    def __notificationtype(self):
+        return "Attachment Upload Event"
+
+    def __getversionforrequest(self, requestid, requesttype):
+        """ Returns the active version of the request id based on type.
+        """
+        if requesttype == "ministryrequest":
+            document = FOIMinistryRequest.getversionforrequest(requestid)
+        else:
+            document = FOIRawRequest.getversionforrequest(requestid)
+        if document:
+            return document[0]

request-management-api/request_api/services/eventservice.py

@@ -13,6 +13,7 @@
 from request_api.services.events.oipcduedate import oipcduedateevent
 from request_api.services.events.extension import extensionevent
 from request_api.services.events.cfrfeeform import cfrfeeformevent
+from request_api.services.events.attachment import attachmentevent
 from request_api.services.events.payment import paymentevent
 from request_api.services.events.email import emailevent
 from request_api.services.events.section5pending import section5pendingevent
@@ -58,7 +59,7 @@ def posteventforaxisextension(self, ministryrequestid, extensionids, userid, use
                     current_app.logger.error("FOI Notification failed for event for extension= %s" % (extensionid))
         except BusinessException as exception:            
             self.__logbusinessexception(exception)
-            
+
     def postreminderevent(self):
         try:
             cfreventresponse = cfrdateevent().createdueevent() 
@@ -140,5 +141,14 @@ def __posteventforsanctioncfrfeeform(self, ministryrequestid, userid, username):
             cfrfeeeventresponse = cfrfeeformevent().createstatetransitionevent(ministryrequestid, userid, username)
             if cfrfeeeventresponse.success == False: 
                 current_app.logger.error("FOI Notification failed for event for CFRFEEFORM= %s" % (ministryrequestid))
+        except BusinessException as exception:            
+            self.__logbusinessexception(exception)
+
+    def attachmenteventservice(self, ministryrequestid, document, userid, requesttype):
+        try:
+            attachmenteventresponse = attachmentevent().createattachmentevent(ministryrequestid, userid, document, requesttype)
+            if attachmenteventresponse.success == False:
+                current_app.logger.error("FOI Notification failed for event for attachment= %s" % (document['category']))
+            return attachmenteventresponse    
         except BusinessException as exception:            
             self.__logbusinessexception(exception)

request-management-api/request_api/services/notifications/notificationuser.py

@@ -26,7 +26,9 @@ def getnotificationusers(self, notificationtype, requesttype, userid, foirequest
         elif 'Group Members' in notificationtype:
             _users = self.__getgroupmembers(foirequest["assignedministrygroup"])
         elif 'Watcher' in notificationtype:
-            _users = self.__getwatchers(notificationtype, foirequest, requesttype, requestjson)        
+            _users = self.__getwatchers(notificationtype, foirequest, requesttype, requestjson)
+        elif 'Attachment Upload Event' in notificationtype:
+            _users = self.__getgroupmembers('scanningteam') + self.__getassignees(foirequest, requesttype, notificationtype) + self.__getwatchers(notificationtype, foirequest, requesttype, requestjson)
         else:
             _users = self.__getassignees(foirequest, requesttype, notificationtype) + self.__getwatchers(notificationtype, foirequest, requesttype)
         for user in _users:
@@ -129,5 +131,4 @@ def __getgroupmembers(self,groupid):
             for user in usergroupfromkeycloak[0].get("members"):
                 notificationusers.append({"userid":user["username"], "usertype":notificationusertypelabel})
             return notificationusers 
-        return []
-
+        return []