From bb2d1f1d3be97ccee067021826e4ea8f353d583a Mon Sep 17 00:00:00 2001 From: Max S Date: Wed, 21 Aug 2024 11:00:58 +0200 Subject: [PATCH] :bug: cant delete document with archived file --- src/services/admin/DocumentsService/DocumentsService.ts | 4 +++- src/services/notary/DocumentsService/DocumentsService.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/services/admin/DocumentsService/DocumentsService.ts b/src/services/admin/DocumentsService/DocumentsService.ts index ce3f4242..8983e442 100644 --- a/src/services/admin/DocumentsService/DocumentsService.ts +++ b/src/services/admin/DocumentsService/DocumentsService.ts @@ -62,7 +62,9 @@ export default class DocumentsService extends BaseService { if (!documentEntity) throw new Error("document not found"); const document = Document.hydrate(documentEntity, { strategy: "excludeAll" }); - if (document.files && document.files.length !== 0) { + const isDocumentEmpty = document.files && !document!.files.find((file) => file.archived_at === null); + + if (!isDocumentEmpty) { throw new Error("Can't delete a document with file"); } return this.documentsRepository.delete(uid); diff --git a/src/services/notary/DocumentsService/DocumentsService.ts b/src/services/notary/DocumentsService/DocumentsService.ts index 0dce86dc..6fefc6ea 100644 --- a/src/services/notary/DocumentsService/DocumentsService.ts +++ b/src/services/notary/DocumentsService/DocumentsService.ts @@ -62,7 +62,9 @@ export default class DocumentsService extends BaseService { if (!documentEntity) throw new Error("document not found"); const document = Document.hydrate(documentEntity, { strategy: "excludeAll" }); - if (document.files && document.files.length !== 0 && document.document_status !== "REFUSED") { + const isDocumentEmpty = document.files && !document!.files.find((file) => file.archived_at === null); + + if (!isDocumentEmpty && document.document_status !== "REFUSED") { throw new Error("Can't delete a document with file"); } return this.documentsRepository.delete(uid);