Merge pull request #159 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '266a8408':
  template serializer
  action
  clean resubmit
  clean code re route

app/applicationlayer/cms/template/serializers.py

@@ -10,6 +10,38 @@ from app.applicationlayer.cms.utils_cr import (get_account_details,
 class ChangeRequestTemplateApproversSerializer(
     serializers.ModelSerializer
 ):
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        try:
+            user = instance.user
+            
+            user_details = get_account_details(user.code)
+            name = user_details.values_list('name', flat=True)[0]
+            email = user_details.values_list('email', flat=True)[0]
+            contact_no = user_details.values_list('contact_no', flat=True)[0]
+            dept_code = user_details.values_list('department', flat=True)[0]
+            department_details = get_dept_details(dept_code)
+            department = department_details.values_list('name', flat=True)[0]
+            comp_code = department_details.values_list('company', flat=True)[0]
+            company_details = get_companies_details(comp_code)
+            company = company_details.values_list('name', flat=True)[0]
+            
+            ret['company'] = company
+            ret['department'] = department
+            ret['name'] = name
+            ret['email'] = email
+            ret['contact_no'] = contact_no
+            
+            return ret
+        
+        except Exception as e:
+            ret['company'] = "none"
+            ret['department'] = "none"
+            ret['name'] = "none"
+            ret['email'] = "none"
+            ret['contact_no'] = "none"
+            return ret
+
     class Meta:
         model = models.ChangeRequestTemplateApprovers
         fields = '__all__'
@@ -19,6 +51,38 @@ class ChangeRequestTemplateApproversSerializer(
 class ChangeRequestTemplateStakeHoldersSerializer(
     serializers.ModelSerializer
 ):
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        try:
+            user = instance.user
+            
+            user_details = get_account_details(user.code)
+            name = user_details.values_list('name', flat=True)[0]
+            email = user_details.values_list('email', flat=True)[0]
+            contact_no = user_details.values_list('contact_no', flat=True)[0]
+            dept_code = user_details.values_list('department', flat=True)[0]
+            department_details = get_dept_details(dept_code)
+            department = department_details.values_list('name', flat=True)[0]
+            comp_code = department_details.values_list('company', flat=True)[0]
+            company_details = get_companies_details(comp_code)
+            company = company_details.values_list('name', flat=True)[0]
+            
+            ret['company'] = company
+            ret['department'] = department
+            ret['name'] = name
+            ret['email'] = email
+            ret['contact_no'] = contact_no
+            
+            return ret
+        
+        except Exception as e:
+            ret['company'] = "none"
+            ret['department'] = "none"
+            ret['name'] = "none"
+            ret['email'] = "none"
+            ret['contact_no'] = "none"
+            return ret
+
     class Meta:
         model = models.ChangeRequestTemplateStakeHolders
         fields = '__all__'

app/applicationlayer/cms/template/views.py

@@ -328,11 +328,6 @@ class ChangeRequestTemplatePost(APIView):
                 'requested_to_user': template_header['requested_to_user']
             }
 
-            tmp_approvers = template_header['tmp_approvers']
-            tmp_stakes = template_header['tmp_stakes']
-            tmp_attachments = template_header['tmp_attachments']
-            tmp_details = template_header['tmp_details']
-
             sp1 = transaction.savepoint()  # nothing will save to db
 
             serializer = serializers.ChangeRequestTemplatesSerializer(
@@ -344,6 +339,7 @@ class ChangeRequestTemplatePost(APIView):
             tmp_id = serializer.data['template_no']
 
             # create template approvers
+            tmp_approvers = template_header['tmp_approvers']
 
             for tmp_approver in tmp_approvers:
                 tmp_approver['template_no'] = tmp_id
@@ -356,40 +352,46 @@ class ChangeRequestTemplatePost(APIView):
                 serializerApprover.save()
 
             # create template stakes
+            if template_header['tmp_stakes']:
+                tmp_stakes = template_header['tmp_stakes']
 
-            for tmp_stake in tmp_stakes:
-                tmp_stake['template_no'] = tmp_id
-                data_list_stake.append(tmp_stake)
+                for tmp_stake in tmp_stakes:
+                    tmp_stake['template_no'] = tmp_id
+                    data_list_stake.append(tmp_stake)
 
-            serializerStake = serializers.ChangeRequestTemplateStakeHoldersSerializer(
-                data=data_list_stake, many=True)
+                serializerStake = serializers.ChangeRequestTemplateStakeHoldersSerializer(
+                    data=data_list_stake, many=True)
 
-            if serializerStake.is_valid(raise_exception=True):
-                serializerStake.save()
+                if serializerStake.is_valid(raise_exception=True):
+                    serializerStake.save()
             
             # create template attachments
+            if template_header['tmp_attachments']:
+                tmp_attachments = template_header['tmp_attachments']
 
-            for tmp_attachment in tmp_attachments:
-                tmp_attachment['template_no'] = tmp_id
-                data_list_attach.append(tmp_attachment)
-
-            serializerAttach = serializers.ChangeRequestTemplateAttachmentsSerializer(
-                data=data_list_attach, many=True)
+                for tmp_attachment in tmp_attachments:
+                    tmp_attachment['template_no'] = tmp_id
+                    data_list_attach.append(tmp_attachment)
 
-            if serializerAttach.is_valid(raise_exception=True):
-                serializerAttach.save()
+                serializerAttach = serializers.ChangeRequestTemplateAttachmentsSerializer(
+                    data=data_list_attach, many=True)
+                
+                if serializerAttach.is_valid(raise_exception=True):
+                    serializerAttach.save()
 
             # create template details
-            
-            for tmp_detail in tmp_details:
-                tmp_detail['template_no'] = tmp_id
-                data_list_detail.append(tmp_detail)
-
-            serializerDetail = serializers.ChangeRequestTemplateDetailsSerializer(
-                data=data_list_detail, many=True)
-            
-            if serializerDetail.is_valid(raise_exception=True):
-                serializerDetail.save()
+            if template_header['tmp_details']:
+                tmp_details = template_header['tmp_details']
+
+                for tmp_detail in tmp_details:
+                    tmp_detail['template_no'] = tmp_id
+                    data_list_detail.append(tmp_detail)
+
+                serializerDetail = serializers.ChangeRequestTemplateDetailsSerializer(
+                    data=data_list_detail, many=True)
+                
+                if serializerDetail.is_valid(raise_exception=True):
+                    serializerDetail.save()
 
             message = {
                 'code': 201,

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]
@@ -306,34 +308,55 @@ 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]
-    
-    # call sender email
 
-    name = receiver_name
-    cr_number = cr_number
-    cr_name = template_name
-    company_requestedto = company_name
-    department_requestedto = dept_name
-    priority_level = requested_to_priority
-    status = cr_status
-    url = cr_link
+    # get details of next approver/s
+    next_approver = models.ChangeRequestFormApprovers.objects.filter(
+                                                level=str(next_level),
+                                                form_code=form_code
+                                                )
     
-    recipient = receiver_email
-    delegation_type = delegation
-    admin = sender_email
-
-    args = [name, cr_number, cr_name,
-            company_requestedto, department_requestedto, priority_level,
-            status, url, recipient, delegation_type, admin]
-
-    main_threading(args, sender.routing_table_actions_required)
-
-    message = f"{sender_name} {msg} ({template_name})"
-
-    # create notification
-
-    notification_create(form_code, message, receiver_code,
-                        sender_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
+        cr_number = cr_number
+        cr_name = template_name
+        company_requestedto = company_name
+        department_requestedto = dept_name
+        priority_level = requested_to_priority
+        status = cr_status
+        url = cr_link
+        
+        recipient = receiver_email
+        delegation_type = n_approver.delegation.lower()
+        admin = sender_email
+
+        args = [name, cr_number, cr_name,
+                company_requestedto, department_requestedto, priority_level,
+                status, url, recipient, delegation_type, admin]
+
+        main_threading(args, sender.routing_table_actions_required)
+
+        message = f"{sender_name} {msg} ({template_name})"
+
+        # create notification
+
+        notification_create(form_code, message, receiver_code,
+                            sender_code)
 
 
 def cancel_overdue(request):
@@ -447,4 +470,4 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
             tbl.objects.filter(id=test['id']).delete()
         return True
     except IntegrityError as exc:
-        raise APIException(detail=exc)
+        raise APIException(detail=exc)
\ No newline at end of file

app/applicationlayer/utils.py

@@ -139,39 +139,41 @@ def send_broadcast_message(room_name, sender, message):
 
 
 def notification_create(form_code, message, account_no, sender_account_no):
-    # try:
-    v = Notification.objects.create(
-            form_code=form_code,
-            notif_type='TASK',
-            message=message,
-            is_read=False,
-            app='APP-20190909-0000002',
-            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'
-    # )
-
-    # message = {
-    #     'code': 200,
-    #     'status': 'success',
-    #     'message': 'Notification successfully created!',
-    # }
-    # return Response(message, status=status.HTTP_200_OK)
-    return True
+    try:
+    
+        Notification.objects.create(
+                form_code=form_code,
+                notif_type='TASK',
+                message=message,
+                is_read=False,
+                app='APP-20190909-0000002',
+                account_no=account_no,
+                sender_account_no=sender_account_no
+            )
+        
+        ROOM = account_no
+        SENDER = sender_account_no
+        
+        send_broadcast_message(
+            ROOM,
+            SENDER,
+            'NEW NOTIFICATIONS'
+        )
 
-    # 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)
+        # message = {
+        #     'code': 200,
+        #     'status': 'success',
+        #     'message': 'Notification successfully created!',
+        # }
+        # return Response(message, status=status.HTTP_200_OK)
+        return True
+
\ No newline at end of file
+    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/businesslayer/changerequest/change_request.py

@@ -290,8 +290,8 @@ def form_add_edit_delete(form_request_body,
 
             serializer = serializer_data(frm_instance,
                                          data=i,
-                                         partial=True)
-            
+                                         partial=partial)
+
             serializer.is_valid(raise_exception=True)
             old_instance = model_to_dict(frm_instance)
             

app/entities/enums.py

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