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/header/views.py

@@ -752,6 +752,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
 
         return Response(message, status=status.HTTP_200_OK)
 
+    @FormValidation
     @transaction.atomic
     @action(
         methods=['PATCH'], detail=True,
@@ -865,6 +866,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
 
         return Response(message, status=status.HTTP_200_OK)
     
+    @FormValidation
     @transaction.atomic
     @action(
         methods=['PATCH'], detail=True,

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

@@ -188,6 +188,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
             return Response(e,
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
+    @TemplateValidation
     @transaction.atomic
     def partial_update(self, request, *args, **kwargs):
         

app/helper/decorators.py

@@ -307,7 +307,7 @@ def TemplateValidation(function):
                     'requested_to_department': 'Department'}
         
         for key in required.keys():
-            if not key in template_header or template_header[key] == '':
+            if not key in template_header or template_header[key].strip() == '':
                 return error_message('400', required[key] + ' is required',
                     'failed', status.HTTP_400_BAD_REQUEST)
         
@@ -366,72 +366,63 @@ def FormValidation(function):
     def wrapper(self, request, *args, **kwargs):
         form_header = request.data
 
+        required = {'requested_to_template_name': 'CR Name',
+                    'requested_to_target_date': 'Date Required',
+                    'requested_to_company': 'Company',
+                    'requested_to_department': 'Department',
+                    'requested_to_user': 'Point of Contact',
+                    'requested_to_priority': 'Priority Level'}
+        
+        for key in required.keys():
+            if not key in form_header or form_header[key].strip() == '':
+                return error_message('400', required[key] + ' is required',
+                    'failed', status.HTTP_400_BAD_REQUEST)
+        
         # restrict superuser department
         if (form_header['requested_by_department'] == 'DEPARTMENT-20190923-0000001' or
                 form_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)
+            return error_message('400', 'Superuser department cannot be selected',
+                'failed', status.HTTP_400_BAD_REQUEST)
         
         frm_approvers = form_header['frm_approvers']
         
         # Check if Vendor and Requestor are existing on routing table
         if len(frm_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)
+
+            return error_message('400', 'Please make sure to add an Approver, Vendor and Requestor into routing table',
+                'failed', status.HTTP_400_BAD_REQUEST)
         else:
             result = validation_existing_vendor_requestor(frm_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)
+
+                return error_message('400', 'Please add Vendor/Implementor and Requestor into routing table',
+                    'failed', status.HTTP_400_BAD_REQUEST)
 
         # Do not allow adding an approver for the same level
         validation_result = validation_approver_same_level(frm_approvers)
         if validation_result is not None:
-            message = {
-                'code': 400,
-                'status': 'failed',
-                'message': validation_result + ' is already exist for the same level of approval.',
-            }
-            return Response(message,
-                            status=status.HTTP_400_BAD_REQUEST)
+            return error_message('400', validation_result + ' is already exist for the same level of approval.',
+                'failed', status.HTTP_400_BAD_REQUEST)
             
         # Restrict a requestor to submit a CR without atleast 1 approver
         counter = validation_existing_approver(frm_approvers)
         if form_header['status'].lower() == 'pending' and counter == 0:
-            message = {
-                'code': 400,
-                'status': 'failed',
-                'message': 'Please select at least 1 approver before submitting this request.',
-            }
-            return Response(message, status=status.HTTP_400_BAD_REQUEST)
+            return error_message('400', 'Please select at least 1 approver before submitting this request.',
+                'failed', status.HTTP_400_BAD_REQUEST)
         
         # Do not allow saving user as Vendor and other delegation
         validate = validation_poc_vendor_only(
             form_header['requested_to_user'], frm_approvers)
         if validate is True:
-            message = {
-                'code': 400,
-                'status': 'failed',
-                'message': 'Point of contact can only be assign to Vendor/Implementor',
-            }
-            return Response(message,
-                            status=status.HTTP_400_BAD_REQUEST)
+            return error_message('400', 'Point of contact can only be assign to Vendor/Implementor',
+                    'failed', status.HTTP_400_BAD_REQUEST)
+        
+        # Do not allow to save Vendor same level to other delegation
+        validate = validation_vendor_unique_level(frm_approvers)
+        if validate is True:
+            return error_message('400', 'Vendor/Implementor cannot have same level with other delegation/s',
+                    'failed', status.HTTP_400_BAD_REQUEST)
         
         return function(self, request, *args, **kwargs)
     return wrapper