action

app/applicationlayer/cms/form/views.py

@@ -343,25 +343,8 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         ).aggregate(Min('level'))
         
         min_level = min_level.get('level__min')
-        # get details of next approver/s
-        next_approver = models.ChangeRequestFormApprovers.objects.filter(
-                                                    level=str(min_level),
-                                                    form_code=form_code
-                                                    )
-        
-        # LOOP on next approver for sending email
-        for n_approver in next_approver:
-
-            # NOTIF MSG FOR NEXT APPROVER
-            notification_msg = APPROVER_MESSAGE.split(';')[0]
 
-            if n_approver.delegation.lower() == 'vendor/implementor':
-                notification_msg = VENDOR_ACKNOWLEDGE_MESSAGE.split(';')[0]
-                
-            next_approver_email(
-                n_approver.user.code, form_code, n_approver.delegation.lower(),
-                notification_msg
-            )
+        next_approver_email(form_code, min_level)
 
         # update next approver details
         models.ChangeRequestFormApprovers.objects.filter(
@@ -392,6 +375,8 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
 
         form_code = kwargs['form_code']
 
+        
+
         status_update = {"status": 'Draft'}
         
         serializer = self.get_serializer(instance,
@@ -476,41 +461,38 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         # generate batchno history
         batchno = get_max_batchno("batch")
 
-        # get old data
-        old_instance = models.ChangeRequestFormApprovers.objects.filter(
-            pk=id).values()
+        action_data = {
+            'id': int(request.data['id']),
+            'action': action,
+            'remarks': remarks,
+            'action_date': datetime.now()
+        }
 
-        old_instance = list(old_instance)
+        approver_instance = models.ChangeRequestFormApprovers.objects.get(
+            pk=id
+        )
 
-        # update current row in routing table
-        models.ChangeRequestFormApprovers.objects.filter(
-                                    pk=id).update(action=action,
-                                                  remarks=remarks,
-                                                  action_date=datetime.now())
+        serializer = serializers.ChangeRequestFormApproversSerializer(
+                                        approver_instance,
+                                        data=action_data,
+                                        partial=True)
 
-        # get new data
-        new_instance = models.ChangeRequestFormApprovers.objects.filter(
-            pk=id).values()
+        serializer.is_valid(raise_exception=True)
+        old_instance = model_to_dict(approver_instance)
         
-        new_instance = list(new_instance)
+        self.perform_update(serializer)
+        new_instance = serializer.data
         
-        crenum = action.upper()
-        # save history in form approver
         crhistory_save(
             batchno,
-            "ACTION",
-            crenum,
+            enums.CREnum.ACTION.value,
+            enums.CREnum.UPDATE.value,
             enums.CREntitiesEnum.CR_FRM_APPROVER.value,
             form_code,
             old_instance,
             new_instance
         )
 
-        # get details of next approver/s
-        next_approver = models.ChangeRequestFormApprovers.objects.filter(
-                                                    level=str(next_level),
-                                                    form_code=form_code
-                                                    )
         if action.lower() == 'approved':
             
             # NOTIF MSG FOR REQUESTOR
@@ -526,16 +508,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                 remarks, level
             )
 
-            # LOOP on next approver for sending email
-            for n_approver in next_approver:
-                
-                if n_approver.delegation.lower() == 'vendor/implementor':
-                    notification_msg = VENDOR_ACKNOWLEDGE_MESSAGE.split(';')[0]
-                    
-                next_approver_email(
-                    n_approver.user.code, form_code, delegation,
-                    notification_msg
-                )
+            next_approver_email(form_code, next_level)
             
             # update next approver details
             models.ChangeRequestFormApprovers.objects.filter(
@@ -613,11 +586,15 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
             models.ChangeRequestFormHeader.objects.filter(
                 form_code=form_code).update(status='Cancelled')
 
-        return Response(
-            "Action performed",
-                status=status.HTTP_200_OK
+
+        message = status_message_response(
+            200, 'success',
+            'Action performed',
+            serializer.data
         )
 
+        return Response(message, status=status.HTTP_200_OK)
+
     @transaction.atomic
     @action(
         methods=['PATCH'], detail=True,

app/applicationlayer/cms/utils_cr.py

@@ -18,6 +18,14 @@ from django.db.models import Max
 
 
 CR_FRONT_LINK = settings.CR_FRONT_LINK
+APPROVER_MESSAGE = settings.APPROVER_MESSAGE
+REQUESTOR_MESSAGE = settings.REQUESTOR_MESSAGE
+REQUESTOR_REJECT_MESSAGE = settings.REQUESTOR_REJECT_MESSAGE
+VENDOR_ACKNOWLEDGE_MESSAGE = settings.VENDOR_ACKNOWLEDGE_MESSAGE
+REQUESTOR_ACKNOWLEDGE_MESSAGE = settings.REQUESTOR_ACKNOWLEDGE_MESSAGE
+REQUESTOR_COMPLETION_MESSAGE = settings.REQUESTOR_COMPLETION_MESSAGE
+VENDOR_ACCEPTANCE_MESSAGE = settings.VENDOR_ACCEPTANCE_MESSAGE
+VENDOR_REJECT_MESSAGE = settings.VENDOR_REJECT_MESSAGE
 
 
 def entity_log_bulk(queryset, entity, tbl):
@@ -277,7 +285,7 @@ def send_mail_requestor(current_user,
                         current_user)
 
 
-def next_approver_email(receiver, form_code, delegation, msg):
+def next_approver_email(form_code, next_level):
     cr_link = f'{CR_FRONT_LINK}/{form_code}'
     template_instance = get_template_instance(form_code)
     
@@ -289,12 +297,6 @@ def next_approver_email(receiver, form_code, delegation, msg):
     requested_to_priority = template_instance.requested_to_priority
     cr_status = template_instance.status
 
-    # next approver details  --------------------------------------------------
-    receiver_instance = get_account_details(receiver)
-    receiver_name = receiver_instance.values_list('name', flat=True)[0]
-    receiver_email = receiver_instance.values_list('email', flat=True)[0]
-    receiver_code = receiver_instance.values_list('code', flat=True)[0]
-
     # requestor details  --------------------------------------------------
     sender_instance = get_account_details(requested_by_user)
     sender_email = sender_instance.values_list('email', flat=True)[0]
@@ -307,6 +309,27 @@ def next_approver_email(receiver, form_code, delegation, msg):
     company = get_companies_details(requested_to_company)
     company_name = company.values_list('name', flat=True)[0]
 
+    # get details of next approver/s
+    next_approver = models.ChangeRequestFormApprovers.objects.filter(
+                                                level=str(next_level),
+                                                form_code=form_code
+                                                )
+    
+    # LOOP on next approver for sending email
+    for n_approver in next_approver:
+        
+        # NOTIF MSG FOR NEXT APPROVER
+        msg = APPROVER_MESSAGE.split(';')[0]
+        
+        if n_approver.delegation.lower() == 'vendor/implementor':
+            msg = VENDOR_ACKNOWLEDGE_MESSAGE.split(';')[0]
+
+        # next approver details  --------------------------------------------------
+        receiver_instance = get_account_details(n_approver.user.code)
+        receiver_name = receiver_instance.values_list('name', flat=True)[0]
+        receiver_email = receiver_instance.values_list('email', flat=True)[0]
+        receiver_code = receiver_instance.values_list('code', flat=True)[0]
+
         # call sender email
 
         name = receiver_name
@@ -319,7 +342,7 @@ def next_approver_email(receiver, form_code, delegation, msg):
         url = cr_link
         
         recipient = receiver_email
-    delegation_type = delegation
+        delegation_type = n_approver.delegation.lower()
         admin = sender_email
 
         args = [name, cr_number, cr_name,
@@ -448,5 +471,3 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
         return True
     except IntegrityError as exc:
         raise APIException(detail=exc)
-
-

app/applicationlayer/utils.py

@@ -139,8 +139,10 @@ def send_broadcast_message(room_name, sender, message):
 
 
 def notification_create(form_code, message, account_no, sender_account_no):
-    # try:
-    v = Notification.objects.create(
+    
+    try:
+    
+        Notification.objects.create(
                 form_code=form_code,
                 notif_type='TASK',
                 message=message,
@@ -149,15 +151,15 @@ def notification_create(form_code, message, account_no, sender_account_no):
                 account_no=account_no,
                 sender_account_no=sender_account_no
             )
-    print(v)
-    # ROOM = account_no
-    # SENDER = sender_account_no
         
-    # send_broadcast_message(
-    #     ROOM,
-    #     SENDER,
-    #     'NEW NOTIFICATIONS'
-    # )
+        ROOM = account_no
+        SENDER = sender_account_no
+        
+        send_broadcast_message(
+            ROOM,
+            SENDER,
+            'NEW NOTIFICATIONS'
+        )
 
         # message = {
         #     'code': 200,
@@ -167,11 +169,11 @@ def notification_create(form_code, message, account_no, sender_account_no):
         # return Response(message, status=status.HTTP_200_OK)
         return True
 
-    # except Exception as e:
-    #     message = {
-    #         'code': 500,
-    #         'status': 'failed',
-    #         'message': 'Request was not able to process' + str(e.__class__)
-    #     }
-    #     return Response(message,
-    #                     status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+    except Exception as e:
+        message = {
+            'code': 500,
+            'status': 'failed',
+            'message': 'Request was not able to process' + str(e.__class__)
+        }
+        return Response(message,
+                        status=status.HTTP_500_INTERNAL_SERVER_ERROR)
\ No newline at end of file

app/entities/enums.py

@@ -103,6 +103,7 @@ class CREnum(Enum):
     ACCEPTED = "ACCEPTED"
     ACKNOWLEDGED = "ACKNOWLEDGED"
     REJECTED = "REJECTED"
+    ACTION = "ACTION"
 
 
 class CREntitiesEnum(Enum):