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

fix current revision log

Browse source
This commit is contained in:
AdisakKanthawilang 2024-10-22 18:30:27 +07:00
parent 9265f6ec80
commit 63ed0534d0
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/middlewares/logs.ts
View file

@ -2,6 +2,7 @@ import { NextFunction, Request, Response } from "express";
import { Client } from "@elastic/elasticsearch"; import { Client } from "@elastic/elasticsearch";
import { AppDataSource } from "../database/data-source"; import { AppDataSource } from "../database/data-source";
import { PosMaster } from "../entities/PosMaster"; import { PosMaster } from "../entities/PosMaster";
import { OrgRevision } from "../entities/OrgRevision";
if (!process.env.ELASTICSEARCH_INDEX) { if (!process.env.ELASTICSEARCH_INDEX) {
throw new Error("Require ELASTICSEARCH_INDEX to store log."); throw new Error("Require ELASTICSEARCH_INDEX to store log.");
@ -26,6 +27,7 @@ async function logMiddleware(req: Request, res: Response, next: NextFunction) {
let data: any; let data: any;
const repoPosmaster = AppDataSource.getRepository(PosMaster); const repoPosmaster = AppDataSource.getRepository(PosMaster);
const repoRevision = AppDataSource.getRepository(OrgRevision);
const originalJson = res.json; const originalJson = res.json;
@ -38,8 +40,12 @@ async function logMiddleware(req: Request, res: Response, next: NextFunction) {
req.app.locals.logData = {}; req.app.locals.logData = {};
const revision = await repoRevision.findOne({
where: { orgRevisionIsCurrent: true , orgRevisionIsDraft: false },
})
const rootId = await repoPosmaster.findOne({ const rootId = await repoPosmaster.findOne({
where: { current_holderId: req.app.locals.logData.userId }, where: { current_holderId: req.app.locals.logData.userId, orgRevisionId: revision?.id },
}); });
res.on("finish", () => { res.on("finish", () => {