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

* commit '819c1c73':
  object

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

@@ -50,4 +50,9 @@ class ChangeRequestFormApproversViewset(viewsets.ModelViewSet):
         return Response(
             serializer.data,
             status=status.HTTP_200_OK
-        )
\ No newline at end of file
+        )
+    
+    def retrieve(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance)
+        return Response(serializer.data)
\ No newline at end of file

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

@@ -18,10 +18,12 @@ class ChangeRequestFormAttachmentsSerializer(
                 "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'] = self.context['request'].build_absolute_uri(
+                instance.file_upload.url.url)
             return ret
         except Exception as e:
             ret['uploaded_by'] = "none"
+            ret['file_upload'] = "none"
             return ret
 
     class Meta:

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

@@ -47,4 +47,9 @@ class ChangeRequestFormAttachmentsViewset(viewsets.ModelViewSet):
         return Response(
             serializer.data,
             status=status.HTTP_200_OK
-        )
\ No newline at end of file
+        )
+    
+    def retrieve(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance)
+        return Response(serializer.data)
\ No newline at end of file

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

@@ -47,3 +47,8 @@ class ChangeRequestFormDetailsViewset(viewsets.ModelViewSet):
             serializer.data,
             status=status.HTTP_200_OK
         )
+    
+    def retrieve(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance)
+        return Response(serializer.data)

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

@@ -363,11 +363,6 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         )
 
     def retrieve(self, request, *args, **kwargs):
-        # instance = self.queryset.filter(
-        #     form_code=str(self.kwargs.get('form_code'))
-        # ).first()
-        # serializer = self.get_serializer(instance)
-        # return Response(serializer.data)
         instance = self.get_object()
         serializer = self.get_serializer(instance)
         return Response(serializer.data)

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

@@ -49,3 +49,8 @@ class ChangeRequestFormStakeHoldersViewset(viewsets.ModelViewSet):
             serializer.data,
             status=status.HTTP_200_OK
         )
+
+    def retrieve(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance)
+        return Response(serializer.data)
\ No newline at end of file

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

@@ -51,3 +51,8 @@ class ChangeRequestTemplateApproversViewset(viewsets.ModelViewSet):
             serializer.data,
             status=status.HTTP_200_OK
         )
+    
+    def retrieve(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance)
+        return Response(serializer.data)
\ No newline at end of file

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

@@ -50,3 +50,8 @@ class ChangeRequestTemplateAttachmentsViewset(viewsets.ModelViewSet):
             serializer.data,
             status=status.HTTP_200_OK
         )
+
+    def retrieve(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance)
+        return Response(serializer.data)
\ No newline at end of file

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

@@ -48,3 +48,8 @@ class ChangeRequestTemplateDetailsViewset(viewsets.ModelViewSet):
             serializer.data,
             status=status.HTTP_200_OK
         )
+    
+    def retrieve(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance)
+        return Response(serializer.data)

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

@@ -32,6 +32,19 @@ class ChangeRequestTemplatesSerializer(
     def to_representation(self, instance):
         ret = super().to_representation(instance)
         try:
+            
+            requested_to_user_object = {
+                "id": instance.requested_to_user.id,
+                "name": instance.requested_to_user.name,
+                "username": instance.requested_to_user.username,
+                "code": instance.requested_to_user.code,
+                "email": instance.requested_to_user.email,
+                "contact_no": instance.requested_to_user.contact_no
+            }
+
+            ret['requested_to_company_object'] = model_to_dict(instance.requested_to_company)
+            ret['requested_to_department_object'] = model_to_dict(instance.requested_to_department)
+            ret['requested_to_user_object'] = requested_to_user_object
 
             ret['company'] = instance.requested_to_company.name
             ret['department'] = instance.requested_to_department.name
@@ -70,7 +83,20 @@ class ChangeRequestTemplatesSerializerList(
     def to_representation(self, instance):
         ret = super().to_representation(instance)
         try:
-        
+
+            requested_to_user_object = {
+                "id": instance.requested_to_user.id,
+                "name": instance.requested_to_user.name,
+                "username": instance.requested_to_user.username,
+                "code": instance.requested_to_user.code,
+                "email": instance.requested_to_user.email,
+                "contact_no": instance.requested_to_user.contact_no
+            }
+
+            ret['requested_to_company_object'] = model_to_dict(instance.requested_to_company)
+            ret['requested_to_department_object'] = model_to_dict(instance.requested_to_department)
+            ret['requested_to_user_object'] = requested_to_user_object
+            
             ret['company'] = instance.requested_to_company.name
             ret['department'] = instance.requested_to_department.name
             ret['point_of_contact'] = instance.requested_to_user.name

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

@@ -51,3 +51,8 @@ class ChangeRequestTemplateStakeholdersViewset(viewsets.ModelViewSet):
             serializer.data,
             status=status.HTTP_200_OK
         )
+
+    def retrieve(self, request, *args, **kwargs):
+        instance = self.get_object()
+        serializer = self.get_serializer(instance)
+        return Response(serializer.data)
\ No newline at end of file

app/entities/models.py

@@ -442,7 +442,7 @@ class MasterAttachment(models.Model):
         upload_to='uploads/',
         blank=True,
         null=True)
-
+    
     class Meta:
         db_table = 'master_attachments'