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

* commit '3f8c1053':
  test delete media file on server attachments

app/applicationlayer/cms/utils_cr.py

@@ -473,6 +473,29 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
                            '')
             
             tbl.objects.filter(id=test['id']).delete()
+
+        return True
+    except IntegrityError as exc:
+        raise APIException(detail=exc)
+
+
+def crhistory_log_bulk_delete_masterattach(queryset, entity, tbl, form_code,
+                                           batch_no, main_action):
+    try:
+        for data in queryset:
+            test = model_to_dict(data)
+            print(test['file_upload'])
+            crhistory_save(batch_no,
+                           main_action,
+                           enums.CREnum.DELETED.value,
+                           entity,
+                           form_code,
+                           test,
+                           '')
+            
+            tbl.objects.filter(id=test['id']).delete()
+            models.MasterAttachment.objects.filter(
+                id=test['file_upload']).delete()
         return True
     except IntegrityError as exc:
         raise APIException(detail=exc)

app/businesslayer/changerequest/change_request.py

@@ -17,6 +17,7 @@ from app.applicationlayer.cms.utils_cr import (
     crhistory_save,
     entity_log_bulk,
     crhistory_log_bulk_delete,
+    crhistory_log_bulk_delete_masterattach,
     send_mail_requestor,
     next_approver_email,
     send_mail_vendor,
@@ -362,7 +363,7 @@ def attachment_add_edit_delete(form_request_body,
     )
     
     if delete_query.count() > 0:
-        crhistory_log_bulk_delete(delete_query,
+        crhistory_log_bulk_delete_masterattach(delete_query,
                                                entity,
                                                queryset,
                                                form_code,
@@ -407,7 +408,7 @@ def attachment_add_edit_delete(form_request_body,
                 serializer = serializer_data(frm_instance,
                                 data=data,
                                 partial=partial,
-                                context={"request":self.request})
+                                context={"request": self.request})
 
                 serializer.is_valid(raise_exception=True)
 

app/entities/models.py

@@ -526,6 +526,10 @@ class MasterAttachment(models.Model):
     class Meta:
         db_table = 'master_attachments'
 
+    def delete(self, *args, **kwargs):
+        self.url.delete()
+        super().delete(*args, **kwargs)
+
 
 class BaseAttachment(models.Model):
     attachment_type = models.CharField(max_length=255)