Merge pull request #281 in RMS/api-main-service from RMSv2 to staging

* commit '5dc26e97':
  comment
  fixing listing
  fixing listing
  fxing the list of template
  restore template
  archive temp
  archive template

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

@@ -94,7 +94,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         "requested_to_user__name", "requested_to_template_name",
         "requested_to_objective", "requested_to_priority", "description"
     )
-
+# comment
     def list(self, request, *args, **kwargs):
         
         self.serializer_class = ChangeRequestFormHeaderSerializerList
@@ -1110,29 +1110,17 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
     def history(self, request, *args, **kwargs):
 
         instance = self.get_object()
+        list_his = []
+
         history = models.ChangeRequestHistory.objects.filter(
             Q(form_code=instance) &
             Q(main_action='ACTION') &
             Q(entity='CR_FRM_APPROVER')
         ).values().order_by('-created')
-        list_his = []
+        
         for data in history:
-            # list_his.append()
-            x = data['toValue'].replace("'", '"').replace('None', '""')
-            convert = json.loads(x)
-            # print(convert)
-            # user_id = convert['user']
-            # user_instance = models.User.objects.get(
-            #     code=str(user_id)
-            # )
-
-            # name = user_instance.name
-            # department = user_instance.department.name
-            # company = user_instance.department.company.name
-            # date_sent = convert['action_date']
-            # delegation = convert['delegation']
-            # action = convert['action']
-            # remarks = convert['remarks']
+            data = data['toValue'].replace("'", '"').replace('None', '""')
+            convert = json.loads(data)
 
             history_dict = {
                 "name": convert['user']['name'],
@@ -1143,38 +1131,15 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 "action" : convert['action'],
                 "remarks" : convert['remarks']
             }
-            list_his.append(history_dict)
 
-        # self.serializer_class = 
-        test = ChangeRequestFormApproversSerializer(list_his)
-        # test.is_valid(raise_exception=False)
-        # page = self.paginate_queryset(test)
-        # serializer = self.get_serializer(page, many=True)
-        # id_number = self.request.user.code
-        # self.queryset = change_request.list_by_user(id_number)
-
-        # self.queryset = change_request.filter_base(
-        #     self.queryset,
-        #     request.query_params.get('company_requested_to'),
-        #     request.query_params.get('department_requested_to'),
-        #     request.query_params.get('date_modified_from'),
-        #     request.query_params.get('date_modified_to'),
-        #     request.query_params.get('date_required_from'),
-        #     request.query_params.get('date_required_to'),
-        #     request.query_params.get('form_type'),
-        # )
-
-        # queryset = self.filter_queryset(self.queryset)
-        
-        
-        
+            list_his.append(history_dict)
 
         return Response(
             {"results":list_his},
             status=status.HTTP_200_OK
         )
 
-    #restore archived CR
+    #restore archived CR # comment
     def partial_update(self, request, *args, **kwargs):
         try:
             kwargs['partial'] = True
@@ -1188,7 +1153,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 'Archived Change Request restored',
                 ''
             )
-            
+
             return Response(message, status=status.HTTP_200_OK)
 
         except Exception as e:

app/applicationlayer/cms/master/template_list/views.py

@@ -4,6 +4,7 @@ from app.entities.models import ChangeRequestTemplateHeader, AllowedCompany
 from app.applicationlayer.cms.master.template_list.serializers import ChangeRequestTemplatesSerializer
 from app.applicationlayer.utils import CustomPagination, status_message_response
 from rest_framework.exceptions import ParseError
+from django.db.models import Q
 
 
 class ChangeRequestTemplateHeaderMaster(viewsets.ModelViewSet):
@@ -21,11 +22,22 @@ class ChangeRequestTemplateHeaderMaster(viewsets.ModelViewSet):
         permit = AllowedCompany.objects.filter(
             group_pivots=department
         ).count()
+
         if permit <= 0:
             raise ParseError('This department is not allowed')
         else:
+
             queryset = ChangeRequestTemplateHeader.objects.filter(
-                created_by_department=department
+                requested_to_department=department
+            )
+
+            included = AllowedCompany.objects.filter(
+                Q(id_number=request.user.code) &
+                Q(create_change_request=True)
+            ).values('group_pivots')
+
+            queryset = queryset.filter(
+                requested_to_department__in=included
             ).order_by('requested_to_template_name')
 
         page = self.paginate_queryset(queryset)

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

@@ -75,9 +75,8 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
         queryset = self.filter_queryset(self.get_queryset())
         queryset = queryset.filter(created_by_user=request.user.code)
         
-
         self.serializer_class = ChangeRequestTemplatesSerializerList
-        
+
         page = self.paginate_queryset(queryset)
 
         if page is not None:
@@ -110,63 +109,73 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
 
             template_no = self.kwargs['template_no']
 
