Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service...

Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into core-dev-red-develop

app/applicationlayer/cms/form/approver/serializers.py

@@ -38,17 +38,17 @@ class ChangeRequestFormApproversSerializer(
             if instance.form_code.status == 'Draft':
                 if instance.tmp_approver:
                     
-                    if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.user:
                         ret['editable_user'] = False
                     else:
                         ret['editable_user'] = True
 
-                    if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.company:
                         ret['editable_comp'] = False
                     else:
                         ret['editable_comp'] = True
 
-                    if instance.tmp_approver.department or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.department:
                         ret['editable_dept'] = False
                     else:
                         ret['editable_dept'] = True
@@ -60,11 +60,13 @@ class ChangeRequestFormApproversSerializer(
 
                     # print(instance.tmp_approver.delegation.name)
                     # comment
-                    # if instance.tmp_approver.delegation.name.lower() == 'requestor':
-                    #     ret['editable_user'] = False
-                    #     ret['editable_comp'] = False
-                    #     ret['editable_dept'] = False
-                    #     ret['editable_deleg'] = False
+
+                    if instance.tmp_approver.delegation:
+                        if instance.tmp_approver.delegation.name.lower() == 'requestor':
+                            ret['editable_user'] = False
+                            ret['editable_comp'] = False
+                            ret['editable_dept'] = False
+                            ret['editable_deleg'] = False
 
                 else:
                     ret['editable_user'] = True
@@ -84,13 +86,13 @@ class ChangeRequestFormApproversSerializer(
             if instance.form_code.status == 'Draft':
                 if instance.tmp_approver:
                     
-                    if instance.tmp_approver.user or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.user:
                         ret['editable_user'] = False
                     else:
                         ret['user'] = None
                         ret['editable_user'] = True
 
-                    if instance.tmp_approver.company or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.company:
                         ret['company'] = {
                            "id": instance.tmp_approver.company.id,
                            "code": instance.tmp_approver.company.code,
@@ -102,7 +104,7 @@ class ChangeRequestFormApproversSerializer(
                         ret['company'] = None
                         ret['editable_comp'] = True
 
-                    if instance.tmp_approver.department or instance.tmp_approver.delegation.name.lower() == 'requestor':
+                    if instance.tmp_approver.department:
                         ret['department'] = {
                             "id": instance.tmp_approver.department.id,
                             "code": instance.tmp_approver.department.code,
@@ -126,11 +128,12 @@ class ChangeRequestFormApproversSerializer(
                         ret['editable_deleg'] = True
 
                     # print(instance.tmp_approver.delegation.name)
-                    # if instance.tmp_approver.delegation.name.lower() == 'requestor':
-                    #     ret['editable_user'] = False
-                    #     ret['editable_comp'] = False
-                    #     ret['editable_dept'] = False
-                    #     ret['editable_deleg'] = False
+                    if instance.tmp_approver.delegation:
+                        if instance.tmp_approver.delegation.name.lower() == 'requestor':
+                            ret['editable_user'] = False
+                            ret['editable_comp'] = False
+                            ret['editable_dept'] = False
+                            ret['editable_deleg'] = False
 
                 else:
                     ret['editable_user'] = True

app/applicationlayer/cms/template/header/views.py

@@ -24,7 +24,8 @@ from app.applicationlayer.utils import log_save, CustomPagination
 from rest_framework.exceptions import ParseError
 from app.businesslayer.changerequest.change_request_template import (
     tmp_add_edit_delete,
-    validation_approver_same_level
+    validation_approver_same_level,
+    validation_existing_vendor_requestor
 )
 from app.applicationlayer.management.account.serializer import ChangeRequestList
 from app.applicationlayer.cms.template.approver.serializers import ChangeRequestTemplateApproversSerializer
@@ -345,18 +346,50 @@ class ChangeRequestTemplatePost(APIView):
         template_header = request.data
 
         try:
-            # tmp_approvers = template_header['tmp_approvers']
-
-            # # Do not allow adding an approver for the same level
-            # validation_result = validation_approver_same_level(tmp_approvers)
-            # if validation_result is not None:
-            #     message = {
-            #         'code': 400,
-            #         'status': 'failed',
-            #         'message': validation_result + ' is already existing for the same level of approval.',
-            #     }
-            #     return Response(message,
-            #                     status=status.HTTP_400_BAD_REQUEST)
+            # restrict superuser department
+            if (template_header['created_by_department'] == 'DEPARTMENT-20190923-0000001' or
+                    template_header['requested_to_department'] == 'DEPARTMENT-20190923-0000001'):
+                message = {
+                    'code': 400,
+                    'status': 'failed',
+                    'message': 'Superuser department cannot be selected',
+                }
+                return Response(message,
+                                status=status.HTTP_400_BAD_REQUEST)
+
+            tmp_approvers = template_header['tmp_approvers']
+
+            # Check if Vendor and Requestor are existing on routing table
+            if len(tmp_approvers) < 2:
+                message = {
+                    'code': 400,
+                    'status': 'failed',
+                    'message': 'Please make sure to add an Approver, Vendor and Requestor into routing table',
+                }
+                return Response(message,
+                                status=status.HTTP_400_BAD_REQUEST)
+            else:
+                result = validation_existing_vendor_requestor(tmp_approvers)
+
+                if result is False:
+                    message = {
+                        'code': 400,
+                        'status': 'failed',
+                        'message': 'Please add Vendor/Implementor and Requestor into routing table',
+                    }
+                    return Response(message,
+                                    status=status.HTTP_400_BAD_REQUEST)
+            
+            # Do not allow adding an approver for the same level
+            validation_result = validation_approver_same_level(tmp_approvers)
+            if validation_result is not None:
+                message = {
+                    'code': 400,
+                    'status': 'failed',
+                    'message': validation_result + ' is already existing for the same level of approval.',
+                }
+                return Response(message,
+                                status=status.HTTP_400_BAD_REQUEST)
             
             data_list_approver = []
             data_list_stake = []