ordering

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

@@ -67,7 +67,7 @@ VENDOR_REJECT_MESSAGE = settings.VENDOR_REJECT_MESSAGE
 
 class ChangeRequestFormsViewset(viewsets.ModelViewSet):
 
-    queryset = models.ChangeRequestFormHeader.objects.all().order_by('-created')
+    queryset = models.ChangeRequestFormHeader.objects.all()
     serializer_class = ChangeRequestFormHeaderSerializer
     pagination_class = CustomPagination
     lookup_field = 'form_code'
@@ -99,10 +99,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             request.query_params.get('form_type'),
         )
 
-        if len(request.query_params) == 0:
-            queryset = self.queryset.order_by('-created')
-        else:
-            queryset = self.filter_queryset(self.queryset)
+        queryset = self.filter_queryset(self.queryset)
         
         page = self.paginate_queryset(queryset)
 
@@ -225,10 +222,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             request.query_params.get('form_type'),
         )
 
-        if len(request.query_params) == 0:
-            queryset = self.queryset.order_by('-created')
-        else:
-            queryset = self.filter_queryset(self.queryset)
+        queryset = self.filter_queryset(self.queryset)
 
         page = self.paginate_queryset(queryset)
 
@@ -276,10 +270,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             request.query_params.get('form_type'),
         )
 
-        if len(request.query_params) == 0:
-            queryset = self.queryset.order_by('-created')
-        else:
-            queryset = self.filter_queryset(self.queryset)
+        queryset = self.filter_queryset(self.queryset)
         
         page = self.paginate_queryset(queryset)
 
@@ -327,10 +318,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
             request.query_params.get('form_type'),
         )
         
-        if len(request.query_params) == 0:
-            queryset = self.queryset.order_by('-created')
-        else:
-            queryset = self.filter_queryset(self.queryset)
+        queryset = self.filter_queryset(self.queryset)
 
         page = self.paginate_queryset(queryset)
         
@@ -1186,6 +1174,13 @@ class ChangeRequestFormPost(APIView):
                 min_level = min_level.get('level__min')
                 
                 next_approver_email(frm_id, min_level)
+
+                # update next approver details
+                models.ChangeRequestFormApprovers.objects.filter(
+                    Q(form_code=frm_id) & Q(level=int(min_level))
+                    ).update(
+                        date_sent=datetime.now()
+                    )
             
             message = {
                 'code': 201,

app/entities/migrations/0006_auto_20191001_1024.py

+# Generated by Django 2.2 on 2019-10-01 10:24
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0005_auto_20190929_1603'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='changerequestformheader',
+            options={'ordering': ['-created']},
+        ),
+    ]

app/entities/models.py

@@ -706,6 +706,7 @@ class ChangeRequestFormHeader(BaseHeader):
 
     class Meta:
         db_table = 'change_request_form_headers'
+        ordering = ['-created']
     
     def __str__(self):
         return f'{self.form_code}'