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

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

@@ -7,27 +7,27 @@ 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.id
-        )
-        return ret
-        # except Exception as e:
-        #     ret['uploaded_by'] = user_object
-        #     ret['file_upload'] = "none"
-        #     return ret
+        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
 
     class Meta:
         model = models.ChangeRequestFormAttachments

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

@@ -133,7 +133,23 @@ class ChangeRequestFormHeaderSerializerList(
             ret['company'] = instance.requested_to_company.name
             ret['department'] = instance.requested_to_department.name
             ret['requested_by'] = instance.requested_by_user.name
-            
+
+            if instance.status.lower() == 'draft':
+                existing_transaction = models.ChangeRequestHistory.objects.filter(
+                    form_code=instance.form_code
+                )
+                if existing_transaction.count() > 0:
+                    can_delete = False
+                else:
+                    can_delete = True  # hard delete
+
+            elif instance.status.lower() == 'cancelled':
+                can_delete = False
+            else:
+                can_delete = None
+
+            ret['can_delete'] = can_delete
+
             return ret
         except Exception as e:
             ret['action_required'] = "No"

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

@@ -437,9 +437,14 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                     status=status.HTTP_200_OK)
 
                 else:
+                    
+                    models.ChangeRequestFormHeader.objects.filter(
+                        form_code=form_code
+                    ).update(is_active=False)
+
                     return Response(
-                        {"message": "Change request cannot be deleted due to previous transaction/s"},
-                         status=status.HTTP_400_BAD_REQUEST)
+                        {"message": "Draft change request sucessfully archived"},
+                         status=status.HTTP_200_OK)
 
             elif current_status.status.lower() == 'cancelled':
                 

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

@@ -165,4 +165,5 @@ class ChangeRequestTemplatesSerializerList(
     class Meta:
         model = models.ChangeRequestTemplateHeader
         fields = '__all__'
-        read_only_fields = ['created', 'template_no']
\ No newline at end of file
+        read_only_fields = ['created', 'template_no']
+        # extra_kwargs = {'client': {'required': False}}
\ No newline at end of file