fix log
This commit is contained in:
parent
b9bc5b1298
commit
cb1eb5a68e
8 changed files with 92 additions and 56 deletions
|
|
@ -24,6 +24,7 @@ import { Brackets } from "typeorm";
|
|||
import { DevelopmentProject } from "../entities/DevelopmentProject";
|
||||
import { ProfileDevelopment } from "../entities/ProfileDevelopment";
|
||||
import { ProfileDevelopmentHistory } from "../entities/ProfileDevelopmentHistory";
|
||||
import { setLogDataDiff } from "../interfaces/utils";
|
||||
@Route("api/v1/org/profile/development-request")
|
||||
@Tags("DevelopmentRequest")
|
||||
@Security("bearerAuth")
|
||||
|
|
@ -209,7 +210,7 @@ export class DevelopmentRequestController extends Controller {
|
|||
if (!profile) {
|
||||
throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
|
||||
}
|
||||
|
||||
const before = null;
|
||||
const data = new DevelopmentRequest();
|
||||
|
||||
const meta = {
|
||||
|
|
@ -224,7 +225,8 @@ export class DevelopmentRequestController extends Controller {
|
|||
Object.assign(data, { ...body, ...meta });
|
||||
data.profileId = profile.id;
|
||||
data.status = "PENDING";
|
||||
await this.developmentRequestRepository.save(data);
|
||||
await this.developmentRequestRepository.save(data, { data: req });
|
||||
setLogDataDiff(req, { before, after: data });
|
||||
|
||||
if (body.developmentProjects != null) {
|
||||
await Promise.all(
|
||||
|
|
@ -238,7 +240,8 @@ export class DevelopmentRequestController extends Controller {
|
|||
developmentProject.createdAt = new Date();
|
||||
developmentProject.lastUpdatedAt = new Date();
|
||||
developmentProject.developmentRequestId = data.id;
|
||||
await this.developmentProjectRepository.save(developmentProject);
|
||||
await this.developmentProjectRepository.save(developmentProject, { data: req });
|
||||
setLogDataDiff(req, { before, after: developmentProject });
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
|
@ -255,13 +258,15 @@ export class DevelopmentRequestController extends Controller {
|
|||
where: { id: developmentId },
|
||||
relations: ["developmentProjects"],
|
||||
});
|
||||
const before = structuredClone(record);
|
||||
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
|
||||
Object.assign(record, body);
|
||||
record.lastUpdateUserId = req.user.sub;
|
||||
record.lastUpdateFullName = req.user.name;
|
||||
record.lastUpdatedAt = new Date();
|
||||
|
||||
await this.developmentRequestRepository.save(record);
|
||||
await this.developmentRequestRepository.save(record, {data: req});
|
||||
setLogDataDiff(req, { before, after: record });
|
||||
await this.developmentProjectRepository.delete({ developmentRequestId: record.id });
|
||||
if (body.developmentProjects != null) {
|
||||
await Promise.all(
|
||||
|
|
@ -275,7 +280,8 @@ export class DevelopmentRequestController extends Controller {
|
|||
developmentProject.createdAt = new Date();
|
||||
developmentProject.lastUpdatedAt = new Date();
|
||||
developmentProject.developmentRequestId = record.id;
|
||||
await this.developmentProjectRepository.save(developmentProject);
|
||||
await this.developmentProjectRepository.save(developmentProject, { data: req });
|
||||
setLogDataDiff(req, { before: null, after: record });
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
|
@ -295,6 +301,7 @@ export class DevelopmentRequestController extends Controller {
|
|||
});
|
||||
if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
|
||||
await new permission().PermissionUpdate(req, "SYS_REGISTRY_OFFICER");
|
||||
const before = structuredClone(record);
|
||||
requestBody.status = requestBody.status.trim().toUpperCase();
|
||||
Object.assign(record, requestBody);
|
||||
|
||||
|
|
@ -302,7 +309,8 @@ export class DevelopmentRequestController extends Controller {
|
|||
record.lastUpdateFullName = req.user.name;
|
||||
record.lastUpdatedAt = new Date();
|
||||
|
||||
await this.developmentRequestRepository.save(record);
|
||||
await this.developmentRequestRepository.save(record, { data: req });
|
||||
setLogDataDiff(req, { before, after: record });
|
||||
if (requestBody.status == "APPROVE") {
|
||||
let profileDevelopment = new ProfileDevelopment();
|
||||
const meta = {
|
||||
|
|
@ -321,7 +329,7 @@ export class DevelopmentRequestController extends Controller {
|
|||
kpiDevelopmentId: record.id,
|
||||
developmentProjects: [],
|
||||
});
|
||||
await this.profileDevelopmentRepository.save(profileDevelopment);
|
||||
await this.profileDevelopmentRepository.save(profileDevelopment, { data: req });
|
||||
|
||||
const history = new ProfileDevelopmentHistory();
|
||||
Object.assign(history, {
|
||||
|
|
@ -332,7 +340,7 @@ export class DevelopmentRequestController extends Controller {
|
|||
developmentProjects: [],
|
||||
});
|
||||
history.profileDevelopmentId = profileDevelopment.id;
|
||||
await this.developmentHistoryRepository.save(history);
|
||||
await this.developmentHistoryRepository.save(history, { data: req });
|
||||
|
||||
if (record.developmentProjects != null) {
|
||||
await Promise.all(
|
||||
|
|
@ -352,8 +360,9 @@ export class DevelopmentRequestController extends Controller {
|
|||
profileDevelopmentHistoryId: history.id,
|
||||
});
|
||||
await Promise.all([
|
||||
this.developmentProjectRepository.save(developmentProject),
|
||||
this.developmentProjectRepository.save(developmentProjectHistory),
|
||||
this.developmentProjectRepository.save(developmentProject, { data: req }),
|
||||
setLogDataDiff(req, { before: null, after: developmentProject }),
|
||||
this.developmentProjectRepository.save(developmentProjectHistory, { data: req }),
|
||||
]);
|
||||
}),
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue