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

41
src/controllers/PositionController.ts
View file

@ -41,6 +41,7 @@ import { AuthRole } from "../entities/AuthRole";
import { RequestWithUser } from "../middlewares/user";
import permission from "../interfaces/permission";
import { request } from "axios";
import { setLogDataDiff } from "../interfaces/utils";
@Route("api/v1/org/pos")
@Tags("Position")
@Security("bearerAuth")
@ -764,14 +765,15 @@ export class PositionController extends Controller {
"ไม่สามารถใส่เลขที่ตำแหน่งซ้ำกันได้",
);
}
const before = null;
posMaster.createdUserId = request.user.sub;
posMaster.createdFullName = request.user.name;
posMaster.lastUpdateUserId = request.user.sub;
posMaster.lastUpdateFullName = request.user.name;
posMaster.createdAt = new Date();
posMaster.lastUpdatedAt = new Date();
await this.posMasterRepository.save(posMaster);
await this.posMasterRepository.save(posMaster, { data: request });
setLogDataDiff(request, { before, after: posMaster });
await Promise.all(
requestBody.positions.map(async (x: any) => {
const position = Object.assign(new Position());
@ -791,7 +793,7 @@ export class PositionController extends Controller {
position.lastUpdateFullName = request.user.name;
position.createdAt = new Date();
position.lastUpdatedAt = new Date();
await this.positionRepository.save(position);
await this.positionRepository.save(position, { data: request });
}),
);
return new HttpSuccess(posMaster.id);
@ -980,14 +982,15 @@ export class PositionController extends Controller {
);
}
// }
const before = structuredClone(posMaster);
posMaster.createdUserId = request.user.sub;
posMaster.createdFullName = request.user.name;
posMaster.lastUpdateUserId = request.user.sub;
posMaster.lastUpdateFullName = request.user.name;
posMaster.createdAt = new Date();
posMaster.lastUpdatedAt = new Date();
await this.posMasterRepository.save(posMaster);
await this.posMasterRepository.save(posMaster, { data: request });
setLogDataDiff( request, { before, after: posMaster });
await this.positionRepository.delete({ posMasterId: posMaster.id });
await Promise.all(
@ -1013,7 +1016,7 @@ export class PositionController extends Controller {
position.lastUpdateFullName = request.user.name;
position.createdAt = new Date();
position.lastUpdatedAt = new Date();
await this.positionRepository.save(position);
await this.positionRepository.save(position, { data: request });
}),
);
return new HttpSuccess(posMaster.id);
@ -1898,6 +1901,7 @@ export class PositionController extends Controller {
@Request() request: RequestWithUser,
) {
await new permission().PermissionUpdate(request, "SYS_ORG");
const before = null;
switch (requestBody.type) {
case 0: {
const rootId = await this.posMasterRepository.findOne({
@ -1923,7 +1927,8 @@ export class PositionController extends Controller {
id: data.id,
posMasterOrder: requestBody.sortId.indexOf(data.id) + 1,
}));
await this.posMasterRepository.save(sortData_0);
await this.posMasterRepository.save(sortData_0, { data: request });
setLogDataDiff(request, { before, after: sortData_0 });
break;
}
@ -1951,7 +1956,8 @@ export class PositionController extends Controller {
id: data.id,
posMasterOrder: requestBody.sortId.indexOf(data.id) + 1,
}));
await this.posMasterRepository.save(sortData_1);
await this.posMasterRepository.save(sortData_1, { data: request });
setLogDataDiff(request, { before, after: sortData_1 });
break;
}
@ -1979,7 +1985,8 @@ export class PositionController extends Controller {
id: data.id,
posMasterOrder: requestBody.sortId.indexOf(data.id) + 1,
}));
await this.posMasterRepository.save(sortData_2);
await this.posMasterRepository.save(sortData_2, { data: request });
setLogDataDiff(request, { before, after: sortData_2 });
break;
}
@ -2007,7 +2014,8 @@ export class PositionController extends Controller {
id: data.id,
posMasterOrder: requestBody.sortId.indexOf(data.id) + 1,
}));
await this.posMasterRepository.save(sortData_3);
await this.posMasterRepository.save(sortData_3, { data: request });
setLogDataDiff(request, { before, after: sortData_3 });
break;
}
@ -2035,7 +2043,8 @@ export class PositionController extends Controller {
id: data.id,
posMasterOrder: requestBody.sortId.indexOf(data.id) + 1,
}));
await this.posMasterRepository.save(sortData_4);
await this.posMasterRepository.save(sortData_4, { data: request });
setLogDataDiff(request, { before, after: sortData_4 });
break;
}
@ -2497,7 +2506,7 @@ export class PositionController extends Controller {
}
}
}
const before = null;
if (change == true) {
posMaster.posMasterOrder = maxPosMasterOrder += 1;
posMaster.createdUserId = request.user.sub;
@ -2506,7 +2515,8 @@ export class PositionController extends Controller {
posMaster.lastUpdateFullName = request.user.name;
posMaster.createdAt = new Date();
posMaster.lastUpdatedAt = new Date();
await this.posMasterRepository.save(posMaster);
await this.posMasterRepository.save(posMaster, { data: request });
setLogDataDiff(request, { before, after: posMaster });
}
}),
);
@ -2986,10 +2996,11 @@ export class PositionController extends Controller {
}
await this.positionRepository.save(position);
});
const before = null;
dataMaster.isSit = requestBody.isSit;
dataMaster.next_holderId = requestBody.profileId;
await this.posMasterRepository.save(dataMaster);
await this.posMasterRepository.save(dataMaster, { data: request });
setLogDataDiff( request, { before, after: dataMaster });
return new HttpSuccess();
}