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

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

@@ -7,27 +7,20 @@ class ChangeRequestFormAttachmentsSerializer(
     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
-            ret['file_upload'] = self.context['request'].build_absolute_uri(
-                instance.file_upload.url.url)
-            ret['file_upload_id'] = self.context['request'].build_absolute_uri(
-                instance.file_upload.url
-            )
-            return ret
-        except Exception as e:
-            ret['uploaded_by'] = user_object
-            ret['file_upload'] = "none"
-            return ret
+        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
+        ret['file_upload'] = self.context['request'].build_absolute_uri(
+            instance.file_upload.url.url)
+        ret['file_upload_id'] = instance.file_upload.id
+        return ret
 
     class Meta:
         model = models.ChangeRequestFormAttachments

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

@@ -22,9 +22,7 @@ class ChangeRequestTemplateAttachmentsSerializer(
             ret['file_upload'] = self.context['request'].build_absolute_uri(
                 instance.file_upload.url.url
             )
-            ret['file_upload_id'] = self.context['request'].build_absolute_uri(
-                instance.file_upload.url
-            )
+            ret['file_upload_id'] = instance.file_upload.id
             return ret
         except Exception as e:
             ret['uploaded_by'] = user_object