diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index d77b438..ba4ab81 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -147,11 +147,11 @@ export class DevelopmentController extends Controller { development.createdFullName = request.user.name; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Development.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Development.", + // }); const before = null; await this.developmentRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); @@ -273,11 +273,11 @@ export class DevelopmentController extends Controller { default: throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงการ/หลักสูตรการฝึกอบรม"); } - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Development.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Development.", + // }); await this.developmentRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -313,11 +313,11 @@ export class DevelopmentController extends Controller { data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; data.developmentPlannedGoalId = development.id; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Development.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Development.", + // }); await this.plannedGoalRepository.save(data, { data: request }); await Promise.all( @@ -345,11 +345,11 @@ export class DevelopmentController extends Controller { _data.lastUpdateUserId = request.user.sub; _data.lastUpdateFullName = request.user.name; _data.plannedGoalId = data.id; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Development.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Development.", + // }); await this.plannedGoalPositionRepository.save(_data, { data: request }); setLogDataDiff(request, { before, after: development }); }), @@ -388,11 +388,11 @@ export class DevelopmentController extends Controller { data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; data.developmentPlannedPeopleId = development.id; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Development.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Development.", + // }); await this.plannedPeopleRepository.save(data, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(data.id); @@ -455,11 +455,11 @@ export class DevelopmentController extends Controller { data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; data.developmentActualGoalId = development.id; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store ActualGoal.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store ActualGoal.", + // }); await this.actualGoalRepository.save(data, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(data.id); @@ -496,11 +496,11 @@ export class DevelopmentController extends Controller { data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; data.developmentActualPeopleId = development.id; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store ActualPeople.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store ActualPeople.", + // }); await this.actualPeopleRepository.save(data, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(data.id); @@ -534,22 +534,22 @@ export class DevelopmentController extends Controller { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงการ/หลักสูตรการฝึกอบรมนี้"); } const before = structuredClone(development); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove data in the field on the PlannedGoalPosition.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove data in the field on the PlannedGoalPosition.", + // }); await this.plannedGoalPositionRepository.remove(development.plannedGoalPositions, { data: request, }); Object.assign(development, { ...requestBody, positions: [] }); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store PlannedGoal.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store PlannedGoal.", + // }); await this.plannedGoalRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); if (requestBody.positions != null) { @@ -577,11 +577,11 @@ export class DevelopmentController extends Controller { _data.lastUpdateUserId = request.user.sub; _data.lastUpdateFullName = request.user.name; _data.plannedGoalId = development.id; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Planned Goal Position.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Planned Goal Position.", + // }); await this.plannedGoalPositionRepository.save(_data, { data: { request: request, @@ -621,11 +621,11 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store PlannedPeople.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store PlannedPeople.", + // }); await this.plannedPeopleRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -685,11 +685,11 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store ActualGoal.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store ActualGoal.", + // }); await this.actualGoalRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -723,11 +723,11 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store ActualPeople.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store ActualPeople.", + // }); await this.actualPeopleRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -756,17 +756,17 @@ export class DevelopmentController extends Controller { const _development = await this.plannedGoalPositionRepository.find({ where: { plannedGoalId: id }, }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove data in PlannedGoalPosition.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove data in PlannedGoalPosition.", + // }); await this.plannedGoalPositionRepository.remove(_development, { data: request }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove data in PlannedGoal.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove data in PlannedGoal.", + // }); await this.plannedGoalRepository.remove(development, { data: request }); return new HttpSuccess(development.id); } @@ -791,11 +791,11 @@ export class DevelopmentController extends Controller { if (!development) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้เกี่ยวข้องเป้าหมายตามแผน"); } - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove data in PlannedPeople.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove data in PlannedPeople.", + // }); await this.plannedPeopleRepository.remove(development, { data: request }); return new HttpSuccess(development.id); } @@ -820,11 +820,11 @@ export class DevelopmentController extends Controller { if (!development) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลกลุ่มเป้าหมายตามจริง"); } - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove data in ActualGoal.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove data in ActualGoal.", + // }); await this.actualGoalRepository.remove(development, { data: request }); return new HttpSuccess(development.id); } @@ -849,11 +849,11 @@ export class DevelopmentController extends Controller { if (!development) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้เกี่ยวข้องเป้าหมายตามจริง"); } - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove data in ActualPeople.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove data in ActualPeople.", + // }); await this.actualPeopleRepository.remove(development, { data: request }); return new HttpSuccess(development.id); } @@ -895,30 +895,30 @@ export class DevelopmentController extends Controller { }); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove data in DevelopmentProjectType.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove data in DevelopmentProjectType.", + // }); await this.developmentProjectTypeRepository.remove(development.developmentProjectTypes, { data: request, }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove data in DevelopmentProjectTechniquePlanned.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove data in DevelopmentProjectTechniquePlanned.", + // }); await this.developmentProjectTechniquePlannedRepository.remove( development.developmentProjectTechniquePlanneds, { data: request, }, ); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove data in DevelopmentProjectTechniqueActual.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove data in DevelopmentProjectTechniqueActual.", + // }); await this.developmentProjectTechniqueActualRepository.remove( development.developmentProjectTechniqueActuals, { @@ -1136,11 +1136,11 @@ export class DevelopmentController extends Controller { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลยุทธศาสตร์เป้าหมายตามจริง"); } } - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Development.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Development.", + // }); await this.developmentRepository.save(development, { data: request }); if (requestBody.developmentProjectTypes != null) { await Promise.all( @@ -1152,11 +1152,11 @@ export class DevelopmentController extends Controller { data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; data.developmentId = development.id; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentProjectType.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentProjectType.", + // }); await this.developmentProjectTypeRepository.save(data, { data: request }); }), ); @@ -1171,11 +1171,11 @@ export class DevelopmentController extends Controller { data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; data.developmentId = development.id; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentProjectTechniquePlanned.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentProjectTechniquePlanned.", + // }); await this.developmentProjectTechniquePlannedRepository.save(data, { data: request }); }), ); @@ -1190,11 +1190,11 @@ export class DevelopmentController extends Controller { data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; data.developmentId = development.id; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentProjectTechniqueActual.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentProjectTechniqueActual.", + // }); await this.developmentProjectTechniqueActualRepository.save(data, { data: request }); }), ); @@ -1230,11 +1230,11 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Development.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Development.", + // }); await this.developmentRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -1271,11 +1271,11 @@ export class DevelopmentController extends Controller { data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; data.developmentId = development.id; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentEvaluation.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentEvaluation.", + // }); await this.developmentEvaluationRepository.save(data, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(data.id); @@ -1301,11 +1301,11 @@ export class DevelopmentController extends Controller { if (!development) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผู้เกี่ยวข้องเป้าหมายตามแผน"); } - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove Development Evaluation By ID.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove Development Evaluation By ID.", + // }); await this.developmentEvaluationRepository.remove(development, { data: request }); return new HttpSuccess(development.id); } @@ -1332,11 +1332,11 @@ export class DevelopmentController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentEvaluation.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentEvaluation.", + // }); await this.developmentEvaluationRepository.save(development, { data: request }); return new HttpSuccess(development.id); } @@ -1373,17 +1373,17 @@ export class DevelopmentController extends Controller { Object.assign(development, { ...requestBody, developmentAddresss: [] }); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Development.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Development.", + // }); await this.developmentRepository.save(development, { data: request }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove DevelopmentAddresss.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove DevelopmentAddresss.", + // }); await this.developmentAddresssRepository.remove(development.developmentAddresss, { data: request, }); @@ -1402,11 +1402,11 @@ export class DevelopmentController extends Controller { data.createdFullName = request.user.name; data.lastUpdateUserId = request.user.sub; data.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentAddresss.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentAddresss.", + // }); await this.developmentAddresssRepository.save(data, { data: request }); setLogDataDiff(request, { before, after: development }); }), @@ -1497,92 +1497,92 @@ export class DevelopmentController extends Controller { const plannedGoalPosition = await this.plannedGoalPositionRepository.find({ where: { plannedGoalId: In(development.developmentPlannedGoals.map((x) => x.id)) }, }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove PlannedGoalPosition.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove PlannedGoalPosition.", + // }); await this.plannedGoalPositionRepository.remove(plannedGoalPosition, { data: request }); } - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove ActualPeople.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove ActualPeople.", + // }); await this.actualPeopleRepository.remove(development.developmentActualPeoples, { data: request, }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove PlannedPeople.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove PlannedPeople.", + // }); await this.plannedPeopleRepository.remove(development.developmentPlannedPeoples, { data: request, }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove ActualGoal.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove ActualGoal.", + // }); await this.actualGoalRepository.remove(development.developmentActualGoals, { data: request }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove PlannedGoal.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove PlannedGoal.", + // }); await this.plannedGoalRepository.remove(development.developmentPlannedGoals, { data: request }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove DevelopmentProjectType.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove DevelopmentProjectType.", + // }); await this.developmentProjectTypeRepository.remove(development.developmentProjectTypes, { data: request, }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove DevelopmentProjectTechniquePlanned.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove DevelopmentProjectTechniquePlanned.", + // }); await this.developmentProjectTechniquePlannedRepository.remove( development.developmentProjectTechniquePlanneds, { data: request, }, ); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove DevelopmentProjectTechniqueActuals.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove DevelopmentProjectTechniqueActuals.", + // }); await this.developmentProjectTechniqueActualRepository.remove( development.developmentProjectTechniqueActuals, { data: request, }, ); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove DevelopmentEvaluation.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove DevelopmentEvaluation.", + // }); await this.developmentEvaluationRepository.remove(development.developmentEvaluations, { data: request, }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove DevelopmentAddresss.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove DevelopmentAddresss.", + // }); await this.developmentAddresssRepository.remove(development.developmentAddresss, { data: request, }); - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove Development.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove Development.", + // }); await this.developmentRepository.remove(development, { data: request }); return new HttpSuccess(); } @@ -1667,11 +1667,11 @@ export class DevelopmentController extends Controller { getDevelopment.status = "FINISH"; getDevelopment.lastUpdateUserId = request.user.sub; getDevelopment.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Development.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Development.", + // }); await this.developmentRepository.save(getDevelopment, { data: request }); return new HttpSuccess(getDevelopment); } @@ -2100,11 +2100,11 @@ export class DevelopmentController extends Controller { _data.lastUpdateUserId = request.user.sub; _data.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(_data, { data: request }); }), ); @@ -2185,11 +2185,11 @@ export class DevelopmentController extends Controller { oldProfile.createdFullName = request.user.name; oldProfile.lastUpdateUserId = request.user.sub; oldProfile.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(oldProfile, { data: request }); setLogDataDiff(request, { before, after: oldProfile }); return; @@ -2224,11 +2224,11 @@ export class DevelopmentController extends Controller { development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; development.isProfile = true; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); }) @@ -2267,11 +2267,11 @@ export class DevelopmentController extends Controller { development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; development.isProfile = false; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); }); @@ -2304,11 +2304,11 @@ export class DevelopmentController extends Controller { development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; development.isProfile = true; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); }) @@ -2347,11 +2347,11 @@ export class DevelopmentController extends Controller { development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; development.isProfile = false; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); }); @@ -2403,11 +2403,11 @@ export class DevelopmentController extends Controller { oldProfile.createdFullName = request.user.name; oldProfile.lastUpdateUserId = request.user.sub; oldProfile.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(oldProfile, { data: request }); setLogDataDiff(request, { before, after: oldProfile }); status = oldProfile.isProfile; @@ -2437,11 +2437,11 @@ export class DevelopmentController extends Controller { development.createdFullName = request.user.name; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); status = development.isProfile; @@ -2477,11 +2477,11 @@ export class DevelopmentController extends Controller { development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; development.isProfile = false; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); console.log(development.isProfile); @@ -2511,11 +2511,11 @@ export class DevelopmentController extends Controller { development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; development.isProfile = true; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); status = development.isProfile; @@ -2551,11 +2551,11 @@ export class DevelopmentController extends Controller { development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; development.isProfile = false; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); status = development.isProfile; diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts index b7c34c4..ec40a3b 100644 --- a/src/controllers/DevelopmentEmployeeHistoryController.ts +++ b/src/controllers/DevelopmentEmployeeHistoryController.ts @@ -121,11 +121,11 @@ export class DevelopmentEmployeeHistoryController extends Controller { development.createdFullName = request.user.name; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -192,11 +192,11 @@ export class DevelopmentEmployeeHistoryController extends Controller { development.posLevelId = null; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); return new HttpSuccess(development.id); } @@ -217,11 +217,11 @@ export class DevelopmentEmployeeHistoryController extends Controller { if (!development) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประวัติการฝึกอบรม/ดูงานนี้"); } - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove DevelopmentHistory.", + // }); await this.developmentHistoryRepository.remove(development, { data: request }); return new HttpSuccess(); } diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts index 1e5a547..a2cd020 100644 --- a/src/controllers/DevelopmentHistoryController.ts +++ b/src/controllers/DevelopmentHistoryController.ts @@ -117,11 +117,11 @@ export class DevelopmentOfficerHistoryController extends Controller { development.createdFullName = request.user.name; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -184,11 +184,11 @@ export class DevelopmentOfficerHistoryController extends Controller { development.type = type; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.save(development, { data: request }); return new HttpSuccess(development.id); } @@ -209,11 +209,11 @@ export class DevelopmentOfficerHistoryController extends Controller { if (!development) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประวัติการฝึกอบรม/ดูงานนี้"); } - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentHistory.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentHistory.", + // }); await this.developmentHistoryRepository.remove(development, { data: request }); return new HttpSuccess(); } diff --git a/src/controllers/DevelopmentScholarshipController.ts b/src/controllers/DevelopmentScholarshipController.ts index 7b30ee7..16fd798 100644 --- a/src/controllers/DevelopmentScholarshipController.ts +++ b/src/controllers/DevelopmentScholarshipController.ts @@ -81,11 +81,11 @@ export class DevelopmentScholarshipController extends Controller { development.createdFullName = request.user.name; development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Development Scholarship.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Development Scholarship.", + // }); await this.developmentScholarshipRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -145,11 +145,11 @@ export class DevelopmentScholarshipController extends Controller { Object.assign(development, requestBody); development.lastUpdateUserId = request.user.sub; development.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentScholarship.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentScholarship.", + // }); await this.developmentScholarshipRepository.save(development, { data: request }); setLogDataDiff(request, { before, after: development }); return new HttpSuccess(development.id); @@ -175,11 +175,11 @@ export class DevelopmentScholarshipController extends Controller { if (!development) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลทุนการศึกษา/ฝึกอบรมนี้"); } - addLogSequence(request, { - action: "remove", - status: "success", - description: "Remove Development Scholarship By ID.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Remove Development Scholarship By ID.", + // }); await this.developmentScholarshipRepository.remove(development, { data: request }); return new HttpSuccess(); } @@ -489,11 +489,11 @@ export class DevelopmentScholarshipController extends Controller { Object.assign(getDevelopment, requestBody); getDevelopment.lastUpdateUserId = request.user.sub; getDevelopment.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store DevelopmentScholarship.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store DevelopmentScholarship.", + // }); await this.developmentScholarshipRepository.save(getDevelopment, { data: request }); setLogDataDiff(request, { before, after: getDevelopment }); return new HttpSuccess(getDevelopment.id); @@ -587,11 +587,11 @@ export class DevelopmentScholarshipController extends Controller { }); } else if (_status == "NOTGRADUATE") { getDevelopment.status = _status; - addLogSequence(request, { - action: "database", - status: "success", - description: "Change Status Development Scholarship.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Change Status Development Scholarship.", + // }); await this.developmentScholarshipRepository.save(getDevelopment, { data: request }); } else { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบสถานะนี้ในระบบ"); diff --git a/src/controllers/PortfolioController.ts b/src/controllers/PortfolioController.ts index 04a2657..df0aa98 100644 --- a/src/controllers/PortfolioController.ts +++ b/src/controllers/PortfolioController.ts @@ -106,11 +106,11 @@ export class PortfolioController extends Controller { _portfolio.createdFullName = request.user.name; _portfolio.lastUpdateUserId = request.user.sub; _portfolio.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Portfolio.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Portfolio.", + // }); await this.portfolioRepository.save(_portfolio, { data: request }); setLogDataDiff(request, { before, after: _portfolio }); return new HttpSuccess(_portfolio.id); @@ -144,11 +144,11 @@ export class PortfolioController extends Controller { _portfolio.lastUpdateUserId = request.user.sub; _portfolio.lastUpdateFullName = request.user.name; Object.assign(_portfolio, requestBody); - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Portfolio.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Portfolio.", + // }); await this.portfolioRepository.save(_portfolio, { data: request }); return new HttpSuccess(_portfolio.id); } @@ -168,11 +168,11 @@ export class PortfolioController extends Controller { if (!_delPortfolio) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลผลงานนี้"); } - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Portfolio.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Portfolio.", + // }); await this.portfolioRepository.delete(_delPortfolio.id), { data: request }; return new HttpSuccess(); } diff --git a/src/controllers/StrategyController.ts b/src/controllers/StrategyController.ts index cb44c76..bcaf7ae 100644 --- a/src/controllers/StrategyController.ts +++ b/src/controllers/StrategyController.ts @@ -204,11 +204,11 @@ export class StrategyController extends Controller { strategyChild.createdFullName = request.user.name; strategyChild.lastUpdateUserId = request.user.sub; strategyChild.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "database", - status: "success", - description: "Store Strategy.", - }); + // addLogSequence(request, { + // action: "database", + // status: "success", + // description: "Store Strategy.", + // }); await repoSave.save(strategyChild, { data: request }); setLogDataDiff(request, { before, after: strategyChild }); @@ -285,11 +285,11 @@ export class StrategyController extends Controller { strategyChild.lastUpdateUserId = request.user.sub; strategyChild.lastUpdateFullName = request.user.name; - addLogSequence(request, { - action: "remove", - status: "success", - description: "Edit Strategy by ID.", - }); + // addLogSequence(request, { + // action: "remove", + // status: "success", + // description: "Edit Strategy by ID.", + // }); await strategyRepo.save(strategyChild, { data: request }); return new HttpSuccess(); diff --git a/src/interfaces/utils.ts b/src/interfaces/utils.ts index 12308e1..f21a398 100644 --- a/src/interfaces/utils.ts +++ b/src/interfaces/utils.ts @@ -11,8 +11,8 @@ export type LogSequence = { description: string; query?: string; request?: { - method: "GET" | "POST" | "PUT" | "DELETE" | "PATCH"; - url: string; + method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH"; + url?: string; payload?: string; response?: string; }; diff --git a/src/middlewares/auth.ts b/src/middlewares/auth.ts index 2c939d3..d43943c 100644 --- a/src/middlewares/auth.ts +++ b/src/middlewares/auth.ts @@ -3,6 +3,8 @@ import { createDecoder, createVerifier } from "fast-jwt"; import HttpError from "../interfaces/http-error"; import HttpStatus from "../interfaces/http-status"; +import { addLogSequence } from "../interfaces/utils"; +import { RequestWithUser } from "./user"; if (!process.env.AUTH_PUBLIC_KEY && !process.env.AUTH_REALM_URL) { throw new Error("Require keycloak AUTH_PUBLIC_KEY or AUTH_REALM_URL."); @@ -22,7 +24,7 @@ const jwtVerify = createVerifier({ const jwtDecode = createDecoder(); export async function expressAuthentication( - request: express.Request, + request: RequestWithUser, securityName: string, _scopes?: string[], ) { @@ -56,6 +58,11 @@ export async function expressAuthentication( request.app.locals.logData = {}; } + addLogSequence(request, { + action: "database", + status: "success", + description: "Query Data.", + }); request.app.locals.logData.userId = payload.sub; request.app.locals.logData.userName = payload.name; request.app.locals.logData.user = payload.preferred_username;