hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix log

Browse source
This commit is contained in:
AdisakKanthawilang 2024-10-04 18:12:23 +07:00
parent b9bc5b1298
commit cb1eb5a68e
8 changed files with 92 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/EmployeePositionController.ts
View file

@ -39,6 +39,8 @@ import { AuthRole } from "../entities/AuthRole";
import { RequestWithUser } from "../middlewares/user";
import permission from "../interfaces/permission";
import { request } from "axios";
import { setLogDataDiff } from "../interfaces/utils";
import { after } from "node:test";
@Route("api/v1/org/employee/pos")
@Tags("Employee")
@Security("bearerAuth")
@ -584,14 +586,15 @@ export class EmployeePositionController extends Controller {
"ไม่สามารถใส่เลขที่ตำแหน่งซ้ำกันได้",
);
}
const before = null;
posMaster.createdUserId = request.user.sub;
posMaster.createdFullName = request.user.name;
posMaster.createdAt = new Date();
posMaster.lastUpdateUserId = request.user.sub;
posMaster.lastUpdateFullName = request.user.name;
posMaster.lastUpdatedAt = new Date();
await this.employeePosMasterRepository.save(posMaster);
await this.employeePosMasterRepository.save(posMaster, { data: request });
setLogDataDiff(request, { before, after: posMaster });
await Promise.all(
requestBody.positions.map(async (x: any) => {
const position = Object.assign(new EmployeePosition());
@ -606,7 +609,7 @@ export class EmployeePositionController extends Controller {
position.lastUpdateUserId = request.user.sub;
position.lastUpdateFullName = request.user.name;
position.lastUpdatedAt = new Date();
await this.employeePositionRepository.save(position);
await this.employeePositionRepository.save(position, { data: request});
}),
);
return new HttpSuccess(posMaster.id);
@ -796,14 +799,15 @@ export class EmployeePositionController extends Controller {
"ไม่สามารถใส่เลขที่ตำแหน่งซ้ำกันได้",
);
}
const before = structuredClone(posMaster);
posMaster.createdUserId = request.user.sub; //สงสัยว่าทำให้ bug แก้ไขไม่ได้
posMaster.createdFullName = request.user.name;
posMaster.createdAt = new Date();
posMaster.lastUpdateUserId = request.user.sub;
posMaster.lastUpdateFullName = request.user.name;
posMaster.lastUpdatedAt = new Date();
await this.employeePosMasterRepository.save(posMaster);
await this.employeePosMasterRepository.save(posMaster, { data: request });
setLogDataDiff(request, { before, after: posMaster });
await this.employeePositionRepository.delete({ posMasterId: posMaster.id });
await Promise.all(
@ -820,7 +824,7 @@ export class EmployeePositionController extends Controller {
position.lastUpdateUserId = request.user.sub;
position.lastUpdateFullName = request.user.name;
position.lastUpdatedAt = new Date();
await this.employeePositionRepository.save(position);
await this.employeePositionRepository.save(position, { data: request });
}),
);
return new HttpSuccess(posMaster.id);