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

* commit '92a2ffd0':
  update notif ip

app/applicationlayer/cms/form/views.py

@@ -267,7 +267,6 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         serializer = self.get_serializer(instance)
         return Response(serializer.data)
 
-
     @action(
         methods=['PATCH'], detail=True,
         url_path='re_route', url_name='re_route'
@@ -277,30 +276,26 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         # generate batchno history
         batchno = get_max_batchno("batch")
 
-        partial = kwargs.pop('partial', False)
+        # partial update
+        partial = kwargs.pop('partial', True)
         instance = self.get_object()
 
         form_code = kwargs['form_code']
 
-        body_data = request.data
-
+        status_update = {"status": 'Pending'}
         
+        serializer = self.get_serializer(instance,
+                                         data=status_update,
+                                         partial=partial)
         
-        # get old data
-        old_instance = models.ChangeRequestFormHeader.objects.filter(
-            form_code=form_code).values()
-
-        old_instance = list(old_instance)
-
-        # update status to pending
-        models.ChangeRequestFormHeader.objects.filter(
-            form_code=form_code).update(status='Pending')
+        serializer.is_valid(raise_exception=True)
+        old_instance = model_to_dict(instance)
+        self.perform_update(serializer)
 
-        # get new data
-        new_instance = models.ChangeRequestFormHeader.objects.filter(
-            form_code=form_code).values()
+        form_header = get_object_or_404(models.ChangeRequestFormHeader,
+                                        pk=instance.id)
 
-        new_instance = list(new_instance)
+        new_instance = model_to_dict(form_header)
         
         # save history in form header
         crhistory_save(
@@ -315,7 +310,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         
         # get all approvers of form
         approvers = models.ChangeRequestFormApprovers.objects.filter(
-            form_code=form_code)
+                    form_code=form_code)
         
         for approver in approvers:
             # get old data
@@ -347,7 +342,8 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
                 old_instance,
                 new_instance
             )
-        
+
+        # return Response(serializer.data)
         return Response(
             "Change request form successfully re routed",
                 status=status.HTTP_200_OK

app/applicationlayer/cms/template/views.py

@@ -459,7 +459,7 @@ class ChangeRequestTemplateAttachmentsViewset(meviewsets.ModelViewSet):
     serializer_class = serializers.ChangeRequestTemplateAttachmentsSerializer
     pagination_class = CustomPagination
     lookup_field = "code"
-
+    
     def list(self, request, *args, **kwargs):
         
         self.queryset = self.queryset.order_by('-created')

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=partial)
-
+                                         partial=True)
+            
             serializer.is_valid(raise_exception=True)
             old_instance = model_to_dict(frm_instance)
             

env.template.ini

@@ -55,7 +55,7 @@ CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://localhost:8000/cms/change-request/form/view
 
 [NOTIFICATION]
-REALTIMESERVER_IP = 127.0.0.1:8000
+REALTIMESERVER_IP = 172.17.0.1:6379
 
 [SETTINGS]
 CONFIG = config.settings.local