From 6168683cfe2648b341b16730b999a85e9f75007a Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Tue, 11 Jul 2023 11:05:01 +0200 Subject: [PATCH] fix deed middleware --- .../OfficeMembershipHandlers/FolderHandler.ts | 10 +++++----- src/services/super-admin/DeedsService/DeedsService.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/middlewares/OfficeMembershipHandlers/FolderHandler.ts b/src/app/middlewares/OfficeMembershipHandlers/FolderHandler.ts index 2c5a0dfe..d7330a96 100644 --- a/src/app/middlewares/OfficeMembershipHandlers/FolderHandler.ts +++ b/src/app/middlewares/OfficeMembershipHandlers/FolderHandler.ts @@ -2,7 +2,7 @@ import HttpCodes from "@Common/system/controller-pattern/HttpCodes"; import { NextFunction, Request, Response } from "express"; import Container from "typedi"; import OfficeFoldersService from "@Services/super-admin/OfficeFoldersService/OfficeFoldersService"; -import DeedTypesService from "@Services/super-admin/DeedTypesService/DeedTypesService"; +import DeedsService from "@Services/super-admin/DeedsService/DeedsService"; export default async function folderHandler(req: Request, response: Response, next: NextFunction) { const officeId = req.body.user.office_Id; @@ -17,13 +17,13 @@ export default async function folderHandler(req: Request, response: Response, ne } if (deed) { - const deedTypeService = Container.get(DeedTypesService); - const deedTypeWithOffice = await deedTypeService.getByUidWithOffice(deed.deedType.uid!); - if (!deedTypeWithOffice) { + const deedService = Container.get(DeedsService); + const deedWithOffice = await deedService.getByUidWithOffice(deed.uid!); + if (!deedWithOffice) { response.sendStatus(HttpCodes.NOT_FOUND); return; } - if (deedTypeWithOffice.office.uid != officeId) { + if (deedWithOffice.deed_type.office.uid != officeId) { response.sendStatus(HttpCodes.UNAUTHORIZED); return; } diff --git a/src/services/super-admin/DeedsService/DeedsService.ts b/src/services/super-admin/DeedsService/DeedsService.ts index cc7acfe4..82e01e05 100644 --- a/src/services/super-admin/DeedsService/DeedsService.ts +++ b/src/services/super-admin/DeedsService/DeedsService.ts @@ -42,7 +42,7 @@ export default class DeedsService extends BaseService { return this.deedRepository.findOneByUid(uid, query); } - public async getOneByUidWithOffice(uid: string) { + public async getByUidWithOffice(uid: string) { return this.deedRepository.findOneByUidWithOffice(uid); } }