update user application
This commit is contained in:
@ -1,11 +1,11 @@
|
|||||||
import { Response, NextFunction, Application } from "express";
|
import { Response, NextFunction } from "express";
|
||||||
import { Request } from "express-jwt";
|
import { Request } from "express-jwt";
|
||||||
import { ReturnHelper } from "../helpers/express/return";
|
import { ReturnHelper } from "../helpers/express/return";
|
||||||
import { OrmHelper } from "../helpers/orm";
|
import { OrmHelper } from "../helpers/orm";
|
||||||
import Joi from "joi";
|
import Joi from "joi";
|
||||||
import { ILogObj, Logger } from "tslog";
|
import { ILogObj, Logger } from "tslog";
|
||||||
import { Language } from "../langs/lang";
|
import { Language } from "../langs/lang";
|
||||||
import { Paging, User } from "entity";
|
import { Application, Paging, User } from "entity";
|
||||||
import CommonHelper from "../helpers/common";
|
import CommonHelper from "../helpers/common";
|
||||||
import { ActivityType } from "entity";
|
import { ActivityType } from "entity";
|
||||||
import * as fastcsv from 'fast-csv';
|
import * as fastcsv from 'fast-csv';
|
||||||
@ -272,9 +272,12 @@ export class UserActivityController {
|
|||||||
action: Joi.string().allow(...Object.values(ActivityType)).required().label('Action'),
|
action: Joi.string().allow(...Object.values(ActivityType)).required().label('Action'),
|
||||||
url: Joi.string().optional().allow('').label('URL'),
|
url: Joi.string().optional().allow('').label('URL'),
|
||||||
data_body: Joi.string().optional().allow('').label('data_body'),
|
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()
|
const data = new UserActivity()
|
||||||
data.id_user = param.id_user
|
data.id_user = param.id_user
|
||||||
@ -284,6 +287,7 @@ export class UserActivityController {
|
|||||||
data.action = param.action
|
data.action = param.action
|
||||||
data.url = param.url
|
data.url = param.url
|
||||||
data.data_body = param.data_body
|
data.data_body = param.data_body
|
||||||
|
data.application = await repo_app.findOneBy({ id: param.application });
|
||||||
|
|
||||||
await OrmHelper.DB.manager.save(data);
|
await OrmHelper.DB.manager.save(data);
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import config from 'config';
|
import config from 'config';
|
||||||
import { DataSource } from "typeorm";
|
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';
|
import { ILogObj, Logger } from 'tslog';
|
||||||
|
|
||||||
export class OrmHelper {
|
export class OrmHelper {
|
||||||
@ -20,7 +20,7 @@ export class OrmHelper {
|
|||||||
database: String(config.get("database.database")),
|
database: String(config.get("database.database")),
|
||||||
synchronize: true,
|
synchronize: true,
|
||||||
logging: true,
|
logging: true,
|
||||||
entities: [User, UserRole, UserActivity, UserRefreshToken, Menu],
|
entities: [User, UserRole, UserActivity, UserRefreshToken, Menu, Application],
|
||||||
subscribers: [],
|
subscribers: [],
|
||||||
migrations: [],
|
migrations: [],
|
||||||
})
|
})
|
||||||
|
|||||||
@ -55,7 +55,8 @@ const doc = {
|
|||||||
$description: "Main Dashboard",
|
$description: "Main Dashboard",
|
||||||
$action: "V",
|
$action: "V",
|
||||||
$url: "https://bri-dev.shiblysolution.id/",
|
$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: {
|
parameters: {
|
||||||
|
|||||||
Reference in New Issue
Block a user