Merge pull request #759 in RMS/api-main-service from core-dev-gladys to RMSv2

* commit '0d73a74b':
  {dev bugfix} custom pagination set to 1000 max
  {dev bugfix} validation save submit

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

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

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

@@ -348,8 +348,15 @@ class ChangeRequestTemplatePost(APIView):
     @transaction.atomic()
     def post(self, request):
         template_header = request.data
-
         try:
+            # Check if prefix already exists
+            prefix = models.ChangeRequestTemplateHeader.objects.filter(
+                requested_to_template_id=template_header['requested_to_template_id'])
+
+            if prefix:
+                return error_message('400', 'CR Number prefix already exists.',
+                    'failed', status.HTTP_400_BAD_REQUEST)
+
             data_list_approver = []
             data_list_stake = []
             data_list_attach = []

app/applicationlayer/utils.py

@@ -48,7 +48,7 @@ class DynamicSerializer(serializers.ModelSerializer):
 
 class CustomPagination(PageNumberPagination):
     page_size = 10
-    max_page_size = 50
+    max_page_size = 1000
     page_query_param = 'page'
     page_size_query_param = 'page_size'
 

app/helper/decorators.py

@@ -308,14 +308,6 @@ def TemplateValidation(function):
                 return error_message('400', required[key] + ' is required',
                     'failed', status.HTTP_400_BAD_REQUEST)
         
-        # Check if prefix already exists
-        # prefix = ChangeRequestTemplateHeader.objects.filter(
-        #     requested_to_template_id=template_header['requested_to_template_id'])
-
-        # if prefix:
-        #     return error_message('400', 'CR Number prefix already exists.',
-        #         'failed', status.HTTP_400_BAD_REQUEST)
-
         # Restrict form using Superuser Department
         if (template_header['created_by_department'] == 'DEPARTMENT-20190923-0000001' or
                 template_header['requested_to_department'] == 'DEPARTMENT-20190923-0000001'):
@@ -362,7 +354,7 @@ def FormValidation(function):
     @wraps(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',