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

* commit '0be97e89':
  fix partial update template
  sorting level temp approver
  partial update temp
  threading

app/applicationlayer/cms/auto_email/reminder.py

@@ -65,7 +65,7 @@ class ReminderTriggerAPIView(views.APIView):
                     requestor_recipient, admin]
                 
                 main_threading(args_requestor, sender.routing_table_reminder_requestor)
-
+                
                 today_mail.update(date_to_send=next_day.strftime('%Y-%m-%d 00:00:00.000'))
 
         return Response(

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

@@ -85,6 +85,11 @@ class ChangeRequestFormHeaderSerializer(
 
             return ret
 
+    def setup_eager_loading(self, cls, queryset):
+        """ Perform necessary eager loading of data. """
+        queryset = queryset.prefetch_related('frm_approvers')
+        return queryset
+
     class Meta:
         model = models.ChangeRequestFormHeader
         # fields = '__all__'

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

@@ -60,6 +60,7 @@ from rest_framework.filters import SearchFilter, OrderingFilter
 from django_filters import rest_framework as filters
 from django_filters.rest_framework import DjangoFilterBackend
 import json
+from app.applicationlayer.utils import main_threading
 
 APPROVER_MESSAGE = settings.APPROVER_MESSAGE
 REQUESTOR_MESSAGE = settings.REQUESTOR_MESSAGE
@@ -368,24 +369,27 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         id_number = self.request.user.code
         form_code = kwargs['form_code']
 
+        instance = self.get_object()
+        serializer = self.get_serializer(instance)
+
         models.Notification.objects.filter(
             account_no=id_number,
             form_code=form_code,
             is_read=False).update(is_read=True)
-
+        
         ROOM = id_number
         SENDER = id_number
         
-        send_broadcast_message(
+        notif = send_broadcast_message(
             ROOM,
             SENDER,
             'UPDATE NOTIFICATIONS'
         )
-        
-        instance = self.get_object()
-        serializer = self.get_serializer(instance)
+
+        main_threading(1, notif)
+
         return Response(serializer.data)
-    
+        
     @transaction.atomic()
     def destroy(self, request, *args, **kwargs):
         try:
@@ -680,7 +684,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         url_path='actions', url_name='actions'
     )
     def actions(self, request, *args, **kwargs):
-
+        
         current_user = self.request.user.code
         
         action_body = request.data

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

@@ -184,7 +184,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
     @transaction.atomic
     def partial_update(self, request, *args, **kwargs):
 
-        partial = kwargs.pop('partial', False)
+        partial = kwargs.pop('partial', True)
         instance = self.get_object()
 
         template_no = kwargs['template_no']
@@ -222,38 +222,35 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
                 template_no
             )
 
-            if body_data['tmp_stakes']:
-                tmp_add_edit_delete(
-                    body_data['tmp_stakes'],
-                    models.ChangeRequestTemplateStakeHolders,
-                    enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value,
-                    ChangeRequestTemplateStakeHoldersSerializer,
-                    partial,
-                    self,
-                    template_no
-                )
+            tmp_add_edit_delete(
+                body_data['tmp_stakes'],
+                models.ChangeRequestTemplateStakeHolders,
+                enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value,
+                ChangeRequestTemplateStakeHoldersSerializer,
+                partial,
+                self,
+                template_no
+            )
 
-            if body_data['tmp_attachments']:
-                tmp_add_edit_delete(
-                    body_data['tmp_attachments'],
-                    models.ChangeRequestTemplateAttachments,
-                    enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value,
-                    ChangeRequestTemplateAttachmentsSerializer,
-                    partial,
-                    self,
-                    template_no
-                )
+            tmp_add_edit_delete(
+                body_data['tmp_attachments'],
+                models.ChangeRequestTemplateAttachments,
+                enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value,
+                ChangeRequestTemplateAttachmentsSerializer,
+                partial,
+                self,
+                template_no
+            )
 
-            if body_data['tmp_details']:
-                tmp_add_edit_delete(
-                    body_data['tmp_details'],
-                    models.ChangeRequestTemplateDetails,
-                    enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value,
-                    ChangeRequestTemplateDetailsSerializer,
-                    partial,
-                    self,
-                    template_no
-                )
+            tmp_add_edit_delete(
+                body_data['tmp_details'],
+                models.ChangeRequestTemplateDetails,
+                enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value,
+                ChangeRequestTemplateDetailsSerializer,
+                partial,
+                self,
+                template_no
+            )
 
             serializer = self.get_serializer(instance)
 

app/entities/migrations/0024_auto_20191022_1433.py

+# Generated by Django 2.2 on 2019-10-22 14:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0023_auto_20191021_1706'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='changerequesttemplateapprovers',
+            options={'ordering': ['level']},
+        ),
+    ]

app/entities/models.py

@@ -572,6 +572,7 @@ class ChangeRequestTemplateApprovers(BaseApprover):
     
     class Meta:
         db_table = 'change_request_template_approvers'
+        ordering = ['level']
 
     def __str__(self):
         return f'{self.code}'