From 63ed0534d07c868bebc2230a0ae3b7844f51fdfa Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 22 Oct 2024 18:30:27 +0700
Subject: [PATCH] fix current revision log

---
 src/middlewares/logs.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/middlewares/logs.ts b/src/middlewares/logs.ts
index dd8fbb90..4f1a9747 100644
--- a/src/middlewares/logs.ts
+++ b/src/middlewares/logs.ts
@@ -2,6 +2,7 @@ import { NextFunction, Request, Response } from "express";
 import { Client } from "@elastic/elasticsearch";
 import { AppDataSource } from "../database/data-source";
 import { PosMaster } from "../entities/PosMaster";
+import { OrgRevision } from "../entities/OrgRevision";
 
 if (!process.env.ELASTICSEARCH_INDEX) {
   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;
   const repoPosmaster = AppDataSource.getRepository(PosMaster);
+  const repoRevision = AppDataSource.getRepository(OrgRevision);
 
   const originalJson = res.json;
 
@@ -38,8 +40,12 @@ async function logMiddleware(req: Request, res: Response, next: NextFunction) {
 
   req.app.locals.logData = {};
 
+  const revision = await repoRevision.findOne({
+    where: { orgRevisionIsCurrent: true , orgRevisionIsDraft: false },
+  })
+
   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", () => {