From 7d80f3e13688a5a5cac56cc7f35dd76fd9888073 Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Thu, 6 Jul 2023 14:18:41 +0200 Subject: [PATCH] order services and controllers per namespace --- src/app/api/admin/CustomersController.ts | 17 ++++++++--------- src/app/api/admin/DeedTypesController.ts | 16 ++++++++-------- src/app/api/admin/DeedsController.ts | 16 ++++++++-------- src/app/api/admin/DocumentTypesController.ts | 16 ++++++++-------- src/app/api/admin/DocumentsController.ts | 16 ++++++++-------- src/app/api/admin/FilesController.ts | 12 ++++++++++-- src/app/api/admin/OfficeFoldersController.ts | 16 ++++++++-------- src/app/api/admin/OfficeRolesController.ts | 17 +++++++++-------- src/app/api/admin/OfficesController.ts | 15 ++++++++------- src/app/api/admin/RolesController.ts | 16 ++++++++-------- src/app/api/admin/RulesController.ts | 16 ++++++++-------- src/app/api/admin/UsersController.ts | 17 +++++++++-------- src/app/api/customer/DocumentsController.ts | 16 ++++++++-------- src/app/api/customer/FilesController.ts | 12 ++++++++++-- src/app/api/notary/CustomersController.ts | 16 ++++++++-------- src/app/api/notary/DeedTypesController.ts | 16 ++++++++-------- src/app/api/notary/DeedsController.ts | 16 +++++++--------- src/app/api/notary/DocumentTypesController.ts | 16 ++++++++-------- src/app/api/notary/DocumentsController.ts | 16 ++++++++-------- src/app/api/notary/FilesController.ts | 12 ++++++++++-- src/app/api/notary/OfficeFoldersController.ts | 16 ++++++++-------- src/app/api/notary/OfficeRolesController.ts | 17 +++++++++-------- src/app/api/notary/OfficesController.ts | 17 +++++++++-------- src/app/api/notary/RolesController.ts | 16 ++++++++-------- src/app/api/notary/RulesController.ts | 16 ++++++++-------- src/app/api/notary/UsersController.ts | 17 +++++++++-------- .../api/super-admin/CustomersController.ts | 17 ++++++++--------- .../api/super-admin/DeedTypesController.ts | 17 +++++++++-------- src/app/api/super-admin/DeedsController.ts | 16 ++++++++-------- .../super-admin/DocumentTypesController.ts | 16 ++++++++-------- .../api/super-admin/DocumentsController.ts | 16 ++++++++-------- src/app/api/super-admin/FilesController.ts | 12 ++++++++++-- .../super-admin/OfficeFoldersController.ts | 17 ++++++++++++++--- .../api/super-admin/OfficeRolesController.ts | 19 ++++++++++--------- src/app/api/super-admin/OfficesController.ts | 17 +++++++++-------- src/app/api/super-admin/RolesController.ts | 18 +++++++++--------- src/app/api/super-admin/RulesController.ts | 17 ++++++++--------- src/app/api/super-admin/UsersController.ts | 16 +++++++--------- src/common/repositories/DeedsRepository.ts | 2 +- src/common/repositories/UsersRepository.ts | 2 +- 40 files changed, 328 insertions(+), 283 deletions(-) diff --git a/src/app/api/admin/CustomersController.ts b/src/app/api/admin/CustomersController.ts index 01097a90..455a98a2 100644 --- a/src/app/api/admin/CustomersController.ts +++ b/src/app/api/admin/CustomersController.ts @@ -4,7 +4,6 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import CustomersService from "@Services/admin/CustomersService/CustomersService"; import { Service } from "typedi"; import { Customer } from "le-coffre-resources/dist/Admin"; -import { Customers } from "@prisma/client"; import { validateOrReject } from "class-validator"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; @@ -23,7 +22,10 @@ export default class CustomersController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const customersEntities = await this.customersService.get(query); @@ -117,17 +119,14 @@ export default class CustomersController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let customerEntity: Customers | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - customerEntity = await this.customersService.getByUid(uid, query); - } else { - //call service to get prisma entity - customerEntity = await this.customersService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const customerEntity = await this.customersService.getByUid(uid, query); + if (!customerEntity) { this.httpNotFoundRequest(response, "customer not found"); return; diff --git a/src/app/api/admin/DeedTypesController.ts b/src/app/api/admin/DeedTypesController.ts index 247dca8f..efa9d463 100644 --- a/src/app/api/admin/DeedTypesController.ts +++ b/src/app/api/admin/DeedTypesController.ts @@ -25,7 +25,10 @@ export default class DeedTypesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DeedTypesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DeedTypesWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -127,17 +130,14 @@ export default class DeedTypesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let deedTypeEntity: DeedTypes | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - deedTypeEntity = await this.deedTypesService.getByUid(uid, query); - } else { - //call service to get prisma entity - deedTypeEntity = await this.deedTypesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const deedTypeEntity = await this.deedTypesService.getByUid(uid, query); + if (!deedTypeEntity) { this.httpNotFoundRequest(response, "deed type not found"); return; diff --git a/src/app/api/admin/DeedsController.ts b/src/app/api/admin/DeedsController.ts index c811f309..10da15b8 100644 --- a/src/app/api/admin/DeedsController.ts +++ b/src/app/api/admin/DeedsController.ts @@ -25,7 +25,10 @@ export default class DeedsController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DeedsFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DeedsWhereInput = { deed_type: { office: { uid: officeId } } }; query.where = officeWhereInput; @@ -56,17 +59,14 @@ export default class DeedsController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let deedEntity: Deeds | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - deedEntity = await this.deedsService.getByUid(uid, query); - } else { - //call service to get prisma entity - deedEntity = await this.deedsService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const deedEntity = await this.deedsService.getByUid(uid, query); + if (!deedEntity) { this.httpNotFoundRequest(response, "deed not found"); return; diff --git a/src/app/api/admin/DocumentTypesController.ts b/src/app/api/admin/DocumentTypesController.ts index 1bb2e009..9d170efe 100644 --- a/src/app/api/admin/DocumentTypesController.ts +++ b/src/app/api/admin/DocumentTypesController.ts @@ -25,7 +25,10 @@ export default class DocumentTypesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DocumentTypesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DocumentTypesWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -121,17 +124,14 @@ export default class DocumentTypesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let documentTypeEntity: DocumentTypes | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - documentTypeEntity = await this.documentTypesService.getByUid(uid, query); - } else { - //call service to get prisma entity - documentTypeEntity = await this.documentTypesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const documentTypeEntity = await this.documentTypesService.getByUid(uid, query); + //Hydrate ressource with prisma entity const user = ObjectHydrate.hydrate(new DocumentType(), documentTypeEntity!, { strategy: "excludeAll" }); diff --git a/src/app/api/admin/DocumentsController.ts b/src/app/api/admin/DocumentsController.ts index 854d6ba5..61c45686 100644 --- a/src/app/api/admin/DocumentsController.ts +++ b/src/app/api/admin/DocumentsController.ts @@ -25,7 +25,10 @@ export default class DocumentsController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DocumentsFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DocumentsWhereInput = { document_type: { office: { uid: officeId } } }; query.where = officeWhereInput; @@ -156,17 +159,14 @@ export default class DocumentsController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let documentEntity: Documents | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - documentEntity = await this.documentsService.getByUid(uid, query); - } else { - //call service to get prisma entity - documentEntity = await this.documentsService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const documentEntity = await this.documentsService.getByUid(uid, query); + if (!documentEntity) { this.httpNotFoundRequest(response, "document not found"); return; diff --git a/src/app/api/admin/FilesController.ts b/src/app/api/admin/FilesController.ts index b6fe9050..c7dab853 100644 --- a/src/app/api/admin/FilesController.ts +++ b/src/app/api/admin/FilesController.ts @@ -24,7 +24,10 @@ export default class FilesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.FilesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.FilesWhereInput = { document: { folder: { office: { uid: officeId } } } }; query.where = officeWhereInput; @@ -119,8 +122,13 @@ export default class FilesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } + //get query + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } - const fileEntity = await this.filesService.getByUid(uid); + const fileEntity = await this.filesService.getByUid(uid, query); if (!fileEntity) { this.httpNotFoundRequest(response, "file not found"); diff --git a/src/app/api/admin/OfficeFoldersController.ts b/src/app/api/admin/OfficeFoldersController.ts index 95c79f2e..61130e69 100644 --- a/src/app/api/admin/OfficeFoldersController.ts +++ b/src/app/api/admin/OfficeFoldersController.ts @@ -24,7 +24,10 @@ export default class OfficeFoldersController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.OfficeFoldersFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.OfficeFoldersWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -120,16 +123,13 @@ export default class OfficeFoldersController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let officeFolderEntity: OfficeFolders | null; //get query + let query = {}; if (req.query["q"]) { - const 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); + query = JSON.parse(req.query["q"] as string); } + + const officeFolderEntity = await this.officeFoldersService.getByUid(uid, query); if (!officeFolderEntity) { this.httpNotFoundRequest(response, "folder not found"); diff --git a/src/app/api/admin/OfficeRolesController.ts b/src/app/api/admin/OfficeRolesController.ts index afe5e15d..a8811e26 100644 --- a/src/app/api/admin/OfficeRolesController.ts +++ b/src/app/api/admin/OfficeRolesController.ts @@ -5,7 +5,7 @@ import OfficeRolesService from "@Services/admin/OfficeRolesService/OfficeRolesSe import { Service } from "typedi"; import { validateOrReject } from "class-validator"; import { OfficeRole } from "le-coffre-resources/dist/Admin"; -import { OfficeRoles, Prisma } from "@prisma/client"; +import { Prisma } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; import officeRoleHandler from "@App/middlewares/OfficeMembershipHandlers/OfficeRoleHandler"; @@ -24,7 +24,10 @@ export default class OfficeRolesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.OfficeRolesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.OfficeRolesWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -123,15 +126,13 @@ export default class OfficeRolesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let officeRoleEntity: OfficeRoles | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - officeRoleEntity = await this.officeRolesService.getByUid(uid, query); - } else { - //call service to get prisma entity - officeRoleEntity = await this.officeRolesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + + const officeRoleEntity = await this.officeRolesService.getByUid(uid, query); if (!officeRoleEntity) { this.httpNotFoundRequest(response, "officeRole not found"); diff --git a/src/app/api/admin/OfficesController.ts b/src/app/api/admin/OfficesController.ts index 76c98668..7b7d6df7 100644 --- a/src/app/api/admin/OfficesController.ts +++ b/src/app/api/admin/OfficesController.ts @@ -21,7 +21,10 @@ export default class OfficesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const officesEntities: Offices[] = await this.officesService.get(query); //Hydrate ressource with prisma entity @@ -45,15 +48,13 @@ export default class OfficesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let officeEntity: Offices | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - officeEntity = await this.officesService.getByUid(uid, query); - } else { - //call service to get prisma entity - officeEntity = await this.officesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + + const officeEntity = await this.officesService.getByUid(uid, query); if (!officeEntity) { this.httpNotFoundRequest(response, "office not found"); diff --git a/src/app/api/admin/RolesController.ts b/src/app/api/admin/RolesController.ts index b587ce3d..e40eb0f5 100644 --- a/src/app/api/admin/RolesController.ts +++ b/src/app/api/admin/RolesController.ts @@ -4,7 +4,6 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import RolesService from "@Services/admin/RolesService/RolesService"; import { Service } from "typedi"; import { Role } from "le-coffre-resources/dist/Admin"; -import { Roles } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; @@ -22,7 +21,10 @@ export default class RolesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const rolesEntities = await this.rolesService.get(query); @@ -49,16 +51,14 @@ export default class RolesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let roleEntity: Roles | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - roleEntity = await this.rolesService.getByUid(uid, query); - } else { - //call service to get prisma entity - roleEntity = await this.rolesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const roleEntity = await this.rolesService.getByUid(uid, query); + if (!roleEntity) { this.httpNotFoundRequest(response, "role not found"); return; diff --git a/src/app/api/admin/RulesController.ts b/src/app/api/admin/RulesController.ts index 49641e09..51bc900e 100644 --- a/src/app/api/admin/RulesController.ts +++ b/src/app/api/admin/RulesController.ts @@ -4,7 +4,6 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import RulesService from "@Services/admin/RulesService/RulesService"; import { Service } from "typedi"; import { Rule } from "le-coffre-resources/dist/Admin"; -import { Rules } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; @@ -22,7 +21,10 @@ export default class RulesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const rulesEntities = await this.rulesService.get(query); @@ -49,16 +51,14 @@ export default class RulesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let ruleEntity: Rules | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - ruleEntity = await this.rulesService.getByUid(uid, query); - } else { - //call service to get prisma entity - ruleEntity = await this.rulesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const ruleEntity = await this.rulesService.getByUid(uid, query); + if (!ruleEntity) { this.httpNotFoundRequest(response, "rule not found"); return; diff --git a/src/app/api/admin/UsersController.ts b/src/app/api/admin/UsersController.ts index 941dc67f..282820d8 100644 --- a/src/app/api/admin/UsersController.ts +++ b/src/app/api/admin/UsersController.ts @@ -4,7 +4,7 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import UsersService from "@Services/admin/UsersService/UsersService"; import { Service } from "typedi"; import User from "le-coffre-resources/dist/Admin"; -import { Prisma, Users } from "@prisma/client"; +import { Prisma } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; import userHandler from "@App/middlewares/OfficeMembershipHandlers/UserHandler"; @@ -23,7 +23,10 @@ export default class UsersController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.UsersFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.UsersWhereInput = { office_membership: { uid: officeId } }; query.where = officeWhereInput; @@ -53,16 +56,14 @@ export default class UsersController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let userEntity: Users | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - userEntity = await this.usersService.getByUid(uid, query); - } else { - //call service to get prisma entity - userEntity = await this.usersService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const userEntity = await this.usersService.getByUid(uid, query); + if (!userEntity) { this.httpNotFoundRequest(response, "user not found"); return; diff --git a/src/app/api/customer/DocumentsController.ts b/src/app/api/customer/DocumentsController.ts index eca88301..018918be 100644 --- a/src/app/api/customer/DocumentsController.ts +++ b/src/app/api/customer/DocumentsController.ts @@ -23,7 +23,10 @@ export default class DocumentsController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.CustomersFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const customerId: string = req.body.user.customerId; const customerWhereInput: Prisma.DocumentsWhereInput ={ depositor: { uid: customerId } }; query.where = customerWhereInput; @@ -53,17 +56,14 @@ export default class DocumentsController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let documentEntity: Documents | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - documentEntity = await this.documentsService.getByUid(uid, query); - } else { - //call service to get prisma entity - documentEntity = await this.documentsService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const documentEntity = await this.documentsService.getByUid(uid, query); + if (!documentEntity) { this.httpNotFoundRequest(response, "document not found"); return; diff --git a/src/app/api/customer/FilesController.ts b/src/app/api/customer/FilesController.ts index ca3ee229..9993e8c7 100644 --- a/src/app/api/customer/FilesController.ts +++ b/src/app/api/customer/FilesController.ts @@ -26,7 +26,10 @@ export default class FilesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.FilesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const customerId: string = req.body.user.customerId; const customerWhereInput: Prisma.FilesWhereInput = { document: { depositor: { uid: customerId } } }; query.where = customerWhereInput; @@ -198,8 +201,13 @@ export default class FilesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } + //get query + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } - const fileEntity = await this.filesService.getByUid(uid); + const fileEntity = await this.filesService.getByUid(uid, query); if (!fileEntity) { this.httpNotFoundRequest(response, "file not found"); diff --git a/src/app/api/notary/CustomersController.ts b/src/app/api/notary/CustomersController.ts index f1372d8b..fcc50a29 100644 --- a/src/app/api/notary/CustomersController.ts +++ b/src/app/api/notary/CustomersController.ts @@ -4,7 +4,6 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import CustomersService from "@Services/notary/CustomersService/CustomersService"; import { Service } from "typedi"; import { Customer } from "le-coffre-resources/dist/Notary"; -import { Customers } from "@prisma/client"; import { validateOrReject } from "class-validator"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; @@ -23,7 +22,10 @@ export default class CustomersController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const customersEntities = await this.customersService.get(query); @@ -118,16 +120,14 @@ export default class CustomersController extends ApiController { return; } - let customerEntity: Customers | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - customerEntity = await this.customersService.getByUid(uid, query); - } else { - //call service to get prisma entity - customerEntity = await this.customersService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const customerEntity = await this.customersService.getByUid(uid, query); + if (!customerEntity) { this.httpNotFoundRequest(response, "customer not found"); return; diff --git a/src/app/api/notary/DeedTypesController.ts b/src/app/api/notary/DeedTypesController.ts index 0ea44863..549fb6c8 100644 --- a/src/app/api/notary/DeedTypesController.ts +++ b/src/app/api/notary/DeedTypesController.ts @@ -25,7 +25,10 @@ export default class DeedTypesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DeedTypesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DeedTypesWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -127,17 +130,14 @@ export default class DeedTypesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let deedTypeEntity: DeedTypes | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - deedTypeEntity = await this.deedTypesService.getByUid(uid, query); - } else { - //call service to get prisma entity - deedTypeEntity = await this.deedTypesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const deedTypeEntity = await this.deedTypesService.getByUid(uid, query); + if (!deedTypeEntity) { this.httpNotFoundRequest(response, "deed type not found"); return; diff --git a/src/app/api/notary/DeedsController.ts b/src/app/api/notary/DeedsController.ts index 8ac0d98b..45e08915 100644 --- a/src/app/api/notary/DeedsController.ts +++ b/src/app/api/notary/DeedsController.ts @@ -25,7 +25,10 @@ export default class DeedsController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DeedsFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DeedsWhereInput = { deed_type: { office: { uid: officeId } } }; query.where = officeWhereInput; @@ -56,16 +59,11 @@ export default class DeedsController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let deedEntity: Deeds | null; - //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - deedEntity = await this.deedsService.getByUid(uid, query); - } else { - //call service to get prisma entity - deedEntity = await this.deedsService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const deedEntity = await this.deedsService.getByUid(uid, query); if (!deedEntity) { this.httpNotFoundRequest(response, "deed not found"); diff --git a/src/app/api/notary/DocumentTypesController.ts b/src/app/api/notary/DocumentTypesController.ts index 4cc25b5a..6bdbe117 100644 --- a/src/app/api/notary/DocumentTypesController.ts +++ b/src/app/api/notary/DocumentTypesController.ts @@ -25,7 +25,10 @@ export default class DocumentTypesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DocumentTypesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DocumentTypesWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -121,17 +124,14 @@ export default class DocumentTypesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let documentTypeEntity: DocumentTypes | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - documentTypeEntity = await this.documentTypesService.getByUid(uid, query); - } else { - //call service to get prisma entity - documentTypeEntity = await this.documentTypesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const documentTypeEntity = await this.documentTypesService.getByUid(uid, query); + //Hydrate ressource with prisma entity const user = ObjectHydrate.hydrate(new DocumentType(), documentTypeEntity!, { strategy: "excludeAll" }); diff --git a/src/app/api/notary/DocumentsController.ts b/src/app/api/notary/DocumentsController.ts index b6b35314..41e53c10 100644 --- a/src/app/api/notary/DocumentsController.ts +++ b/src/app/api/notary/DocumentsController.ts @@ -25,7 +25,10 @@ export default class DocumentsController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DocumentsFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DocumentsWhereInput = { document_type: { office: { uid: officeId } } }; query.where = officeWhereInput; @@ -156,17 +159,14 @@ export default class DocumentsController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let documentEntity: Documents | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - documentEntity = await this.documentsService.getByUid(uid, query); - } else { - //call service to get prisma entity - documentEntity = await this.documentsService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const documentEntity = await this.documentsService.getByUid(uid, query); + if (!documentEntity) { this.httpNotFoundRequest(response, "document not found"); return; diff --git a/src/app/api/notary/FilesController.ts b/src/app/api/notary/FilesController.ts index 5e32a319..fcd15ccd 100644 --- a/src/app/api/notary/FilesController.ts +++ b/src/app/api/notary/FilesController.ts @@ -24,7 +24,10 @@ export default class FilesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.FilesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.FilesWhereInput = { document: { folder: { office: { uid: officeId } } } }; query.where = officeWhereInput; @@ -119,8 +122,13 @@ export default class FilesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } + //get query + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } - const fileEntity = await this.filesService.getByUid(uid); + const fileEntity = await this.filesService.getByUid(uid, query); if (!fileEntity) { this.httpNotFoundRequest(response, "file not found"); diff --git a/src/app/api/notary/OfficeFoldersController.ts b/src/app/api/notary/OfficeFoldersController.ts index 2468dcb8..255540d7 100644 --- a/src/app/api/notary/OfficeFoldersController.ts +++ b/src/app/api/notary/OfficeFoldersController.ts @@ -24,7 +24,10 @@ export default class OfficeFoldersController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.OfficeFoldersFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.OfficeFoldersWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -120,17 +123,14 @@ export default class OfficeFoldersController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - - let officeFolderEntity: OfficeFolders | null; //get query + let query = {}; if (req.query["q"]) { - const 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); + query = JSON.parse(req.query["q"] as string); } + const officeFolderEntity = await this.officeFoldersService.getByUid(uid, query); + if (!officeFolderEntity) { this.httpNotFoundRequest(response, "folder not found"); return; diff --git a/src/app/api/notary/OfficeRolesController.ts b/src/app/api/notary/OfficeRolesController.ts index c351741b..99c02cec 100644 --- a/src/app/api/notary/OfficeRolesController.ts +++ b/src/app/api/notary/OfficeRolesController.ts @@ -4,7 +4,7 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import OfficeRolesService from "@Services/notary/OfficeRolesService/OfficeRolesService"; import { Service } from "typedi"; import { OfficeRole } from "le-coffre-resources/dist/Notary"; -import { OfficeRoles, Prisma } from "@prisma/client"; +import { Prisma } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; import officeRoleHandler from "@App/middlewares/OfficeMembershipHandlers/OfficeRoleHandler"; @@ -23,7 +23,10 @@ export default class OfficeRolesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.OfficeRolesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.OfficeRolesWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -53,16 +56,14 @@ export default class OfficeRolesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let officeRoleEntity: OfficeRoles | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - officeRoleEntity = await this.officeRolesService.getByUid(uid, query); - } else { - //call service to get prisma entity - officeRoleEntity = await this.officeRolesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const officeRoleEntity = await this.officeRolesService.getByUid(uid, query); + if (!officeRoleEntity) { this.httpNotFoundRequest(response, "officeRole not found"); return; diff --git a/src/app/api/notary/OfficesController.ts b/src/app/api/notary/OfficesController.ts index eef0066a..84f31110 100644 --- a/src/app/api/notary/OfficesController.ts +++ b/src/app/api/notary/OfficesController.ts @@ -21,7 +21,10 @@ export default class OfficesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const officesEntities: Offices[] = await this.officesService.get(query); //Hydrate ressource with prisma entity @@ -33,7 +36,7 @@ export default class OfficesController extends ApiController { return; } } - + /** * @description Get a specific office by uid */ @@ -45,16 +48,14 @@ export default class OfficesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let officeEntity: Offices | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - officeEntity = await this.officesService.getByUid(uid, query); - } else { - //call service to get prisma entity - officeEntity = await this.officesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const officeEntity = await this.officesService.getByUid(uid, query); + if (!officeEntity) { this.httpNotFoundRequest(response, "office not found"); return; diff --git a/src/app/api/notary/RolesController.ts b/src/app/api/notary/RolesController.ts index 15d3711c..dc74ced8 100644 --- a/src/app/api/notary/RolesController.ts +++ b/src/app/api/notary/RolesController.ts @@ -4,7 +4,6 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import RolesService from "@Services/notary/RolesService/RolesService"; import { Service } from "typedi"; import { Role } from "le-coffre-resources/dist/Notary"; -import { Roles } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; @@ -22,7 +21,10 @@ export default class RolesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const rolesEntities = await this.rolesService.get(query); @@ -49,16 +51,14 @@ export default class RolesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let roleEntity: Roles | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - roleEntity = await this.rolesService.getByUid(uid, query); - } else { - //call service to get prisma entity - roleEntity = await this.rolesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const roleEntity = await this.rolesService.getByUid(uid, query); + if (!roleEntity) { this.httpNotFoundRequest(response, "role not found"); return; diff --git a/src/app/api/notary/RulesController.ts b/src/app/api/notary/RulesController.ts index 773ba05a..fd822e3b 100644 --- a/src/app/api/notary/RulesController.ts +++ b/src/app/api/notary/RulesController.ts @@ -4,7 +4,6 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import RulesService from "@Services/notary/RulesService/RulesService"; import { Service } from "typedi"; import { Rule } from "le-coffre-resources/dist/Notary"; -import { Rules } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; @@ -22,7 +21,10 @@ export default class RulesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const rulesEntities = await this.rulesService.get(query); @@ -49,16 +51,14 @@ export default class RulesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let ruleEntity: Rules | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - ruleEntity = await this.rulesService.getByUid(uid, query); - } else { - //call service to get prisma entity - ruleEntity = await this.rulesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const ruleEntity = await this.rulesService.getByUid(uid, query); + if (!ruleEntity) { this.httpNotFoundRequest(response, "rule not found"); return; diff --git a/src/app/api/notary/UsersController.ts b/src/app/api/notary/UsersController.ts index c2836a60..a3d74952 100644 --- a/src/app/api/notary/UsersController.ts +++ b/src/app/api/notary/UsersController.ts @@ -4,7 +4,7 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import UsersService from "@Services/notary/UsersService/UsersService"; import { Service } from "typedi"; import User from "le-coffre-resources/dist/Notary"; -import { Prisma, Users } from "@prisma/client"; +import { Prisma } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; import userHandler from "@App/middlewares/OfficeMembershipHandlers/UserHandler"; @@ -23,7 +23,10 @@ export default class UsersController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.UsersFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.UsersWhereInput = { office_membership: { uid: officeId } }; query.where = officeWhereInput; @@ -53,16 +56,14 @@ export default class UsersController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let userEntity: Users | null; //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - userEntity = await this.usersService.getByUid(uid, query); - } else { - //call service to get prisma entity - userEntity = await this.usersService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const userEntity = await this.usersService.getByUid(uid, query); + if (!userEntity) { this.httpNotFoundRequest(response, "user not found"); return; diff --git a/src/app/api/super-admin/CustomersController.ts b/src/app/api/super-admin/CustomersController.ts index ca108b25..271988ea 100644 --- a/src/app/api/super-admin/CustomersController.ts +++ b/src/app/api/super-admin/CustomersController.ts @@ -4,7 +4,6 @@ import ApiController from "@Common/system/controller-pattern/ApiController"; import CustomersService from "@Services/super-admin/CustomersService/CustomersService"; import { Service } from "typedi"; import { Customer } from "le-coffre-resources/dist/SuperAdmin"; -import { Customers } from "@prisma/client"; import { validateOrReject } from "class-validator"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; @@ -23,7 +22,10 @@ export default class CustomersController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const customersEntities = await this.customersService.get(query); @@ -118,15 +120,12 @@ export default class CustomersController extends ApiController { return; } - let customerEntity: Customers | null; - //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - customerEntity = await this.customersService.getByUid(uid, query); - } else { - //call service to get prisma entity - customerEntity = await this.customersService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + + const customerEntity = await this.customersService.getByUid(uid, query); if (!customerEntity) { this.httpNotFoundRequest(response, "customer not found"); diff --git a/src/app/api/super-admin/DeedTypesController.ts b/src/app/api/super-admin/DeedTypesController.ts index 40de058e..7eee309f 100644 --- a/src/app/api/super-admin/DeedTypesController.ts +++ b/src/app/api/super-admin/DeedTypesController.ts @@ -25,7 +25,10 @@ export default class DeedTypesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DeedTypesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DeedTypesWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -128,16 +131,14 @@ export default class DeedTypesController extends ApiController { return; } - let deedTypeEntity: DeedTypes | null; - //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - deedTypeEntity = await this.deedTypesService.getByUid(uid, query); - } else { - //call service to get prisma entity - deedTypeEntity = await this.deedTypesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const deedTypeEntity = await this.deedTypesService.getByUid(uid, query); + + if (!deedTypeEntity) { this.httpNotFoundRequest(response, "deed type not found"); return; diff --git a/src/app/api/super-admin/DeedsController.ts b/src/app/api/super-admin/DeedsController.ts index a2d8eb2e..d563acea 100644 --- a/src/app/api/super-admin/DeedsController.ts +++ b/src/app/api/super-admin/DeedsController.ts @@ -25,7 +25,10 @@ export default class DeedsController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DeedsFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DeedsWhereInput = { deed_type: { office: { uid: officeId } } }; query.where = officeWhereInput; @@ -57,16 +60,13 @@ export default class DeedsController extends ApiController { return; } - let deedEntity: Deeds | null; - //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - deedEntity = await this.deedsService.getByUid(uid, query); - } else { - //call service to get prisma entity - deedEntity = await this.deedsService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const deedEntity = await this.deedsService.getByUid(uid, query); + if (!deedEntity) { this.httpNotFoundRequest(response, "deed not found"); return; diff --git a/src/app/api/super-admin/DocumentTypesController.ts b/src/app/api/super-admin/DocumentTypesController.ts index 5690a57a..353d6041 100644 --- a/src/app/api/super-admin/DocumentTypesController.ts +++ b/src/app/api/super-admin/DocumentTypesController.ts @@ -25,7 +25,10 @@ export default class DocumentTypesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DocumentTypesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DocumentTypesWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -122,15 +125,12 @@ export default class DocumentTypesController extends ApiController { return; } - let documentTypeEntity: DocumentTypes | null; - //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - documentTypeEntity = await this.documentTypesService.getByUid(uid, query); - } else { - //call service to get prisma entity - documentTypeEntity = await this.documentTypesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + + const documentTypeEntity = await this.documentTypesService.getByUid(uid, query); //Hydrate ressource with prisma entity const user = ObjectHydrate.hydrate(new DocumentType(), documentTypeEntity!, { strategy: "excludeAll" }); diff --git a/src/app/api/super-admin/DocumentsController.ts b/src/app/api/super-admin/DocumentsController.ts index e9644829..317500b2 100644 --- a/src/app/api/super-admin/DocumentsController.ts +++ b/src/app/api/super-admin/DocumentsController.ts @@ -25,7 +25,10 @@ export default class DocumentsController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.DocumentsFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.DocumentsWhereInput = { document_type: { office: { uid: officeId } } }; query.where = officeWhereInput; @@ -157,15 +160,12 @@ export default class DocumentsController extends ApiController { return; } - let documentEntity: Documents | null; - //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - documentEntity = await this.documentsService.getByUid(uid, query); - } else { - //call service to get prisma entity - documentEntity = await this.documentsService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + + const documentEntity = await this.documentsService.getByUid(uid, query); if (!documentEntity) { this.httpNotFoundRequest(response, "document not found"); diff --git a/src/app/api/super-admin/FilesController.ts b/src/app/api/super-admin/FilesController.ts index 78b99b4c..ed2572b2 100644 --- a/src/app/api/super-admin/FilesController.ts +++ b/src/app/api/super-admin/FilesController.ts @@ -24,7 +24,10 @@ export default class FilesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.FilesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.FilesWhereInput = { document: { folder: { office: { uid: officeId } } } }; query.where = officeWhereInput; @@ -120,7 +123,12 @@ export default class FilesController extends ApiController { return; } - const fileEntity = await this.filesService.getByUid(uid); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } + + const fileEntity = await this.filesService.getByUid(uid, query); if (!fileEntity) { this.httpNotFoundRequest(response, "file not found"); diff --git a/src/app/api/super-admin/OfficeFoldersController.ts b/src/app/api/super-admin/OfficeFoldersController.ts index 259250a4..9013a741 100644 --- a/src/app/api/super-admin/OfficeFoldersController.ts +++ b/src/app/api/super-admin/OfficeFoldersController.ts @@ -24,7 +24,10 @@ export default class OfficeFoldersController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.OfficeFoldersFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.OfficeFoldersWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -79,7 +82,12 @@ export default class OfficeFoldersController extends ApiController { return; } - const officeFolderFound = await this.officeFoldersService.getByUid(uid); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } + + const officeFolderFound = await this.officeFoldersService.getByUid(uid, query); if (!officeFolderFound) { this.httpNotFoundRequest(response, "office folder not found"); @@ -124,7 +132,10 @@ export default class OfficeFoldersController extends ApiController { let officeFolderEntity: OfficeFolders | null; //get query if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); + 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 diff --git a/src/app/api/super-admin/OfficeRolesController.ts b/src/app/api/super-admin/OfficeRolesController.ts index ae2702f7..e1e8cf58 100644 --- a/src/app/api/super-admin/OfficeRolesController.ts +++ b/src/app/api/super-admin/OfficeRolesController.ts @@ -5,7 +5,7 @@ import OfficeRolesService from "@Services/super-admin/OfficeRolesService/OfficeR import { Service } from "typedi"; import { validateOrReject } from "class-validator"; import { OfficeRole } from "le-coffre-resources/dist/SuperAdmin"; -import { OfficeRoles, Prisma } from "@prisma/client"; +import { Prisma } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; import officeRoleHandler from "@App/middlewares/OfficeMembershipHandlers/OfficeRoleHandler"; @@ -24,7 +24,10 @@ export default class OfficeRolesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query: Prisma.OfficeRolesFindManyArgs = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } const officeId: string = req.body.user.office_Id; const officeWhereInput: Prisma.OfficeRolesWhereInput = { office: { uid: officeId } }; query.where = officeWhereInput; @@ -123,16 +126,14 @@ export default class OfficeRolesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let officeRoleEntity: OfficeRoles | null; - //get query + + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - officeRoleEntity = await this.officeRolesService.getByUid(uid, query); - } else { - //call service to get prisma entity - officeRoleEntity = await this.officeRolesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const officeRoleEntity = await this.officeRolesService.getByUid(uid, query); + if (!officeRoleEntity) { this.httpNotFoundRequest(response, "officeRole not found"); return; diff --git a/src/app/api/super-admin/OfficesController.ts b/src/app/api/super-admin/OfficesController.ts index 9a282bfd..4803204c 100644 --- a/src/app/api/super-admin/OfficesController.ts +++ b/src/app/api/super-admin/OfficesController.ts @@ -22,7 +22,10 @@ export default class OfficesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const officesEntities: Offices[] = await this.officesService.get(query); //Hydrate ressource with prisma entity @@ -103,16 +106,14 @@ export default class OfficesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let officeEntity: Offices | null; - //get query + + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - officeEntity = await this.officesService.getByUid(uid, query); - } else { - //call service to get prisma entity - officeEntity = await this.officesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const officeEntity = await this.officesService.getByUid(uid, query); + if (!officeEntity) { this.httpNotFoundRequest(response, "office not found"); return; diff --git a/src/app/api/super-admin/RolesController.ts b/src/app/api/super-admin/RolesController.ts index e5c774e5..f5f1924d 100644 --- a/src/app/api/super-admin/RolesController.ts +++ b/src/app/api/super-admin/RolesController.ts @@ -5,7 +5,6 @@ import RolesService from "@Services/super-admin/RolesService/RolesService"; import { Service } from "typedi"; import { validateOrReject } from "class-validator"; import { Role } from "le-coffre-resources/dist/SuperAdmin"; -import { Roles } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; @@ -23,7 +22,10 @@ export default class RolesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const rolesEntities = await this.rolesService.get(query); @@ -119,16 +121,14 @@ export default class RolesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let roleEntity: Roles | null; - //get query + + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - roleEntity = await this.rolesService.getByUid(uid, query); - } else { - //call service to get prisma entity - roleEntity = await this.rolesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const roleEntity = await this.rolesService.getByUid(uid, query); + if (!roleEntity) { this.httpNotFoundRequest(response, "role not found"); return; diff --git a/src/app/api/super-admin/RulesController.ts b/src/app/api/super-admin/RulesController.ts index 9555cef8..09b0995d 100644 --- a/src/app/api/super-admin/RulesController.ts +++ b/src/app/api/super-admin/RulesController.ts @@ -5,7 +5,6 @@ import RulesService from "@Services/super-admin/RulesService/RulesService"; import { Service } from "typedi"; import { validateOrReject } from "class-validator"; import { Rule } from "le-coffre-resources/dist/SuperAdmin"; -import { Rules } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; @@ -23,7 +22,10 @@ export default class RulesController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const rulesEntities = await this.rulesService.get(query); @@ -119,16 +121,13 @@ export default class RulesController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let ruleEntity: Rules | null; - //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - ruleEntity = await this.rulesService.getByUid(uid, query); - } else { - //call service to get prisma entity - ruleEntity = await this.rulesService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const ruleEntity = await this.rulesService.getByUid(uid, query); + if (!ruleEntity) { this.httpNotFoundRequest(response, "rule not found"); return; diff --git a/src/app/api/super-admin/UsersController.ts b/src/app/api/super-admin/UsersController.ts index 3a4e620e..b4b84a47 100644 --- a/src/app/api/super-admin/UsersController.ts +++ b/src/app/api/super-admin/UsersController.ts @@ -5,7 +5,6 @@ import UsersService from "@Services/super-admin/UsersService/UsersService"; import { Service } from "typedi"; import { validateOrReject } from "class-validator"; import User from "le-coffre-resources/dist/SuperAdmin"; -import { Users } from "@prisma/client"; import authHandler from "@App/middlewares/AuthHandler"; import ruleHandler from "@App/middlewares/RulesHandler"; @@ -23,7 +22,10 @@ export default class UsersController extends ApiController { protected async get(req: Request, response: Response) { try { //get query - const query = JSON.parse(req.query["q"] as string); + let query = {}; + if (req.query["q"]) { + query = JSON.parse(req.query["q"] as string); + } //call service to get prisma entity const usersEntities = await this.usersService.get(query); @@ -119,15 +121,11 @@ export default class UsersController extends ApiController { this.httpBadRequest(response, "No uid provided"); return; } - let userEntity: Users | null; - //get query + let query = {}; if (req.query["q"]) { - const query = JSON.parse(req.query["q"] as string); - userEntity = await this.usersService.getByUid(uid, query); - } else { - //call service to get prisma entity - userEntity = await this.usersService.getByUid(uid); + query = JSON.parse(req.query["q"] as string); } + const userEntity = await this.usersService.getByUid(uid, query); if (!userEntity) { this.httpNotFoundRequest(response, "user not found"); diff --git a/src/common/repositories/DeedsRepository.ts b/src/common/repositories/DeedsRepository.ts index e9501210..bc86c149 100644 --- a/src/common/repositories/DeedsRepository.ts +++ b/src/common/repositories/DeedsRepository.ts @@ -82,7 +82,7 @@ export default class DeedsRepository extends BaseRepository { /** * @description : Find unique deed */ - public async findOneByUid(uid: string, query?: Prisma.DeedsInclude) { + public async findOneByUid(uid: string, query?: Prisma.DeedsInclude): Promise { return this.model.findUnique({ where: { uid: uid, diff --git a/src/common/repositories/UsersRepository.ts b/src/common/repositories/UsersRepository.ts index b43d0a8f..99d36eb1 100644 --- a/src/common/repositories/UsersRepository.ts +++ b/src/common/repositories/UsersRepository.ts @@ -145,7 +145,7 @@ export default class UsersRepository extends BaseRepository { /** * @description : Find one user */ - public async findOneByUid(uid: string, query?: Prisma.UsersInclude) { + public async findOneByUid(uid: string, query?: Prisma.UsersInclude): Promise { return this.model.findUnique({ where: { uid: uid,