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

* commit '09473cec':
  update add_update

app/applicationlayer/cms/template/attachment/serializers.py

@@ -6,6 +6,24 @@ from django.forms.models import model_to_dict
 class ChangeRequestTemplateAttachmentsSerializer(
     serializers.ModelSerializer
 ):
+    def to_representation(self, instance):
+        try:
+            ret = super().to_representation(instance)
+            user_object = {
+                "id": instance.uploaded_by.id,
+                "name": instance.uploaded_by.name,
+                "username": instance.uploaded_by.username,
+                "code": instance.uploaded_by.code,
+                "email": instance.uploaded_by.email,
+                "contact_no": instance.uploaded_by.contact_no
+            }
+            ret['uploaded_by'] = user_object
+            
+            return ret
+        except Exception as e:
+            ret['uploaded_by'] = "none"
+            return ret
+
     class Meta:
         model = models.ChangeRequestTemplateAttachments
         fields = '__all__'

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

@@ -15,6 +15,24 @@ from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequ
 class ChangeRequestTemplateAttachmentsSerializer(
     serializers.ModelSerializer
 ):
+    def to_representation(self, instance):
+        try:
+            ret = super().to_representation(instance)
+            user_object = {
+                "id": instance.uploaded_by.id,
+                "name": instance.uploaded_by.name,
+                "username": instance.uploaded_by.username,
+                "code": instance.uploaded_by.code,
+                "email": instance.uploaded_by.email,
+                "contact_no": instance.uploaded_by.contact_no
+            }
+            ret['uploaded_by'] = user_object
+            
+            return ret
+        except Exception as e:
+            ret['uploaded_by'] = "none"
+            return ret
+
     class Meta:
         model = models.ChangeRequestTemplateAttachments
         fields = '__all__'

app/businesslayer/changerequest/change_request.py

@@ -288,8 +288,13 @@ def form_add_edit_delete(form_request_body,
                 pk=i['id']
             )
 
+            frm_code = {
+                "form_code": form_code
+            }
+            data = {**i, **frm_code}
+
             serializer = serializer_data(frm_instance,
-                                         data=i,
+                                         data=data,
                                          partial=partial)
 
             serializer.is_valid(raise_exception=True)
@@ -309,7 +314,11 @@ def form_add_edit_delete(form_request_body,
             )
 
         else:
-            serializer = serializer_data(data=i)
+            frm_code = {
+                "form_code": form_code
+            }
+            data = {**i, **frm_code}
+            serializer = serializer_data(data=data)
             serializer.is_valid(raise_exception=True)
 
             self.perform_create(serializer)

app/businesslayer/changerequest/change_request_template.py

@@ -51,9 +51,13 @@ def tmp_add_edit_delete(tmp_request_body,
             tmp_instance = queryset.objects.get(
                 pk=i['id']
             )
+            tmp_code = {
+                "template_no": template_no
+            }
+            data = {**i, **tmp_code}
             
             serializer = serializer_data(tmp_instance,
-                                         data=i,
+                                         data=data,
                                          partial=partial)
 
             serializer.is_valid(raise_exception=True)
@@ -70,7 +74,11 @@ def tmp_add_edit_delete(tmp_request_body,
                 new_instance
             )
         else:
-            serializer = serializer_data(data=i)
+            tmp_code = {
+                "template_no": template_no
+            }
+            data = {**i, **tmp_code}
+            serializer = serializer_data(data=data)
             serializer.is_valid(raise_exception=True)
 
             self.perform_create(serializer)