update service user related
This commit is contained in:
@ -4,13 +4,12 @@ import { OrmHelper } from "../helpers/orm";
|
|||||||
import Joi from "joi";
|
import Joi from "joi";
|
||||||
import { ILogObj, Logger } from "tslog";
|
import { ILogObj, Logger } from "tslog";
|
||||||
import { Language } from "../langs/lang";
|
import { Language } from "../langs/lang";
|
||||||
import { Paging } from "entity";
|
import { Paging, User, UserRole } from "entity";
|
||||||
import CommonHelper from "../helpers/common";
|
import CommonHelper from "../helpers/common";
|
||||||
import { Status } from "entity";
|
import { Status } from "entity";
|
||||||
import { RoleList } from "entity";
|
import { RoleList } from "entity";
|
||||||
import * as fastcsv from 'fast-csv';
|
import * as fastcsv from 'fast-csv';
|
||||||
import dayjs from "dayjs";
|
import dayjs from "dayjs";
|
||||||
import { UserRole } from "entity";
|
|
||||||
|
|
||||||
const log: Logger<ILogObj> = new Logger({ name: '[UserRoleController]', type: 'pretty' });
|
const log: Logger<ILogObj> = new Logger({ name: '[UserRoleController]', type: 'pretty' });
|
||||||
|
|
||||||
@ -359,14 +358,21 @@ export class UserRoleController {
|
|||||||
|
|
||||||
const param: UserRole = await schema.validateAsync(req.params);
|
const param: UserRole = await schema.validateAsync(req.params);
|
||||||
|
|
||||||
const repo = OrmHelper.DB.getRepository(UserRole);
|
const repo_role = OrmHelper.DB.getRepository(UserRole);
|
||||||
|
const repo_user = OrmHelper.DB.getRepository(User);
|
||||||
|
|
||||||
const affected = (await repo.softDelete({ id: param.id })).affected;
|
const check_used = await repo_user.findOneBy({ id_role: param.id })
|
||||||
|
|
||||||
if (affected > 0) {
|
if (check_used == null) {
|
||||||
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_delete, {});
|
const affected = (await repo_role.softDelete({ id: param.id })).affected;
|
||||||
|
|
||||||
|
if (affected > 0) {
|
||||||
|
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_delete, {});
|
||||||
|
} else {
|
||||||
|
return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
|
return ReturnHelper.errorResponse(res, 404, 402, Language.lang.failed_related, "");
|
||||||
}
|
}
|
||||||
} catch (e: unknown) {
|
} catch (e: unknown) {
|
||||||
log.error(e);
|
log.error(e);
|
||||||
|
|||||||
@ -30,5 +30,6 @@
|
|||||||
"failed_expired_token": "Token has been expired",
|
"failed_expired_token": "Token has been expired",
|
||||||
"failed_token": "Your session has been expired, please re-login",
|
"failed_token": "Your session has been expired, please re-login",
|
||||||
"failed_add_point": "Add point failed, please try again later",
|
"failed_add_point": "Add point failed, please try again later",
|
||||||
"failed_logout": "Logout has been failed, please try again later"
|
"failed_logout": "Logout has been failed, please try again later",
|
||||||
|
"failed_related": "Data has been NOT successfully saved, please check related data"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -34,6 +34,7 @@ interface LanguageValue {
|
|||||||
failed_token?: string;
|
failed_token?: string;
|
||||||
failed_add_point?: string;
|
failed_add_point?: string;
|
||||||
failed_logout?: string;
|
failed_logout?: string;
|
||||||
|
failed_related?: string;
|
||||||
|
|
||||||
//login
|
//login
|
||||||
success_login?: string;
|
success_login?: string;
|
||||||
|
|||||||
Reference in New Issue
Block a user