From 0418bece71f81bfd7e5c28e555f8d4c6dfb69099 Mon Sep 17 00:00:00 2001
From: Abdul Rahman Reza <rahman77889@gmail.com>
Date: Tue, 31 Dec 2024 09:31:55 +0700
Subject: [PATCH] update user application

---
 src/controllers/user_activity.ts | 10 +++++++---
 src/helpers/orm.ts               |  4 ++--
 src/swagger/builder.js           |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/controllers/user_activity.ts b/src/controllers/user_activity.ts
index 280af2c..2efe969 100644
--- a/src/controllers/user_activity.ts
+++ b/src/controllers/user_activity.ts
@@ -1,11 +1,11 @@
-import { Response, NextFunction, Application } from "express";
+import { Response, NextFunction } from "express";
 import { Request } from "express-jwt";
 import { ReturnHelper } from "../helpers/express/return";
 import { OrmHelper } from "../helpers/orm";
 import Joi from "joi";
 import { ILogObj, Logger } from "tslog";
 import { Language } from "../langs/lang";
-import { Paging, User } from "entity";
+import { Application, Paging, User } from "entity";
 import CommonHelper from "../helpers/common";
 import { ActivityType } from "entity";
 import * as fastcsv from 'fast-csv';
@@ -272,9 +272,12 @@ export class UserActivityController {
                 action: Joi.string().allow(...Object.values(ActivityType)).required().label('Action'),
                 url: Joi.string().optional().allow('').label('URL'),
                 data_body: Joi.string().optional().allow('').label('data_body'),
+                application: Joi.string().required().label('Application'),
             });
 
-            const param: UserActivity = await schema.validateAsync(req.body);
+            const param: UserActivity & { application: string } = await schema.validateAsync(req.body);
+
+            const repo_app = OrmHelper.DB.getRepository(Application);
 
             const data = new UserActivity()
             data.id_user = param.id_user
@@ -284,6 +287,7 @@ export class UserActivityController {
             data.action = param.action
             data.url = param.url
             data.data_body = param.data_body
+            data.application = await repo_app.findOneBy({ id: param.application });
 
             await OrmHelper.DB.manager.save(data);
 
diff --git a/src/helpers/orm.ts b/src/helpers/orm.ts
index be990c6..b26a5b6 100644
--- a/src/helpers/orm.ts
+++ b/src/helpers/orm.ts
@@ -1,6 +1,6 @@
 import config from 'config';
 import { DataSource } from "typeorm";
-import { Menu, User, UserActivity, UserRefreshToken, UserRole } from "entity";
+import { Application, Menu, User, UserActivity, UserRefreshToken, UserRole } from "entity";
 import { ILogObj, Logger } from 'tslog';
 
 export class OrmHelper {
@@ -20,7 +20,7 @@ export class OrmHelper {
             database: String(config.get("database.database")),
             synchronize: true,
             logging: true,
-            entities: [User, UserRole, UserActivity, UserRefreshToken, Menu],
+            entities: [User, UserRole, UserActivity, UserRefreshToken, Menu, Application],
             subscribers: [],
             migrations: [],
         })
diff --git a/src/swagger/builder.js b/src/swagger/builder.js
index 1ed2ed6..d15e563 100644
--- a/src/swagger/builder.js
+++ b/src/swagger/builder.js
@@ -55,7 +55,8 @@ const doc = {
                 $description: "Main Dashboard",
                 $action: "V",
                 $url: "https://bri-dev.shiblysolution.id/",
-                $data_body: "{\"from\":\"2024-11-01\",\"to\":\"2024-11-26\"}"
+                $data_body: "{\"from\":\"2024-11-01\",\"to\":\"2024-11-26\"}",
+                $application: "ukln"
             }
         },
         parameters: {