hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-06-11 16:33:51 +07:00
parent de27e1941b
commit 644a1e9b5d
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/controllers/AuthRoleAttrController.ts
View file

@ -16,7 +16,6 @@ import { RequestWithUser } from "../middlewares/user";
import HttpError from "../interfaces/http-error"; import HttpError from "../interfaces/http-error";
import HttpStatus from "../interfaces/http-status"; import HttpStatus from "../interfaces/http-status";
import HttpSuccess from "../interfaces/http-success"; import HttpSuccess from "../interfaces/http-success";
import HttpStatusCode from "../interfaces/http-status";
import { AuthRoleAttr, CreateAuthRoleAttr, UpdateAuthRoleAttr } from "../entities/AuthRoleAttr"; import { AuthRoleAttr, CreateAuthRoleAttr, UpdateAuthRoleAttr } from "../entities/AuthRoleAttr";
import { AuthRole } from "../entities/AuthRole"; import { AuthRole } from "../entities/AuthRole";
import { AuthSys } from "../entities/AuthSys"; import { AuthSys } from "../entities/AuthSys";
@ -111,15 +110,7 @@ export class AuthRoleAttrController extends Controller {
@Delete("{roleAttrId}") @Delete("{roleAttrId}")
public async deleteRole(@Path() roleAttrId: string) { public async deleteRole(@Path() roleAttrId: string) {
let result: any; const result = await this.authRoleAttrRepo.delete({ id: roleAttrId });
try {
result = await this.authRoleAttrRepo.delete({ id: roleAttrId });
} catch {
throw new HttpError(
HttpStatusCode.NOT_FOUND,
"ไม่สามารถลบข้อมูลได้",
);
}
if (result.affected == undefined || result.affected <= 0) if (result.affected == undefined || result.affected <= 0)
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล"); throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");

10
src/controllers/AuthRoleController.ts
View file

@ -16,6 +16,7 @@ import { RequestWithUser } from "../middlewares/user";
import HttpError from "../interfaces/http-error"; import HttpError from "../interfaces/http-error";
import HttpStatus from "../interfaces/http-status"; import HttpStatus from "../interfaces/http-status";
import HttpSuccess from "../interfaces/http-success"; import HttpSuccess from "../interfaces/http-success";
import HttpStatusCode from "../interfaces/http-status";
import { AuthRole, CreateAuthRole, UpdateAuthRole } from "../entities/AuthRole"; import { AuthRole, CreateAuthRole, UpdateAuthRole } from "../entities/AuthRole";
@Route("api/v1/org/auth/authRole") @Route("api/v1/org/auth/authRole")
@ -44,7 +45,6 @@ export class AuthRoleController extends Controller {
@Post() @Post()
public async newAuthRole(@Request() req: RequestWithUser, @Body() body: CreateAuthRole) { public async newAuthRole(@Request() req: RequestWithUser, @Body() body: CreateAuthRole) {
const data = new AuthRole(); const data = new AuthRole();
const meta = { const meta = {
createdUserId: req.user.sub, createdUserId: req.user.sub,
@ -78,8 +78,12 @@ export class AuthRoleController extends Controller {
@Delete("{roleId}") @Delete("{roleId}")
public async deleteRole(@Path() roleId: string) { public async deleteRole(@Path() roleId: string) {
const result = await this.authRoleRepo.delete({ id: roleId }); let result: any;
try {
result = await this.authRoleRepo.delete({ id: roleId });
} catch {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่สามารถลบข้อมูลได้");
}
if (result.affected == undefined || result.affected <= 0) if (result.affected == undefined || result.affected <= 0)
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล"); throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");