-            enum_approver = enums.LogEntitiesEnum.ChangeRequestTemplateApprovers.value
-            enum_stake = enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value
-            enum_attach = enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value
-            enum_detail = enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value
-            enum_header = enums.LogEntitiesEnum.ChangeRequestTemplateHeader.value
-
-            approver = models.ChangeRequestTemplateApprovers.objects.filter(
+            existing_transaction = models.ChangeRequestFormHeader.objects.filter(
                 template_no=template_no
             )
-
-            if approver.count() > 0:
-                entity_log_bulk(
-                    approver, enum_approver,
-                    models.ChangeRequestTemplateApprovers
-                )
             
-            stake = models.ChangeRequestTemplateStakeHolders.objects.filter(
-                template_no=template_no
-            )
+            if existing_transaction.count() > 0:
+                models.ChangeRequestTemplateHeader.objects.filter(
+                    template_no=template_no
+                ).update(is_active=False)
+            else:
+                enum_approver = enums.LogEntitiesEnum.ChangeRequestTemplateApprovers.value
+                enum_stake = enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value
+                enum_attach = enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value
+                enum_detail = enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value
+                enum_header = enums.LogEntitiesEnum.ChangeRequestTemplateHeader.value
+
+                approver = models.ChangeRequestTemplateApprovers.objects.filter(
+                    template_no=template_no
+                )
 
-            if stake.count() > 0:
-                entity_log_bulk(
-                    stake, enum_stake,
-                    models.ChangeRequestTemplateStakeHolders
+                if approver.count() > 0:
+                    entity_log_bulk(
+                        approver, enum_approver,
+                        models.ChangeRequestTemplateApprovers
+                    )
+                
+                stake = models.ChangeRequestTemplateStakeHolders.objects.filter(
+                    template_no=template_no
                 )
 
-            attachment = models.ChangeRequestTemplateAttachments.objects.filter(
-                template_no=template_no
-            )
+                if stake.count() > 0:
+                    entity_log_bulk(
+                        stake, enum_stake,
+                        models.ChangeRequestTemplateStakeHolders
+                    )
 
-            if attachment.count() > 0:
-                entity_log_bulk(
-                    attachment, enum_attach,
-                    models.ChangeRequestTemplateAttachments
+                attachment = models.ChangeRequestTemplateAttachments.objects.filter(
+                    template_no=template_no
                 )
 
-            details = models.ChangeRequestTemplateDetails.objects.filter(
-                template_no=template_no
-            )
+                if attachment.count() > 0:
+                    entity_log_bulk(
+                        attachment, enum_attach,
+                        models.ChangeRequestTemplateAttachments
+                    )
 
-            if details.count() > 0:
-                entity_log_bulk(
-                    details, enum_detail,
-                    models.ChangeRequestTemplateDetails
+                details = models.ChangeRequestTemplateDetails.objects.filter(
+                    template_no=template_no
                 )
 
-            header = models.ChangeRequestTemplateHeader.objects.filter(
-                template_no=template_no
-            )
+                if details.count() > 0:
+                    entity_log_bulk(
+                        details, enum_detail,
+                        models.ChangeRequestTemplateDetails
+                    )
 
-            if header.count() > 0:
-                entity_log_bulk(
-                    header, enum_header,
-                    models.ChangeRequestTemplateHeader
+                header = models.ChangeRequestTemplateHeader.objects.filter(
+                    template_no=template_no
                 )
-            
-            return Response({"message": "Deleted"}, status=status.HTTP_200_OK)
+
+                if header.count() > 0:
+                    entity_log_bulk(
+                        header, enum_header,
+                        models.ChangeRequestTemplateHeader
+                    )
+                return Response({"message": "Deleted"}, status=status.HTTP_200_OK)
+
+            return Response({"message": "Archived"}, status=status.HTTP_200_OK)
         except Exception as e:
             return Response(e,
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -260,6 +269,69 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
                 status=status.HTTP_400_BAD_REQUEST
         )
 
+    @action(
+        methods=['GET'], detail=False,
+        url_path='archived', url_name='archived'
+    )
+    def archived(self, request, *args, **kwargs):
+
+        queryset = self.filter_queryset(self.get_queryset())
+        queryset = queryset.filter(created_by_user=self.request.user.code,
+                                   is_active=False)
+
+        self.serializer_class = ChangeRequestTemplatesSerializerList
+        
+        page = self.paginate_queryset(queryset)
+        
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+
+            message = status_message_response(
+                200,
+                'success',
+                'List of Archived Templates found',
+                serializer.data
+            )
+
+            return self.get_paginated_response(message)
+
+        serializer = self.get_serializer(self.queryset, many=True)
+
+        return Response(
+            serializer.data,
+            status=status.HTTP_200_OK
+        )
+    
+    #restore archived CR Template
+    @transaction.atomic
+    @action(
+        methods=['PATCH'], detail=True,
+        url_path='restore', url_name='restore'
+    )
+    def restore(self, request, *args, **kwargs):
+        try:
+            kwargs['partial'] = True
+            template_no = self.kwargs['template_no']
+            instance = models.ChangeRequestTemplateHeader.objects.filter(
+                template_no=template_no
+            )
+            instance.update(is_active=True)
+            message = status_message_response(
+                200, 'success',
+                'Archived Change Request Template restored',
+                ''
+            )
+
+            return Response(message, status=status.HTTP_200_OK)
+
+        except Exception as e:
+            message = status_message_response(
+                            500, 'failed',
+                            'Request was not able to process' + str(e), []
+                        )
+            return Response(message,
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
 
 class ChangeRequestTemplatePost(APIView):
 
@@ -291,10 +363,10 @@ class ChangeRequestTemplatePost(APIView):
 
             serializer = ChangeRequestTemplatesSerializer(
                 data=template_header_data)
-            
+
             if serializer.is_valid(raise_exception=True):
                 serializer.save()
-            
+
             tmp_id = serializer.data['template_no']
 
             # create template approvers

app/helper/decorators.py

@@ -42,8 +42,8 @@ class rms:
     enums_department = enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.value
     enums_user = enums.UserTypeEnum.USER.value
     access_error = "Logged user is not allowed to access this endpoint."
-    department_error = 'Department should be the same with the logged user'
-    company_error = 'Company should be the same with the logged user'
+    department_error = 'Department should be same with the logged user'
+    company_error = 'Company should be same with the logged user'
 
     def user(self):
         return self.request.user