From 3bdeb683da6be7747f06061adfd64428fbeb8f47 Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Wed, 10 May 2023 12:41:48 +0200 Subject: [PATCH 1/5] fix update document status at file creation --- src/app/api/super-admin/FilesController.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/api/super-admin/FilesController.ts b/src/app/api/super-admin/FilesController.ts index 2ca5f7b1..ae38660a 100644 --- a/src/app/api/super-admin/FilesController.ts +++ b/src/app/api/super-admin/FilesController.ts @@ -4,13 +4,14 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import { Service } from "typedi"; import FilesService from "@Services/private-services/FilesService/FilesService"; import { Files } from "@prisma/client"; -import { File } from "le-coffre-resources/dist/SuperAdmin"; +import { File, Document } from "le-coffre-resources/dist/SuperAdmin"; import { validateOrReject } from "class-validator"; +import DocumentsService from "@Services/super-admin/DocumentsService/DocumentsService"; @Controller() @Service() export default class FilesController extends ApiController { - constructor(private filesService: FilesService) { + constructor(private filesService: FilesService, private documentService: DocumentsService) { super(); } @@ -58,6 +59,10 @@ export default class FilesController extends ApiController { //call service to get prisma entity const prismaEntityCreated = await this.filesService.create(fileEntity, req.file); + const document: Document = await this.documentService.getByUid(fileEntity.document!.uid!) + document.document_status = "DEPOSITED"; + await this.documentService.update(document.uid!, document); + //Hydrate ressource with prisma entity const fileEntityCreated = File.hydrate(prismaEntityCreated, { strategy: "excludeAll", From 399f98ea72c207d55f73f517b34719e9388b01af Mon Sep 17 00:00:00 2001 From: Vincent Alamelle Date: Wed, 10 May 2023 14:13:17 +0200 Subject: [PATCH 2/5] Hot fix delete file --- src/services/private-services/FilesService/FilesService.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/private-services/FilesService/FilesService.ts b/src/services/private-services/FilesService/FilesService.ts index ce6373df..4f6d83d2 100644 --- a/src/services/private-services/FilesService/FilesService.ts +++ b/src/services/private-services/FilesService/FilesService.ts @@ -49,6 +49,7 @@ export default class FilesService extends BaseService { */ public async delete(uid: string) { const fileToUnpin = await this.filesRepository.findOneByUid(uid); + if(!fileToUnpin) throw new Error("File not found"); const decryptedFilePath = await this.cryptoService.decrypt(fileToUnpin.file_path, fileToUnpin.iv); const fileHash= decryptedFilePath.substring(this.variables.PINATA_GATEWAY.length); await this.ipfsService.unpinFile(fileHash) From 08f2b0ea024406121aa83a54f3f017fa2aa420ad Mon Sep 17 00:00:00 2001 From: Vincent Alamelle Date: Wed, 10 May 2023 14:14:05 +0200 Subject: [PATCH 3/5] Hot fix delete file --- .../private-services/FilesService/FilesService.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/services/private-services/FilesService/FilesService.ts b/src/services/private-services/FilesService/FilesService.ts index 4f6d83d2..15fdfa36 100644 --- a/src/services/private-services/FilesService/FilesService.ts +++ b/src/services/private-services/FilesService/FilesService.ts @@ -49,10 +49,11 @@ export default class FilesService extends BaseService { */ public async delete(uid: string) { const fileToUnpin = await this.filesRepository.findOneByUid(uid); - if(!fileToUnpin) throw new Error("File not found"); - const decryptedFilePath = await this.cryptoService.decrypt(fileToUnpin.file_path, fileToUnpin.iv); - const fileHash= decryptedFilePath.substring(this.variables.PINATA_GATEWAY.length); - await this.ipfsService.unpinFile(fileHash) + if(fileToUnpin){ + const decryptedFilePath = await this.cryptoService.decrypt(fileToUnpin.file_path, fileToUnpin.iv); + const fileHash= decryptedFilePath.substring(this.variables.PINATA_GATEWAY.length); + await this.ipfsService.unpinFile(fileHash) + } return this.filesRepository.delete(uid); } From cf11c386f7860aaaa2302812a4433e9326b64c25 Mon Sep 17 00:00:00 2001 From: Vincent Alamelle Date: Wed, 10 May 2023 14:53:56 +0200 Subject: [PATCH 4/5] Hotfix delete file --- src/services/private-services/FilesService/FilesService.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/services/private-services/FilesService/FilesService.ts b/src/services/private-services/FilesService/FilesService.ts index 15fdfa36..88b1d3b9 100644 --- a/src/services/private-services/FilesService/FilesService.ts +++ b/src/services/private-services/FilesService/FilesService.ts @@ -48,12 +48,15 @@ export default class FilesService extends BaseService { * @throws {Error} If file cannot be deleted */ public async delete(uid: string) { - const fileToUnpin = await this.filesRepository.findOneByUid(uid); - if(fileToUnpin){ + try { + const fileToUnpin = await this.filesRepository.findOneByUid(uid); const decryptedFilePath = await this.cryptoService.decrypt(fileToUnpin.file_path, fileToUnpin.iv); const fileHash= decryptedFilePath.substring(this.variables.PINATA_GATEWAY.length); await this.ipfsService.unpinFile(fileHash) + } catch (error) { + console.log(error); } + return this.filesRepository.delete(uid); } From adea3c3a03a3aade7108bd280cf4f535273bc1b4 Mon Sep 17 00:00:00 2001 From: Hugo Lextrait Date: Wed, 10 May 2023 16:00:11 +0200 Subject: [PATCH 5/5] :art: fix seeder --- src/common/databases/seeders/seeder.ts | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/common/databases/seeders/seeder.ts b/src/common/databases/seeders/seeder.ts index f37a2dd0..8bca08dc 100644 --- a/src/common/databases/seeders/seeder.ts +++ b/src/common/databases/seeders/seeder.ts @@ -47,6 +47,8 @@ import { const uidAddress1: string = randomString(); const uidAddress2: string = randomString(); + const uidAddress3: string = randomString(); + const uidAddress4: string = randomString(); const uidOffice1: string = randomString(); const uidOffice2: string = randomString(); @@ -124,6 +126,22 @@ import { created_at: new Date(), updated_at: new Date(), }, + { + uid: uidAddress3, + address: "Rue Pierre Charles", + city: "Paris", + zip_code: 75003, + created_at: new Date(), + updated_at: new Date(), + }, + { + uid: uidAddress4, + address: "Rue Pierre Pologne", + city: "Paris", + zip_code: 75003, + created_at: new Date(), + updated_at: new Date(), + }, ]; const contacts: Contacts[] = [ @@ -155,7 +173,7 @@ import { }, { uid: uidContact3, - address_uid: uidAddress2, + address_uid: uidAddress3, first_name: "Maitre Marcelino", last_name: "Jack", email: "Marcelino.Jack@example.com", @@ -168,7 +186,7 @@ import { }, { uid: uidContact4, - address_uid: uidAddress2, + address_uid: uidAddress4, first_name: "Maitre Massi", last_name: "Jack", email: "Massi.Jack@example.com", @@ -537,4 +555,4 @@ import { } console.log(">MOCK DATA - Seeding completed!"); -})(); \ No newline at end of file +})();