diff --git a/src/controllers/OrgChild1Controller.ts b/src/controllers/OrgChild1Controller.ts index 142470bd..ad05de22 100644 --- a/src/controllers/OrgChild1Controller.ts +++ b/src/controllers/OrgChild1Controller.ts @@ -252,30 +252,30 @@ export class OrgChild1Controller { throw new HttpError(HttpStatusCode.NOT_FOUND, "not found."); } - if (rootIdExits.orgRootRankSub != "DISTRICT" && rootIdExits.orgRootRankSub != "OFFICE") { - const chkCode = await this.child1Repository.findOne({ - where: { - id: Not(id), - orgRevisionId: rootIdExits.orgRevisionId, - orgRootId: requestBody.orgRootId, - orgChild1Code: requestBody.orgChild1Code, - }, - }); - if (chkCode != null) { - throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"); - } - const chkShort = await this.child1Repository.findOne({ - where: { - id: Not(id), - orgRevisionId: rootIdExits.orgRevisionId, - orgRootId: requestBody.orgRootId, - orgChild1ShortName: requestBody.orgChild1ShortName, - }, - }); - if (chkShort != null) { - throw new HttpError(HttpStatusCode.NOT_FOUND, "อักษรย่อนี้มีอยู่ในระบบแล้ว"); - } - } + // if (rootIdExits.orgRootRankSub != "DISTRICT" && rootIdExits.orgRootRankSub != "OFFICE") { + // const chkCode = await this.child1Repository.findOne({ + // where: { + // id: Not(id), + // orgRevisionId: rootIdExits.orgRevisionId, + // orgRootId: requestBody.orgRootId, + // orgChild1Code: requestBody.orgChild1Code, + // }, + // }); + // if (chkCode != null) { + // throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"); + // } + // const chkShort = await this.child1Repository.findOne({ + // where: { + // id: Not(id), + // orgRevisionId: rootIdExits.orgRevisionId, + // orgRootId: requestBody.orgRootId, + // orgChild1ShortName: requestBody.orgChild1ShortName, + // }, + // }); + // if (chkShort != null) { + // throw new HttpError(HttpStatusCode.NOT_FOUND, "อักษรย่อนี้มีอยู่ในระบบแล้ว"); + // } + // } // if(requestBody.orgChild1Code == rootIdExits.orgRootCode){ // throw new HttpError(HttpStatusCode.NOT_FOUND, "รหัสส่วนราชการนี้ซ้ำกับรหัสหน่วยงาน"); diff --git a/src/controllers/UserController.ts b/src/controllers/UserController.ts index f63e0209..8fd455e4 100644 --- a/src/controllers/UserController.ts +++ b/src/controllers/UserController.ts @@ -40,6 +40,7 @@ import { Brackets, In } from "typeorm"; import HttpError from "../interfaces/http-error"; import HttpStatus from "../interfaces/http-status"; import { RoleKeycloak } from "../entities/RoleKeycloak"; +import { addLogSequence } from "../interfaces/utils"; // import * as io from "../lib/websocket"; // import elasticsearch from "../elasticsearch"; // import { StorageFolder } from "../interfaces/storage-fs"; @@ -497,6 +498,36 @@ export class KeycloakController extends Controller { const result = await createGroup(body.name); if (!result) throw new Error("Failed. Cannot create group."); } + + @Post("log/sso") + async addLogSSO( + @Request() req: RequestWithUser, + @Body() body: { + text: string, + } + ) { + try { + addLogSequence(req, { + action: "request", + status: "success", + description: "connected", + request: { + response: JSON.stringify(body.text), + }, + }); + return new HttpSuccess(); + } catch (error) { + addLogSequence(req, { + action: "request", + status: "error", + description: "unconnected", + request: { + response: JSON.stringify(error), + }, + }); + throw error; + } + } @Delete("group/{groupId}") async deleteGroup(@Path() groupId: string) {