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

* commit 'd71c401f':
  updated postman
  form header update
  save and submit initial

app/applicationlayer/cms/form/serializers.py

@@ -73,8 +73,6 @@ class ChangeRequestFormHeaderSerializer(
 ):
     frm_approvers = ChangeRequestFormApproversSerializer(
         many=True, read_only=True)
-    # frm_stakes = ChangeRequestFormStakeHoldersSerializer(
-    #     many=True, required=False)
     frm_stakes = ChangeRequestFormStakeHoldersSerializer(
         many=True, read_only=True)
     frm_attachments = ChangeRequestFormAttachmentsSerializer(
@@ -82,88 +80,6 @@ class ChangeRequestFormHeaderSerializer(
     frm_details = ChangeRequestFormDetailsSerializer(
         many=True, read_only=True)
 
-    # def update(self, instance, validated_data):
-
-        
-        # Update the book instance
-        
-        # instance.requested_to_template_name = validated_data['requested_to_template_name']
-        # instance.requested_to_objective = validated_data['requested_to_objective']
-        # instance.requested_to_target_date = validated_data['requested_to_target_date']
-        # instance.requested_to_priority = validated_data['requested_to_priority']
-        # instance.description = validated_data['description']
-        # instance.status = validated_data['status']
-        # instance.company_desc = validated_data['company_desc']
-        # instance.department_desc = validated_data['department_desc']
-        # instance.requested_desc = validated_data['requested_desc']
-        # instance.requested_to_template_id = validated_data['requested_to_template_id']
-        # instance.requested_to_company = validated_data['requested_to_company']
-        # instance.requested_to_department = validated_data['requested_to_department']
-        # instance.requested_to_user = validated_data['requested_to_user']
-        # instance.requested_by_user = validated_data['requested_by_user']
-        # instance.requested_by_department = validated_data['requested_by_department']
-        # instance.template_no = validated_data['template_no']
-        # instance.save()
-
-        # Delete any pages not included in the request
-        # approvers_ids = [item.id for item in validated_data['frm_approvers']]
-
-        # for i in validated_data['frm_approvers']:
-        #     print(i)
-
-        # print(approvers_ids)
-        # for page in instance.frm_approvers:
-        #     if page.id not in approvers_ids:
-        #         page.delete()
-
-        # # Create or update page instances that are in the request
-        # for item in validated_data['pages']:
-        #     page = Page(id=item['page_id'], text=item['text'], book=instance)
-        #     page.save()
-
-        # return instance
-
-    # def update(self, instance, validated_data):
-    #     frm_approvers = validated_data.pop('frm_approvers')
-    #     instance.requested_to_template_name = validated_data.get("requested_to_template_name", instance.requested_to_template_name)
-    #     instance.requested_to_objective = validated_data.get("requested_to_objective", instance.requested_to_objective)
-    #     instance.requested_to_target_date = validated_data.get("requested_to_target_date", instance.requested_to_target_date)
-    #     instance.requested_to_priority = validated_data.get("requested_to_priority", instance.requested_to_priority)
-    #     instance.description = validated_data.get("description", instance.description)
-    #     instance.status = validated_data.get("status", instance.status)
-    #     instance.company_desc = validated_data.get("company_desc", instance.company_desc)
-    #     instance.department_desc = validated_data.get("department_desc", instance.department_desc)
-    #     instance.requested_desc = validated_data.get("requested_desc", instance.requested_desc)
-    #     instance.requested_to_template_id = validated_data.get("requested_to_template_id", instance.requested_to_template_id)
-    #     instance.requested_to_company = validated_data.get("requested_to_company", instance.requested_to_company)
-    #     instance.requested_to_department = validated_data.get("requested_to_department", instance.requested_to_department)
-    #     instance.requested_to_user = validated_data.get("requested_to_user", instance.requested_to_user)
-    #     instance.requested_by_user = validated_data.get("requested_by_user", instance.requested_by_user)
-    #     instance.requested_by_department = validated_data.get("requested_by_department", instance.requested_by_department)
-    #     instance.template_no = validated_data.get("template_no", instance.template_no)
-    #     instance.save()
-
-    #     print(instance.form_code)
-    #     keep_choices = []
-    #     for choice in frm_approvers:
-    #         if "id" in choice.keys():
-    #             if models.ChangeRequestFormApprovers.objects.filter(id=choice["id"]).exists():
-    #                 c = models.ChangeRequestFormApprovers.objects.get(id=choice["id"])
-    #                 c.text = choice.get('text', c.text)
-    #                 c.save()
-    #                 keep_choices.append(c.id)
-    #             else:
-    #                 continue
-    #         else:
-    #             c = models.ChangeRequestFormApprovers.objects.create(**choice)
-    #             keep_choices.append(c.id)
-
-        # for choice in instance.frm_approvers:
-        #     if choice.id not in keep_choices:
-        #         choice.delete()
-
-        # return instance
-    
     def to_representation(self, instance):
         ret = super().to_representation(instance)
         try:

app/applicationlayer/cms/utils_cr.py

@@ -14,6 +14,7 @@ from django.forms.models import model_to_dict
 from rest_framework.exceptions import ParseError
 from django.db import IntegrityError
 from rest_framework.exceptions import APIException 
+from django.db.models import Max
 
 
 CR_FRONT_LINK = settings.CR_FRONT_LINK
@@ -395,13 +396,18 @@ def cancel_overdue(request):
     return True
 
 
-def crhistory_save(action, entity, form_code, fromValue, toValue):
+def crhistory_save(batch_no, main_action,
+                   action, entity, form_code,
+                   fromValue, toValue):
+
     models.ChangeRequestHistory.objects.create(
+            batch_no=batch_no,
+            main_action=main_action,
             action=action,
             entity=entity,
             form_code=form_code,
             fromValue=fromValue,
             toValue=toValue
         )
-        
+    
     return True
\ No newline at end of file

app/entities/migrations/0006_auto_20190920_1623.py

+# Generated by Django 2.2 on 2019-09-20 16:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0005_auto_20190919_1625'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='changerequesthistory',
+            name='batch_no',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='changerequesthistory',
+            name='main_action',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]

app/entities/models.py

@@ -875,6 +875,14 @@ CR HISTORY
 '''
 
 class ChangeRequestHistory(AuditClass):
+    batch_no = models.CharField(
+        max_length=255,
+        blank=True,
+        null=True)
+    main_action = models.CharField(
+        max_length=255,
+        blank=True,
+        null=True)
     action = models.CharField(
         max_length=50)
     entity = models.CharField(