diff --git a/src/controllers/MyController.ts b/src/controllers/MyController.ts index f9b4d4d..3e14f15 100644 --- a/src/controllers/MyController.ts +++ b/src/controllers/MyController.ts @@ -1,17 +1,4 @@ -import { - Controller, - Request, - Get, - Post, - Put, - Delete, - Patch, - Route, - Security, - Tags, - Path, -} from "tsoa"; -import axios from "axios"; +import { Controller, Request, Get, Route, Security, Tags } from "tsoa"; import CallAPI from "../interfaces/call-api"; @Route("/hello") diff --git a/src/controllers/PosLevelController.ts b/src/controllers/PosLevelController.ts index 0ed8dfe..da85c0d 100644 --- a/src/controllers/PosLevelController.ts +++ b/src/controllers/PosLevelController.ts @@ -4,7 +4,6 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, @@ -14,7 +13,6 @@ import { Example, SuccessResponse, Response, - Query, } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; @@ -24,7 +22,7 @@ import { PosLevel, CreatePosLevel, UpdatePosLevel } from "../entities/PosLevel"; import HttpError from "../interfaces/http-error"; import { Not } from "typeorm"; import { RequestWithUser } from "../middlewares/user"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/salary/pos/level") @Tags("PosLevel") diff --git a/src/controllers/PosTypeController.ts b/src/controllers/PosTypeController.ts index 126f02a..117cff0 100644 --- a/src/controllers/PosTypeController.ts +++ b/src/controllers/PosTypeController.ts @@ -4,7 +4,6 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, @@ -14,7 +13,6 @@ import { Example, SuccessResponse, Response, - Query, } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; @@ -24,7 +22,7 @@ import { PosLevel } from "../entities/PosLevel"; import HttpError from "../interfaces/http-error"; import { Not } from "typeorm"; import { RequestWithUser } from "../middlewares/user"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/salary/pos/type") @Tags("PosType") diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 29dd076..7ba0970 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -2,19 +2,14 @@ import { Controller, Get, Post, - Put, - Delete, - Patch, Route, Security, Tags, Body, Path, Request, - Example, SuccessResponse, Response, - Query, } from "tsoa"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; @@ -35,7 +30,7 @@ import { EmployeePosType } from "../entities/EmployeePosType"; import { EmployeePosLevel } from "../entities/EmployeePosLevel"; import { SalaryOrgEmployee } from "../entities/SalaryOrgEmployee"; import { SalaryProfileEmployee } from "../entities/SalaryProfileEmployee"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; import { RequestWithUser } from "../middlewares/user"; import CallAPI from "../interfaces/call-api"; @@ -54,9 +49,7 @@ export class ReportController extends Controller { private salaryRankRepository = AppDataSource.getRepository(SalaryRanks); private salaryEmployeeRankRepository = AppDataSource.getRepository(SalaryRankEmployee); private poTypeRepository = AppDataSource.getRepository(PosType); - private poTypeEmployeeRepository = AppDataSource.getRepository(EmployeePosType); private posLevelRepository = AppDataSource.getRepository(PosLevel); - private posLevelEmployeeRepository = AppDataSource.getRepository(EmployeePosLevel); private salaryOrgRepository = AppDataSource.getRepository(SalaryOrg); private salaryOrgEmployeeRepository = AppDataSource.getRepository(SalaryOrgEmployee); private salaryProfileRepository = AppDataSource.getRepository(SalaryProfile); @@ -103,7 +96,7 @@ export class ReportController extends Controller { }, }); - const mapSalaryRank = salaryRank.map((item, index) => ({ + const mapSalaryRank = salaryRank.map((item) => ({ // no: index + 1, // id: item.id, salary: item.salary == null || item.salary == 0 ? "" : item.salary.toLocaleString(), @@ -194,7 +187,7 @@ export class ReportController extends Controller { }, }); - const mapSalaryRank = salaryRank.map((item, index) => ({ + const mapSalaryRank = salaryRank.map((item) => ({ step: item.step == null || item.step == 0 ? "" : item.step.toLocaleString(), salaryMonth: item.salaryMonth == null || item.salaryMonth == 0 ? "" : item.salaryMonth.toLocaleString(), @@ -6304,7 +6297,7 @@ export class ReportController extends Controller { refCommandNo: v.refCommandNo, templateDoc: v.templateDoc, }) - .then(async (x) => { + .then(async () => { const before = null; salary.status = "DONE"; salary.lastUpdateUserId = request.user.sub; @@ -6357,7 +6350,7 @@ export class ReportController extends Controller { refCommandNo: v.refCommandNo, templateDoc: v.templateDoc, }) - .then(async (x) => { + .then(async () => { const before = null; salary.status = "DONE"; salary.lastUpdateUserId = request.user.sub; @@ -6410,7 +6403,7 @@ export class ReportController extends Controller { refCommandNo: v.refCommandNo, templateDoc: v.templateDoc, }) - .then(async (x) => { + .then(async () => { const before = null; salary.status = "DONE"; salary.lastUpdateUserId = request.user.sub; @@ -6463,7 +6456,7 @@ export class ReportController extends Controller { refCommandNo: v.refCommandNo, templateDoc: v.templateDoc, }) - .then(async (x) => { + .then(async () => { const before = null; salary.status = "DONE"; salary.lastUpdateUserId = request.user.sub; @@ -6516,7 +6509,7 @@ export class ReportController extends Controller { refCommandNo: v.refCommandNo, templateDoc: v.templateDoc, }) - .then(async (x) => { + .then(async () => { const before = null; salary.status = "DONE"; salary.lastUpdateUserId = request.user.sub; diff --git a/src/controllers/SalaryController.ts b/src/controllers/SalaryController.ts index ea0cff1..d89b735 100644 --- a/src/controllers/SalaryController.ts +++ b/src/controllers/SalaryController.ts @@ -17,7 +17,7 @@ import { Salarys, CreateSalary, UpdateSalary } from "../entities/Salarys"; import { PosType } from "../entities/PosType"; import { PosLevel } from "../entities/PosLevel"; import { AppDataSource } from "../database/data-source"; -import { Brackets, Like, Not } from "typeorm"; +import { Brackets, Not } from "typeorm"; import HttpSuccess from "../interfaces/http-success"; import HttpError from "../interfaces/http-error"; import HttpStatusCode from "../interfaces/http-status"; @@ -25,7 +25,7 @@ import { SalaryRanks } from "../entities/SalaryRanks"; import { randomUUID } from "crypto"; import { RequestWithUser } from "../middlewares/user"; import permission from "../interfaces/permission"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/salary") @Tags("Salary") diff --git a/src/controllers/SalaryEmployeeController.ts b/src/controllers/SalaryEmployeeController.ts index 6c16a04..6777ba1 100644 --- a/src/controllers/SalaryEmployeeController.ts +++ b/src/controllers/SalaryEmployeeController.ts @@ -19,17 +19,16 @@ import { UpdateSalaryEmployee, } from "../entities/SalaryEmployee"; import { AppDataSource } from "../database/data-source"; -import { Not, Like, Brackets } from "typeorm"; +import { Not, Brackets } from "typeorm"; import HttpSuccess from "../interfaces/http-success"; import HttpError from "../interfaces/http-error"; import HttpStatusCode from "../interfaces/http-status"; import { SalaryRankEmployee } from "../entities/SalaryRankEmployee"; import { randomUUID } from "crypto"; -import { Salarys } from "../entities/Salarys"; import { SalaryFormulaEmployee } from "../entities/SalaryFormulaEmployee"; import { RequestWithUser } from "../middlewares/user"; import permission from "../interfaces/permission"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/salary/employee") @Tags("SalaryEmployee") @@ -94,7 +93,7 @@ export class SalaryEmployeeController extends Controller { salarys.lastUpdateFullName = request.user.name; salarys.createdAt = new Date(); salarys.lastUpdatedAt = new Date(); - + await this.salaryEmployeeRepository.save(salarys, { data: request }); setLogDataDiff(request, { before, after: salarys }); return new HttpSuccess(salarys.id); diff --git a/src/controllers/SalaryFormulaEmployeeController.ts b/src/controllers/SalaryFormulaEmployeeController.ts index f194a23..e416717 100644 --- a/src/controllers/SalaryFormulaEmployeeController.ts +++ b/src/controllers/SalaryFormulaEmployeeController.ts @@ -4,14 +4,12 @@ import { Post, Put, Delete, - Patch, Route, Security, Tags, Body, Path, Request, - Example, SuccessResponse, Response, Query, @@ -19,7 +17,6 @@ import { import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatusCode from "../interfaces/http-status"; -import { PosLevel, CreatePosLevel, UpdatePosLevel } from "../entities/PosLevel"; import HttpError from "../interfaces/http-error"; import { In, Like, Not } from "typeorm"; import { @@ -32,7 +29,7 @@ import { EmployeePosType } from "../entities/EmployeePosType"; import { SalaryEmployee } from "../entities/SalaryEmployee"; import { RequestWithUser } from "../middlewares/user"; import permission from "../interfaces/permission"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/salary/formula") @Tags("SalaryFormula") diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index 55c94d9..eda9dc7 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -28,10 +28,9 @@ import { SalaryRanks } from "../entities/SalaryRanks"; import CallAPI from "../interfaces/call-api"; import { SalaryOrgEmployee } from "../entities/SalaryOrgEmployee"; import { SalaryProfileEmployee } from "../entities/SalaryProfileEmployee"; -import { isNullOrUndefined } from "util"; import { RequestWithUser } from "../middlewares/user"; import permission from "../interfaces/permission"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/salary/period") @Tags("Salary") @@ -1702,7 +1701,7 @@ export class SalaryPeriodController extends Controller { salaryPeriod.revisionId = revisionId; salaryPeriod.lastUpdateUserId = request.user.sub; salaryPeriod.lastUpdateFullName = request.user.name; - salaryPeriod.lastUpdatedAt = new Date(); + salaryPeriod.lastUpdatedAt = new Date(); await this.salaryPeriodRepository.save(salaryPeriod, { data: request }); setLogDataDiff(request, { before, after: salaryPeriod }); @@ -1825,7 +1824,7 @@ export class SalaryPeriodController extends Controller { chk_SalaryPeriod.lastUpdateUserId = request.user.sub; chk_SalaryPeriod.lastUpdateFullName = request.user.name; chk_SalaryPeriod.lastUpdatedAt = new Date(); - + await this.salaryPeriodRepository.save(chk_SalaryPeriod, { data: request }); setLogDataDiff(request, { before: beforeChk_SalaryPeriod, after: chk_SalaryPeriod }); diff --git a/src/controllers/SalaryPeriodEmployeeController.ts b/src/controllers/SalaryPeriodEmployeeController.ts index fb6ae7b..644cc14 100644 --- a/src/controllers/SalaryPeriodEmployeeController.ts +++ b/src/controllers/SalaryPeriodEmployeeController.ts @@ -13,7 +13,7 @@ import { Query, } from "tsoa"; import { AppDataSource } from "../database/data-source"; -import { In, Not, MoreThan, Brackets, Like, MoreThanOrEqual } from "typeorm"; +import { In, Not, MoreThan, Brackets, Like } from "typeorm"; import HttpSuccess from "../interfaces/http-success"; import HttpError from "../interfaces/http-error"; import HttpStatusCode from "../interfaces/http-status"; @@ -32,7 +32,7 @@ import { SalaryRankEmployee } from "../entities/SalaryRankEmployee"; import { SalaryFormulaEmployee } from "../entities/SalaryFormulaEmployee"; import { RequestWithUser } from "../middlewares/user"; import permission from "../interfaces/permission"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/salary/period-employee") @Tags("SalaryEmployee") @@ -43,7 +43,6 @@ export class SalaryPeriodEmployeeController extends Controller { private salaryProfileRepository = AppDataSource.getRepository(SalaryProfileEmployee); private posTypeRepository = AppDataSource.getRepository(EmployeePosType); private posLevelRepository = AppDataSource.getRepository(EmployeePosLevel); - private salaryRepository = AppDataSource.getRepository(SalaryEmployee); private salaryRankRepository = AppDataSource.getRepository(SalaryRankEmployee); private salaryFormulaEmployeeRepository = AppDataSource.getRepository(SalaryFormulaEmployee); diff --git a/src/controllers/SalaryRankController.ts b/src/controllers/SalaryRankController.ts index a2db7f0..e90d786 100644 --- a/src/controllers/SalaryRankController.ts +++ b/src/controllers/SalaryRankController.ts @@ -14,7 +14,7 @@ import { Get, Query, } from "tsoa"; -import { Brackets, Like } from "typeorm"; +import { Brackets } from "typeorm"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatusCode from "../interfaces/http-status"; @@ -23,7 +23,7 @@ import { CreateSalaryRank, SalaryRanks, UpdateSalaryRank } from "../entities/Sal import { Salarys } from "../entities/Salarys"; import permission from "../interfaces/permission"; import { RequestWithUser } from "../middlewares/user"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/salary/rate") @Tags("SalaryRank") diff --git a/src/controllers/SalaryRankEmployeeController.ts b/src/controllers/SalaryRankEmployeeController.ts index 4e4a866..51ea4be 100644 --- a/src/controllers/SalaryRankEmployeeController.ts +++ b/src/controllers/SalaryRankEmployeeController.ts @@ -14,7 +14,7 @@ import { Get, Query, } from "tsoa"; -import { Not, Like, Brackets } from "typeorm"; +import { Not, Brackets } from "typeorm"; import { AppDataSource } from "../database/data-source"; import HttpSuccess from "../interfaces/http-success"; import HttpStatusCode from "../interfaces/http-status"; @@ -27,7 +27,7 @@ import { import { SalaryEmployee } from "../entities/SalaryEmployee"; import permission from "../interfaces/permission"; import { RequestWithUser } from "../middlewares/user"; -import { addLogSequence, setLogDataDiff } from "../interfaces/utils"; +import { setLogDataDiff } from "../interfaces/utils"; @Route("api/v1/salary/rate/employee") @Tags("SalaryRankEmployee")