diff --git a/src/app/api/customer/DocumentsController.ts b/src/app/api/customer/DocumentsController.ts index 85b64290..8be29e46 100644 --- a/src/app/api/customer/DocumentsController.ts +++ b/src/app/api/customer/DocumentsController.ts @@ -28,7 +28,7 @@ export default class DocumentsController extends ApiController { const documentEntities: Documents[] = await this.documentsService.get(query); //Hydrate ressource with prisma entity - const documents = Document.hydrateArray(Document, documentEntities, { strategy: "excludeAll" }); + const documents = Document.hydrateArray(documentEntities, { strategy: "excludeAll" }); //success this.httpSuccess(response, documents); diff --git a/src/app/api/super-admin/CustomersController.ts b/src/app/api/super-admin/CustomersController.ts index 0db0059e..6bd28b1e 100644 --- a/src/app/api/super-admin/CustomersController.ts +++ b/src/app/api/super-admin/CustomersController.ts @@ -27,7 +27,7 @@ export default class CustomersController extends ApiController { const customersEntities = await this.customersService.get(query); //Hydrate ressource with prisma entity - const customers = Customer.hydrateArray(Customer, customersEntities, { strategy: "excludeAll" }); + const customers = Customer.hydrateArray(customersEntities, { strategy: "excludeAll" }); //success this.httpSuccess(response, customers); diff --git a/src/app/api/super-admin/DeedTypesController.ts b/src/app/api/super-admin/DeedTypesController.ts index df324a68..5f038ba9 100644 --- a/src/app/api/super-admin/DeedTypesController.ts +++ b/src/app/api/super-admin/DeedTypesController.ts @@ -27,7 +27,7 @@ export default class DeedTypesController extends ApiController { const deedTypeEntities: DeedTypes[] = await this.deedTypesService.get(query); //Hydrate ressource with prisma entity - const DeedTypes = DeedType.hydrateArray(DeedType, deedTypeEntities, { strategy: "excludeAll" }); + const DeedTypes = DeedType.hydrateArray(deedTypeEntities, { strategy: "excludeAll" }); //success this.httpSuccess(response, DeedTypes); diff --git a/src/app/api/super-admin/DeedsController.ts b/src/app/api/super-admin/DeedsController.ts index 87d6df7e..3f4d3c62 100644 --- a/src/app/api/super-admin/DeedsController.ts +++ b/src/app/api/super-admin/DeedsController.ts @@ -27,7 +27,7 @@ export default class DeedsController extends ApiController { const deedEntities: Deeds[] = await this.deedsService.get(query); //Hydrate ressource with prisma entity - const deeds = Deed.hydrateArray(Deed, deedEntities, { strategy: "excludeAll" }); + const deeds = Deed.hydrateArray(deedEntities, { strategy: "excludeAll" }); //success this.httpSuccess(response, deeds); diff --git a/src/app/api/super-admin/DocumentTypesController.ts b/src/app/api/super-admin/DocumentTypesController.ts index effa524a..ecd89e14 100644 --- a/src/app/api/super-admin/DocumentTypesController.ts +++ b/src/app/api/super-admin/DocumentTypesController.ts @@ -28,7 +28,7 @@ export default class DocumentTypesController extends ApiController { const documentTypeEntities: DocumentTypes[] = await this.documentTypesService.get(query); //Hydrate ressource with prisma entity - const documentTypes = DocumentType.hydrateArray(DocumentType, documentTypeEntities, { + const documentTypes = DocumentType.hydrateArray(documentTypeEntities, { strategy: "excludeAll", }); diff --git a/src/app/api/super-admin/DocumentsController.ts b/src/app/api/super-admin/DocumentsController.ts index ad3327f6..009d33ca 100644 --- a/src/app/api/super-admin/DocumentsController.ts +++ b/src/app/api/super-admin/DocumentsController.ts @@ -28,7 +28,7 @@ export default class DocumentsController extends ApiController { const documentEntities: Documents[] = await this.documentsService.get(query); //Hydrate ressource with prisma entity - const documents = Document.hydrateArray(Document, documentEntities, { strategy: "excludeAll" }); + const documents = Document.hydrateArray(documentEntities, { strategy: "excludeAll" }); //success this.httpSuccess(response, documents); diff --git a/src/app/api/super-admin/FilesController.ts b/src/app/api/super-admin/FilesController.ts index 0d0fdf44..3bfd52da 100644 --- a/src/app/api/super-admin/FilesController.ts +++ b/src/app/api/super-admin/FilesController.ts @@ -29,7 +29,7 @@ export default class FilesController extends ApiController { const fileEntities = await this.filesService.get(query); //Hydrate ressource with prisma entity - const files = File.hydrateArray(File, fileEntities, { strategy: "excludeAll" }); + const files = File.hydrateArray(fileEntities, { strategy: "excludeAll" }); //success this.httpSuccess(response, files); diff --git a/src/app/api/super-admin/OfficeFoldersController.ts b/src/app/api/super-admin/OfficeFoldersController.ts index e7c9467f..a5427559 100644 --- a/src/app/api/super-admin/OfficeFoldersController.ts +++ b/src/app/api/super-admin/OfficeFoldersController.ts @@ -27,7 +27,7 @@ export default class OfficeFoldersController extends ApiController { const officeFolderEntities: OfficeFolders[] = await this.officeFoldersService.get(query); //Hydrate ressource with prisma entity - const officeFolders = OfficeFolder.hydrateArray(OfficeFolder, officeFolderEntities, { + const officeFolders = OfficeFolder.hydrateArray(officeFolderEntities, { strategy: "excludeAll", }); //success @@ -45,14 +45,13 @@ export default class OfficeFoldersController extends ApiController { protected async post(req: Request, response: Response) { try { //init OfficeFolder resource with request body values - const officeFolderEntity = OfficeFolder.hydrate(req.body); - + const officeFolderRessource = OfficeFolder.hydrate(req.body); + await officeFolderRessource.validateOrReject?.({ groups: ["createFolder"] , forbidUnknownValues: false }); //validate folder - await validateOrReject(officeFolderEntity, { groups: ["createFolder"] , forbidUnknownValues: false }); //call service to get prisma entity - const officeFolderEntityCreated = await this.officeFoldersService.create(officeFolderEntity); + const officeFolderEntity = await this.officeFoldersService.create(officeFolderRessource); //Hydrate ressource with prisma entity - const officeFolders = OfficeFolder.hydrate(officeFolderEntityCreated, { + const officeFolders = OfficeFolder.hydrate(officeFolderEntity, { strategy: "excludeAll", }); //success diff --git a/src/app/api/super-admin/OfficesController.ts b/src/app/api/super-admin/OfficesController.ts index dfbe4b1b..86de50f5 100644 --- a/src/app/api/super-admin/OfficesController.ts +++ b/src/app/api/super-admin/OfficesController.ts @@ -24,7 +24,7 @@ export default class OfficesController extends ApiController { //call service to get prisma entity const officesEntities: Offices[] = await this.officesService.get(query); //Hydrate ressource with prisma entity - const offices = OfficeResource.hydrateArray(OfficeResource, officesEntities, { strategy: "excludeAll" }); + const offices = OfficeResource.hydrateArray(officesEntities, { strategy: "excludeAll" }); //success this.httpSuccess(response, offices); } catch (error) { diff --git a/src/app/api/super-admin/UsersController.ts b/src/app/api/super-admin/UsersController.ts index 362b3444..5231ccc1 100644 --- a/src/app/api/super-admin/UsersController.ts +++ b/src/app/api/super-admin/UsersController.ts @@ -27,7 +27,7 @@ export default class UsersController extends ApiController { const usersEntities = await this.usersService.get(query); //Hydrate ressource with prisma entity - const users = User.hydrateArray(User, usersEntities, { strategy: "excludeAll" }); + const users = User.hydrateArray(usersEntities, { strategy: "excludeAll" }); //success this.httpSuccess(response, users); diff --git a/src/common/databases/migrations/20230515140007_v6/migration.sql b/src/common/databases/migrations/20230515140007_v6/migration.sql new file mode 100644 index 00000000..efaf46c5 --- /dev/null +++ b/src/common/databases/migrations/20230515140007_v6/migration.sql @@ -0,0 +1,10 @@ +/* + Warnings: + + - Added the required column `mimetype` to the `files` table without a default value. This is not possible if the table is not empty. + - Added the required column `size` to the `files` table without a default value. This is not possible if the table is not empty. + +*/ +-- AlterTable +ALTER TABLE "files" ADD COLUMN "mimetype" VARCHAR(255) NOT NULL, +ADD COLUMN "size" INTEGER NOT NULL; diff --git a/src/common/repositories/DocumentsRepository.ts b/src/common/repositories/DocumentsRepository.ts index 0c2e3b60..d6e784c9 100644 --- a/src/common/repositories/DocumentsRepository.ts +++ b/src/common/repositories/DocumentsRepository.ts @@ -78,7 +78,7 @@ export default class DocumentsRepository extends BaseRepository { /** * @description : Update data of a document */ - public async update(uid: string, document: Document, refusedReason?: string): Promise { + public async update(uid: string, document: Partial, refusedReason?: string): Promise { return this.model.update({ where: { uid: uid, diff --git a/src/services/super-admin/DocumentsService/DocumentsService.ts b/src/services/super-admin/DocumentsService/DocumentsService.ts index f12e253f..bf7a421b 100644 --- a/src/services/super-admin/DocumentsService/DocumentsService.ts +++ b/src/services/super-admin/DocumentsService/DocumentsService.ts @@ -38,7 +38,7 @@ export default class DocumentsService extends BaseService { * @description : Modify a document * @throws {Error} If document cannot be modified */ - public async update(uid: string, document: Document, refused_reason?: string): Promise { + public async update(uid: string, document: Partial, refused_reason?: string): Promise { return this.documentsRepository.update(uid, document, refused_reason); }