diff --git a/src/app/api/customer/FilesController.ts b/src/app/api/customer/FilesController.ts index 9993e8c7..61cbddb3 100644 --- a/src/app/api/customer/FilesController.ts +++ b/src/app/api/customer/FilesController.ts @@ -7,7 +7,7 @@ import { Files, Prisma } from "@prisma/client"; import { File } from "le-coffre-resources/dist/Customer"; import { Document } from "le-coffre-resources/dist/Customer"; import { validateOrReject } from "class-validator"; -import DocumentsService from "@Services/super-admin/DocumentsService/DocumentsService"; +import DocumentsService from "@Services/customer/DocumentsService/DocumentsService"; import authHandler from "@App/middlewares/AuthHandler"; import fileHandler from "@App/middlewares/CustomerHandler/FileHandler"; diff --git a/src/app/api/super-admin/OfficeFoldersController.ts b/src/app/api/super-admin/OfficeFoldersController.ts index 9013a741..73b74ceb 100644 --- a/src/app/api/super-admin/OfficeFoldersController.ts +++ b/src/app/api/super-admin/OfficeFoldersController.ts @@ -129,18 +129,12 @@ export default class OfficeFoldersController extends ApiController { return; } - let officeFolderEntity: OfficeFolders | null; - //get query - if (req.query["q"]) { - let query = {}; + let query = {}; if (req.query["q"]) { query = JSON.parse(req.query["q"] as string); } - officeFolderEntity = await this.officeFoldersService.getByUid(uid, query); - } else { - //call service to get prisma entity - officeFolderEntity = await this.officeFoldersService.getByUid(uid); - } + + const officeFolderEntity = await this.officeFoldersService.getByUid(uid, query); if (!officeFolderEntity) { this.httpNotFoundRequest(response, "folder not found"); diff --git a/src/common/repositories/DocumentsRepository.ts b/src/common/repositories/DocumentsRepository.ts index 98b66e1b..c5110e6d 100644 --- a/src/common/repositories/DocumentsRepository.ts +++ b/src/common/repositories/DocumentsRepository.ts @@ -3,6 +3,7 @@ import BaseRepository from "@Repositories/BaseRepository"; import { Service } from "typedi"; import { Documents, EDocumentStatus, Prisma } from "@prisma/client"; import { Document } from "le-coffre-resources/dist/SuperAdmin"; +import { Document as DocumentCustomer } from "le-coffre-resources/dist/Customer"; @Service() export default class DocumentsRepository extends BaseRepository { @@ -94,7 +95,7 @@ export default class DocumentsRepository extends BaseRepository { /** * @description : Update data of a document */ - public async update(uid: string, document: Partial, 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/customer/DocumentsService/DocumentsService.ts b/src/services/customer/DocumentsService/DocumentsService.ts index a3cc2e16..26c45c6a 100644 --- a/src/services/customer/DocumentsService/DocumentsService.ts +++ b/src/services/customer/DocumentsService/DocumentsService.ts @@ -18,22 +18,6 @@ export default class DocumentsService extends BaseService { return this.documentsRepository.findMany(query); } - /** - * @description : Create a new document - * @throws {Error} If document cannot be created - */ - public async create(document: Document): Promise { - return this.documentsRepository.create(document); - } - - /** - * @description : Create new documents - * @throws {Error} If documents or one of them cannot be created - */ - public async createMany(documents: Document[]): Promise { - return this.documentsRepository.createMany(documents); - } - /** * @description : Modify a document * @throws {Error} If document cannot be modified @@ -42,14 +26,6 @@ export default class DocumentsService extends BaseService { return this.documentsRepository.update(uid, document); } - /** - * @description : Delete a document - * @throws {Error} If document cannot be deleted - */ - public async delete(uid: string): Promise { - return this.documentsRepository.delete(uid); - } - /** * @description : Get a document by uid * @throws {Error} If document cannot be get by uid diff --git a/src/test/config/MockedData.ts b/src/test/config/MockedData.ts index 89292170..8496964a 100644 --- a/src/test/config/MockedData.ts +++ b/src/test/config/MockedData.ts @@ -1,4 +1,4 @@ -import { EOfficeStatus } from "le-coffre-resources/dist/Customer/Office"; +import { EOfficeStatus } from "le-coffre-resources/dist/Notary/Office"; import User, { Address, Contact, Office, DeedType, DocumentType, Customer, OfficeFolder, Deed } from "le-coffre-resources/dist/SuperAdmin"; export const userAddress: Address = {