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

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

@@ -113,7 +113,7 @@ class ChangeRequestFormHeaderSerializerList(
                 (Q(action='') | Q(action=None))
             ).order_by('level')
             
-            if current_level[0].user.code == id_number:
+            if current_level.count() > 0 and current_level[0].user.code == id_number:
                 if instance.status.lower() == 'rejected':
                     approver = 'No'
                 elif instance.status.lower() == 'cancelled':
@@ -124,6 +124,7 @@ class ChangeRequestFormHeaderSerializerList(
                     approver = 'Yes'
             else:
                 approver = 'No'
+            
             ret['action'] = approver
             ret['company'] = instance.requested_to_company.name
             ret['department'] = instance.requested_to_department.name

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

@@ -325,8 +325,9 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
 
         self.queryset = change_request.list_by_user(id_number)
 
-        self.queryset = change_request.filter_awaiting(self.queryset, id_number.code)
-
+        self.queryset = change_request.filter_awaiting(
+            self.queryset, id_number)
+        
         self.queryset = change_request.filter_base(
             self.queryset,
             request.query_params.get('company_requested_to'),
@@ -447,6 +448,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             return Response(e,
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
+    @transaction.atomic()
     @action(
         methods=['PATCH'], detail=True,
         url_path='re_route', url_name='re_route'
@@ -539,6 +541,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         )
         return Response(message, status=status.HTTP_200_OK)
     
+    @transaction.atomic()
     @action(
         methods=['PATCH'], detail=True,
         url_path='re_submit', url_name='re_submit'
@@ -629,7 +632,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
 
         return Response(message, status=status.HTTP_200_OK)
 
-    # actions
+    @transaction.atomic()
     @action(
         methods=['PATCH'], detail=False,
         url_path='actions', url_name='actions'
@@ -660,7 +663,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         approver_instance = models.ChangeRequestFormApprovers.objects.get(
             pk=id
         )
-
+        
         serializer = ChangeRequestFormApproversSerializer(
                                         approver_instance,
                                         data=action_data,

app/businesslayer/changerequest/change_request.py

@@ -21,6 +21,7 @@ from django.forms.models import model_to_dict
 from app.entities import enums, models
 from app.applicationlayer.utils import log_save, CustomPagination
 from app.applicationlayer.cms.template import serializers
+from django.db.models import Min
 
 
 def list_by_user(user_id_number):
@@ -231,15 +232,27 @@ def filter_awaiting(base_queryset,
             current_level = models.ChangeRequestFormApprovers.objects.filter(
                 Q(form_code=query.form_code) &
                 (Q(action='') | Q(action=None))
-            ).order_by('level')
-            
+            ).aggregate(Min('level'))
+
+            # for current in current_level:
+
             if current_level:
-                first_level = current_level.first()
+                current_level = current_level.get('level__min')
                 
-                first_user = models.ChangeRequestFormApprovers.objects.filter(
-                    code=first_level).values('user')
+                query = models.ChangeRequestFormApprovers.objects.filter(
+                    Q(form_code=query.form_code) &
+                    (Q(action='') | Q(action=None)) &
+                    Q(level=current_level)
+                )
+
+                print(query)
+                
+                # first_level = current_level.first()
+
+                # first_user = models.ChangeRequestFormApprovers.objects.filter(
+                #     code=first_level).values('user')
 
-                print(first_user.user)
+                # print(first_user.user)
 
                 # if x == user_id_number: