Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

package-lock.json

@@ -32,6 +32,7 @@
         "tsoa": "^6.0.1",
         "typeorm": "^0.3.19",
         "typeorm-cli": "^1.0.7",
+        "ws": "^8.18.1",
         "xlsx": "^0.20.2"
       },
       "devDependencies": {
@@ -41,6 +42,7 @@
         "@types/node": "^20.11.5",
         "@types/node-cron": "^3.0.11",
         "@types/swagger-ui-express": "^4.1.6",
+        "@types/ws": "^8.5.14",
         "nodemon": "^3.0.3",
         "prettier": "^3.2.2",
         "ts-node": "^10.9.2",
@@ -563,6 +565,15 @@
         "@types/serve-static": "*"
       }
     },
+    "node_modules/@types/ws": {
+      "version": "8.5.14",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz",
+      "integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/zen-observable": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.3.tgz",
@@ -5389,6 +5400,26 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
+    "node_modules/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/xlsx": {
       "version": "0.20.2",
       "resolved": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",

package.json

@@ -22,6 +22,7 @@
     "@types/node": "^20.11.5",
     "@types/node-cron": "^3.0.11",
     "@types/swagger-ui-express": "^4.1.6",
+    "@types/ws": "^8.5.14",
     "nodemon": "^3.0.3",
     "prettier": "^3.2.2",
     "ts-node": "^10.9.2",
@@ -51,6 +52,7 @@
     "tsoa": "^6.0.1",
     "typeorm": "^0.3.19",
     "typeorm-cli": "^1.0.7",
+    "ws": "^8.18.1",
     "xlsx": "^0.20.2"
   }
 }

src/app.ts

@@ -12,6 +12,9 @@ import { RegisterRoutes } from "./routes";
 import { OrganizationController } from "./controllers/OrganizationController";
 import logMiddleware from "./middlewares/logs";
 import { CommandController } from "./controllers/CommandController";
+// import { WebSocketServer } from "ws";
+// import http from "http";
+// export const wss = new WebSocketServer({ noServer: true });
 
 async function main() {
   await AppDataSource.initialize();
@@ -86,6 +89,32 @@ async function main() {
   }
 
   runMessageQueue();
+
+  // // สร้างเซิร์ฟเวอร์ HTTP
+  // const server = http.createServer(app);
+
+  // // การจัดการคำขออัปเกรดจาก HTTP เป็น WebSocket
+  // server.on("upgrade", (request:any, socket:any, head:any) => {
+  //   console.log("🔹 Handling upgrade request...");
+  //   wss.handleUpgrade(request, socket, head, (ws:any) => {
+  //     console.log("🔹 WebSocket connection established");
+  //     wss.emit("connection", ws, request);
+  //   });
+  // });
+
+  // wss.on("connection", (ws:any) => {
+  //   console.log("✅ Client connected to WebSocket");
+
+  //   ws.on("close", () => {
+  //     console.log("❌ Client disconnected");
+  //   });
+  // });
+
+  // // เริ่มเซิร์ฟเวอร์ที่พอร์ต 5000
+  // server.listen(APP_PORT, () => {
+  //   console.log("✅ HTTP Server is listening on port 5000");
+  // });
+
 }
 
 main();

src/controllers/ProfileSalaryController.ts

@@ -19,7 +19,7 @@ import HttpError from "../interfaces/http-error";
 import { ProfileSalaryHistory } from "../entities/ProfileSalaryHistory";
 import { RequestWithUser } from "../middlewares/user";
 import { Profile } from "../entities/Profile";
-import { LessThan, MoreThan } from "typeorm";
+import { In, LessThan, MoreThan } from "typeorm";
 import permission from "../interfaces/permission";
 import { setLogDataDiff } from "../interfaces/utils";
 @Route("api/v1/org/profile/salary")
@@ -62,7 +62,7 @@ export class ProfileSalaryController extends Controller {
     if (_workflow == false)
       await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId);
     const record = await this.salaryRepo.find({
-      where: { profileId: profileId },
+      where: { profileId: profileId, commandCode: In(["5", "6", "7"]) },
       order: { order: "ASC" },
     });
     return new HttpSuccess(record);
@@ -74,7 +74,25 @@ export class ProfileSalaryController extends Controller {
     if (_workflow == false)
       await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", profileId);
     const record = await this.salaryRepo.find({
-      where: { profileId: profileId },
+      where: {
+        profileId: profileId,
+        commandCode: In([
+          "0",
+          "9",
+          "1",
+          "2",
+          "3",
+          "4",
+          "8",
+          "10",
+          "11",
+          "12",
+          "13",
+          "14",
+          "15",
+          "16",
+        ]),
+      },
       order: { order: "ASC" },
     });
     return new HttpSuccess(record);

src/controllers/ReportController.ts

@@ -31,6 +31,9 @@ import { Profile } from "../entities/Profile";
 import { viewRegistryOfficer } from "../entities/view/viewRegistryOfficer";
 import { viewRegistryEmployee } from "../entities/view/viewRegistryEmployee";
 import { EmployeeTempPosMaster } from "../entities/EmployeeTempPosMaster";
+// import { WebSocket } from "ws";
+// import { wss } from "../app";
+
 @Route("api/v1/org/report")
 @Tags("Report")
 @Security("bearerAuth")
@@ -334,58 +337,82 @@ export class ReportController extends Controller {
       .orderBy(`registryOfficer.${sortBy}`, sort)
       .getManyAndCount();
 
-    const mapData = lists.map((x) => ({
+    const mapData = await Promise.all(lists.map(async(x) => {
-      profileId: x.profileId,
+      const position = await AppDataSource.query("CALL GetProfileSalaryPosition(?)", [x.profileId])
-      citizenId: x.citizenId,
+      const _position = position.length > 0 ? position[0] : [];
-      prefix: x.prefix,
+      const lastPosition = _position.length > 0 ? _position[_position.length - 1] : null; // last row
-      firstName: x.firstName,
+      const mapPosition = lastPosition
-      lastName: x.lastName,
+        ? [{
-      isProbation: x.isProbation,
+            Years: lastPosition.Years ? Math.floor(Number(lastPosition.Years)) : 0,
-      isLeave: x.isLeave,
+            Months: lastPosition.Months ? Math.floor(Number(lastPosition.Months)) : 0,
-      isRetirement: x.isRetirement,
+            Daysday: lastPosition.Days ? Math.floor(Number(lastPosition.Days)) : 0,
-      leaveType: x.leaveType,
+          }]
-      posMasterNo: x.posMasterNo,
+        : [];
-      orgRootId: x.orgRootId,
+      const posLevel = await AppDataSource.query("CALL GetProfileSalaryLevel(?)", [x.profileId])
-      orgChild1Id: x.orgChild1Id,
+      const _posLevel = posLevel.length > 0 ? posLevel[0] : [];
-      orgChild2Id: x.orgChild2Id,
+      const lastPosLevel= _posLevel.length > 0 ? _posLevel[_posLevel.length - 1] : null;
-      orgChild3Id: x.orgChild3Id,
+      const mapPosLevel = lastPosLevel
-      orgChild4Id: x.orgChild4Id,
+        ? [{
-      orgRootName: x.orgRootName,
+            Years: lastPosLevel.Years ? Math.floor(Number(lastPosLevel.Years)) : 0,
-      orgChild1Name: x.orgChild1Name,
+            Months: lastPosLevel.Months ? Math.floor(Number(lastPosLevel.Months)) : 0,
-      orgChild2Name: x.orgChild2Name,
+            Daysday: lastPosLevel.Days ? Math.floor(Number(lastPosLevel.Days)) : 0,
-      orgChild3Name: x.orgChild3Name,
+          }]
-      orgChild4Name: x.orgChild4Name,
+        : [];
-      org: x.org,
+      return {
-      searchShortName: x.searchShortName,
+        profileId: x.profileId,
-      posExecutiveName: x.posExecutiveName,
+        citizenId: x.citizenId,
-      position: x.position,
+        prefix: x.prefix,
-      posTypeName: x.posTypeName,
+        firstName: x.firstName,
-      posLevelName: x.posLevelName,
+        lastName: x.lastName,
-      gender: x.gender,
+        isProbation: x.isProbation,
-      relationship: x.relationship,
+        isLeave: x.isLeave,
-      dateAppoint: x.dateAppoint,
+        isRetirement: x.isRetirement,
-      dateRetire: x.dateRetire,
+        leaveType: x.leaveType,
-      dateRetireLaw: x.dateRetireLaw,
+        posMasterNo: x.posMasterNo,
-      birthdate: x.birthdate,
+        orgRootId: x.orgRootId,
-      degree: x.degree,
+        orgChild1Id: x.orgChild1Id,
-      age: x.age,
+        orgChild2Id: x.orgChild2Id,
-      currentPosition: null,
+        orgChild3Id: x.orgChild3Id,
-      lengthPosition: null,
+        orgChild4Id: x.orgChild4Id,
-      positionDate: {
+        orgRootName: x.orgRootName,
-        Years: x.Years,
+        orgChild1Name: x.orgChild1Name,
-        Months: x.Months,
+        orgChild2Name: x.orgChild2Name,
-        Days: x.Days,
+        orgChild3Name: x.orgChild3Name,
-      },
+        orgChild4Name: x.orgChild4Name,
-      posExcutiveDate: {
+        org: x.org,
-        Years: x.posExecutiveYears,
+        searchShortName: x.searchShortName,
-        Months: x.posExecutiveMonths,
+        posExecutiveName: x.posExecutiveName,
-        Days: x.posExecutiveDays,
+        position: x.position,
-      },
+        posTypeName: x.posTypeName,
-      posLevelDate: {
+        posLevelName: x.posLevelName,
-        Years: x.levelYears,
+        gender: x.gender,
-        Months: x.levelMonths,
+        relationship: x.relationship,
-        Days: x.levelDays,
+        dateAppoint: x.dateAppoint,
-      },
+        dateRetire: x.dateRetire,
+        dateRetireLaw: x.dateRetireLaw,
+        birthdate: x.birthdate,
+        degree: x.degree,
+        age: x.age,
+        currentPosition: null,
+        lengthPosition: null,
+        // positionDate: {
+        //   Years: x.Years,
+        //   Months: x.Months,
+        //   Days: x.Days,
+        // },
+        // posExcutiveDate: {
+        //   Years: x.posExecutiveYears,
+        //   Months: x.posExecutiveMonths,
+        //   Days: x.posExecutiveDays,
+        // },
+        // posLevelDate: {
+        //   Years: x.levelYears,
+        //   Months: x.levelMonths,
+        //   Days: x.levelDays,
+        // },
+        positionDate: mapPosition,
+        posLevelDate: mapPosLevel
+      }
     }));
     return new HttpSuccess({
       data: mapData,
@@ -654,43 +681,68 @@ export class ReportController extends Controller {
       )
       .orderBy(`registryEmployee.${sortBy}`, sort)
       .getManyAndCount();
-    const mapData = lists.map((x) => ({
+
-      profileId: x.profileEmployeeId,
+      const mapData = await Promise.all(lists.map(async(x) => {
-      citizenId: x.citizenId,
+        const position = await AppDataSource.query("CALL GetProfileEmployeeSalaryPosition(?)", [x.profileEmployeeId])
-      prefix: x.prefix,
+        const _position = position.length > 0 ? position[0] : [];
-      firstName: x.firstName,
+        const lastPosition = _position.length > 0 ? _position[_position.length - 1] : null;
-      lastName: x.lastName,
+        const mapPosition = lastPosition
-      isProbation: x.isProbation,
+          ? [{
-      isLeave: x.isLeave,
+              Years: lastPosition.Years ? Math.floor(Number(lastPosition.Years)) : 0,
-      isRetirement: x.isRetirement,
+              Months: lastPosition.Months ? Math.floor(Number(lastPosition.Months)) : 0,
-      leaveType: x.leaveType,
+              Daysday: lastPosition.Days ? Math.floor(Number(lastPosition.Days)) : 0,
-      posMasterNo: x.posMasterNo,
+            }]
-      orgRootId: x.orgRootId,
+          : [];
-      orgChild1Id: x.orgChild1Id,
+        const posLevel = await AppDataSource.query("CALL GetProfileEmployeeSalaryLevel(?)", [x.profileEmployeeId])
-      orgChild2Id: x.orgChild2Id,
+        const _posLevel = posLevel.length > 0 ? posLevel[0] : [];
-      orgChild3Id: x.orgChild3Id,
+        const lastPosLevel= _posLevel.length > 0 ? _posLevel[_posLevel.length - 1] : null;
-      orgChild4Id: x.orgChild4Id,
+        const mapPosLevel = lastPosLevel
-      orgRootName: x.orgRootName,
+          ? [{
-      orgChild1Name: x.orgChild1Name,
+              Years: lastPosLevel.Years ? Math.floor(Number(lastPosLevel.Years)) : 0,
-      orgChild2Name: x.orgChild2Name,
+              Months: lastPosLevel.Months ? Math.floor(Number(lastPosLevel.Months)) : 0,
-      orgChild3Name: x.orgChild3Name,
+              Daysday: lastPosLevel.Days ? Math.floor(Number(lastPosLevel.Days)) : 0,
-      orgChild4Name: x.orgChild4Name,
+            }]
-      org: x.org,
+          : [];
-      searchShortName: x.searchShortName,
+        return {
-      position: x.position,
+          profileId: x.profileEmployeeId,
-      posTypeName: x.posTypeName,
+          citizenId: x.citizenId,
-      posLevelName: x.posLevelName,
+          prefix: x.prefix,
-      gender: x.gender,
+          firstName: x.firstName,
-      relationship: x.relationship,
+          lastName: x.lastName,
-      dateAppoint: x.dateAppoint,
+          isProbation: x.isProbation,
-      dateRetire: x.dateRetire,
+          isLeave: x.isLeave,
-      dateRetireLaw: x.dateRetireLaw,
+          isRetirement: x.isRetirement,
-      birthdate: x.birthdate,
+          leaveType: x.leaveType,
-      degree: x.degree,
+          posMasterNo: x.posMasterNo,
-      age: x.age,
+          orgRootId: x.orgRootId,
-      currentPosition: null,
+          orgChild1Id: x.orgChild1Id,
-      lengthPosition: null,
+          orgChild2Id: x.orgChild2Id,
-    }));
+          orgChild3Id: x.orgChild3Id,
+          orgChild4Id: x.orgChild4Id,
+          orgRootName: x.orgRootName,
+          orgChild1Name: x.orgChild1Name,
+          orgChild2Name: x.orgChild2Name,
+          orgChild3Name: x.orgChild3Name,
+          orgChild4Name: x.orgChild4Name,
+          org: x.org,
+          searchShortName: x.searchShortName,
+          position: x.position,
+          posTypeName: x.posTypeName,
+          posLevelName: x.posLevelName,
+          gender: x.gender,
+          relationship: x.relationship,
+          dateAppoint: x.dateAppoint,
+          dateRetire: x.dateRetire,
+          dateRetireLaw: x.dateRetireLaw,
+          birthdate: x.birthdate,
+          degree: x.degree,
+          age: x.age,
+          currentPosition: null,
+          lengthPosition: null,
+          positionDate: mapPosition,
+          posLevelDate: mapPosLevel
+        }
+      }));
     return new HttpSuccess({
       data: mapData,
       total: total,
@@ -3511,7 +3563,21 @@ export class ReportController extends Controller {
         }
       }
     }
-    return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } });
+    // console.log(">>",data);
+    
+    // wss.clients.forEach((client: any) => {
+    //   if (client.readyState === WebSocket.OPEN) {
+    //     const message = JSON.stringify({ template: "report2", reportName: "report2", data: { data } });
+    //     console.log("📤 Sending data to client:", message); 
+    //     client.send(message, (err:any) => {
+    //       if (err) {
+    //         console.error("❌ Error sending message:", err);
+    //       }
+    //     });
+    //   }
+    // });
+    
+   return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } });
   }
 
   /**