Commit 3f8c1053 authored by Gladys Forte's avatar Gladys Forte

test delete media file on server attachments

parent 89c72e55
...@@ -473,6 +473,29 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code, ...@@ -473,6 +473,29 @@ def crhistory_log_bulk_delete(queryset, entity, tbl, form_code,
'') '')
tbl.objects.filter(id=test['id']).delete() 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 return True
except IntegrityError as exc: except IntegrityError as exc:
raise APIException(detail=exc) raise APIException(detail=exc)
......
...@@ -145,7 +145,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet): ...@@ -145,7 +145,7 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
user_department = Department.objects.get( user_department = Department.objects.get(
name__icontains=keys['department'] name__icontains=keys['department']
) )
default_app = Application.objects.filter( default_app = Application.objects.filter(
excel_code=keys['default_app'] excel_code=keys['default_app']
).first() ).first()
......
...@@ -17,6 +17,7 @@ from app.applicationlayer.cms.utils_cr import ( ...@@ -17,6 +17,7 @@ from app.applicationlayer.cms.utils_cr import (
crhistory_save, crhistory_save,
entity_log_bulk, entity_log_bulk,
crhistory_log_bulk_delete, crhistory_log_bulk_delete,
crhistory_log_bulk_delete_masterattach,
send_mail_requestor, send_mail_requestor,
next_approver_email, next_approver_email,
send_mail_vendor, send_mail_vendor,
...@@ -360,14 +361,14 @@ def attachment_add_edit_delete(form_request_body, ...@@ -360,14 +361,14 @@ def attachment_add_edit_delete(form_request_body,
).exclude( ).exclude(
id__in=request_ids id__in=request_ids
) )
if delete_query.count() > 0: if delete_query.count() > 0:
crhistory_log_bulk_delete(delete_query, crhistory_log_bulk_delete_masterattach(delete_query,
entity, entity,
queryset, queryset,
form_code, form_code,
batch_no, batch_no,
main_action main_action
) )
# update or create # update or create
...@@ -407,7 +408,7 @@ def attachment_add_edit_delete(form_request_body, ...@@ -407,7 +408,7 @@ def attachment_add_edit_delete(form_request_body,
serializer = serializer_data(frm_instance, serializer = serializer_data(frm_instance,
data=data, data=data,
partial=partial, partial=partial,
context={"request":self.request}) context={"request": self.request})
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
......
...@@ -526,6 +526,10 @@ class MasterAttachment(models.Model): ...@@ -526,6 +526,10 @@ class MasterAttachment(models.Model):
class Meta: class Meta:
db_table = 'master_attachments' db_table = 'master_attachments'
def delete(self, *args, **kwargs):
self.url.delete()
super().delete(*args, **kwargs)
class BaseAttachment(models.Model): class BaseAttachment(models.Model):
attachment_type = models.CharField(max_length=255) attachment_type = models.CharField(max_length=255)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment