Dev marshal shiva 2965 rrt

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

@@ -11,6 +11,7 @@
 from request_api.models.FOIApplicantCorrespondenceAttachments import FOIApplicantCorrespondenceAttachment
 from request_api.services.eventservice import eventservice
 from request_api.utils.enums import RequestType
+from request_api.services.events.attachment import attachmentevent
 import logging
 
 import json
@@ -92,14 +93,6 @@ def copyrequestdocuments(self, ministryrequestid, documents, userid):
 
     def createministryrequestdocument(self, ministryrequestid, documentschema, userid):
         version = self.__getversionforrequest(ministryrequestid, "ministryrequest")
-        for document in documentschema['documents']:
-            if 'rrt' in document['category']:
-                #Create notification event for RRT document
-                message = f'RRT Uploaded on FOI Request {ministryrequestid}'
-                eventservice().attachmentevent(ministryrequestid, document, userid, "add", message)
-        #if 'rrt' in documentschema['documents']['category']:
-            #Create notification event for RRT document
-        #    eventservice().posteventforextension(ministryrequestid, '', userid, '' , "add")
         return FOIMinistryRequestDocument.createdocuments(ministryrequestid, version, documentschema['documents'], userid)
 
     def createrawrequestdocument(self, requestid, documentschema, userid):
@@ -145,6 +138,10 @@ def uploadpersonaldocuments(self, requestid, attachments):
                 attachmentlist.append(attachmentresponse)
 
             documentschema = CreateDocumentSchema().load({'documents': attachmentlist})
+            for document in documentschema['documents']:
+                # Add attachment event here as we need to pass in the document
+                # to the event service to identify if the document is an RRT document.
+                attachmenteventresponse = attachmentevent().createattachmentevent(requestid, userid, document)
             return self.createrequestdocument(requestid, documentschema, None, "rawrequest")        
 
     def getattachments(self, requestid, requesttype, category):        

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

@@ -13,11 +13,17 @@ class attachmentevent():
     """ FOI Attachment Event management service
 
     """
-    def createattachmentevent(self, ministryrequestid, message, userid, event):
+    def createattachmentevent(self, ministryrequestid, userid, document):
         try:
-            notificationtype = NotificationType().getnotificationtypeid(self.__notificationtype())
-            self.__createnotification(message, ministryrequestid, notificationtype, userid)
-            return DefaultMethodResult(True, message, '')             
+            if 'rrt' in document['category']:
+                #Create notification event for RRT document
+                print(f"RRT Uploaded on FOI Request {ministryrequestid}")
+                #message = f'RRT Uploaded on FOI Request {ministryrequestid}'
+                message = self.notificationmessage('RRT', ministryrequestid)
+                notificationtype = NotificationType().getnotificationtypeid(self.__notificationtype())
+                self.__createnotification(message, ministryrequestid, notificationtype, userid)
+                self.__createcomment(ministryrequestid, message)
+                return DefaultMethodResult(True, message, '')             
         except BusinessException as exception:            
             current_app.logger.error("%s,%s" % ('Attachment upload notification error', exception.message))
             return DefaultMethodResult(False,'Attachemnt notifications failed')     
@@ -26,8 +32,22 @@ def __createnotification(self, message, requestid, notificationtype, userid):
         if message is not None: 
             return notificationservice().createnotification({"message" : message}, requestid, "ministryrequest", notificationtype, userid)
 
-    def notificationmessage(self, type):
-        return f"{type} Attachment Uploaded"
+    def __createcomment(self, ministryrequestid, message):
+        if message is not None: 
+            _comment = self.__preparecomment(ministryrequestid, message)
+            return commentservice().createcomments(_comment, self.__defaultuserid(), 2)
+
+    def __preparecomment(self, ministryrequestid, message):
+        _comment = dict()
+        _comment['comment'] = message
+        _comment['ministryrequestid'] = ministryrequestid
+        _comment['version'] = None
+        _comment['taggedusers'] = None
+        _comment['parentcommentid'] = None
+        return _comment
+
+    def notificationmessage(self, type, ministryrequestid):
+        return f"{type} Attachment Uploaded on FOI Request {ministryrequestid}"
 
     def __notificationtype(self):
         return "Attachment Upload Event"

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

@@ -61,14 +61,6 @@ def posteventforaxisextension(self, ministryrequestid, extensionids, userid, use
         except BusinessException as exception:            
             self.__logbusinessexception(exception)
 
-    def attachmentevent(self, ministryrequestid, document, userid, event, message):
-        try:
-            attachmenteventresponse = attachmentevent().createattachmentevent(ministryrequestid, message , userid, event)
-            if attachmenteventresponse.success == False:
-                current_app.logger.error("FOI Notification failed for event for attachment= %s" % (document['category']))
-        except BusinessException as exception:            
-            self.__logbusinessexception(exception)
-
     def postreminderevent(self):
         try:
             cfreventresponse = cfrdateevent().createdueevent() 

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

@@ -15,6 +15,9 @@ class notificationuser:
 
     def getnotificationusers(self, notificationtype, requesttype, userid, foirequest, requestjson=None):
         notificationusers = []
+        print("notificationtype", notificationtype)
+        print("requesttype", requesttype)
+        print("foirequest", foirequest)
         if 'User Assignment Removal' == notificationtype:
             _users = self.__getassignees(foirequest, requesttype, notificationtype, requestjson)
         elif 'Assignment' in notificationtype:
@@ -26,7 +29,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.__getscanningteam()          
         else:
             _users = self.__getassignees(foirequest, requesttype, notificationtype) + self.__getwatchers(notificationtype, foirequest, requesttype)
         for user in _users:
@@ -130,4 +135,14 @@ def __getgroupmembers(self,groupid):
                 notificationusers.append({"userid":user["username"], "usertype":notificationusertypelabel})
             return notificationusers 
         return []
-
+
+    def __getscanningteam(self):
+        notificationusers = []
+        print("Sending notification to scanning team")
+        notificationusertypelabel = notificationconfig().getnotificationusertypelabel("Group Members")
+        usergroupfromkeycloak= KeycloakAdminService().getmembersbygroupname("scanningteam") 
+        if usergroupfromkeycloak is not None and len(usergroupfromkeycloak) > 0:
+            for user in usergroupfromkeycloak[0].get("members"):
+                notificationusers.append({"userid":user["username"], "usertype":notificationusertypelabel})
+            return notificationusers 
+        return []