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

ผูก log โครงสร้างขรก

Browse source
This commit is contained in:
AdisakKanthawilang 2024-10-04 11:07:46 +07:00
parent 79989664d5
commit b3ecbf5496
7 changed files with 76 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/controllers/OrganizationController.ts
View file

@ -32,6 +32,7 @@ import { RequestWithUser } from "../middlewares/user";
import permission from "../interfaces/permission";
import { PermissionOrg } from "../entities/PermissionOrg";
import FunctionMain from "../interfaces/functionMain";
import { setLogDataDiff } from "../interfaces/utils";
@Route("api/v1/org")
@Tags("Organization")
@ -124,6 +125,7 @@ export class OrganizationController extends Controller {
@Request() request: RequestWithUser,
) {
//new main revision
const before = null;
const revision = Object.assign(new OrgRevision(), requestBody) as OrgRevision;
revision.orgRevisionIsDraft = true;
revision.orgRevisionIsCurrent = false;
@ -133,8 +135,8 @@ export class OrganizationController extends Controller {
revision.lastUpdateFullName = request.user.name;
revision.createdAt = new Date();
revision.lastUpdatedAt = new Date();
await this.orgRevisionRepository.save(revision);
await this.orgRevisionRepository.save(revision, { data: request });
setLogDataDiff(request, { before, after: revision });
//cone tree
if (
requestBody.typeDraft.toUpperCase() == "ORG" ||
@ -2241,12 +2243,14 @@ export class OrganizationController extends Controller {
if (!orgRevision) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "not found. RevisionId");
}
const before = structuredClone(orgRevision);
orgRevision.lastUpdateUserId = request.user.sub;
orgRevision.lastUpdateFullName = request.user.name;
orgRevision.lastUpdatedAt = new Date();
orgRevision.orgPublishDate = requestBody.orgPublishDate;
this.orgRevisionRepository.merge(orgRevision, requestBody);
await this.orgRevisionRepository.save(orgRevision);
await this.orgRevisionRepository.save(orgRevision, { data: request });
setLogDataDiff(request, { before, after: orgRevision });
return new HttpSuccess();
}
@ -2400,6 +2404,7 @@ export class OrganizationController extends Controller {
@Request() request: RequestWithUser,
) {
await new permission().PermissionUpdate(request, "SYS_ORG");
const before = null;
switch (requestBody.type) {
case 0: {
const revisionId = await this.orgRevisionRepository.findOne({
@ -2419,7 +2424,8 @@ export class OrganizationController extends Controller {
id: data.id,
orgRootOrder: requestBody.sortId.indexOf(data.id) + 1,
}));
await this.orgRootRepository.save(sortData);
await this.orgRootRepository.save(sortData, { data: request });
setLogDataDiff(request, { before, after: sortData });
break;
}
@ -2439,7 +2445,8 @@ export class OrganizationController extends Controller {
id: data.id,
orgChild1Order: requestBody.sortId.indexOf(data.id) + 1,
}));
await this.child1Repository.save(sortData);
await this.child1Repository.save(sortData, { data: request });
setLogDataDiff(request, { before, after: sortData });
break;
}
@ -2459,7 +2466,8 @@ export class OrganizationController extends Controller {
id: data.id,
orgChild2Order: requestBody.sortId.indexOf(data.id) + 1,
}));
await this.child2Repository.save(sortData);
await this.child2Repository.save(sortData, { data: request });
setLogDataDiff(request, { before, after: sortData });
break;
}
@ -2479,7 +2487,8 @@ export class OrganizationController extends Controller {
id: data.id,
orgChild3Order: requestBody.sortId.indexOf(data.id) + 1,
}));
await this.child3Repository.save(sortData);
await this.child3Repository.save(sortData, { data: request });
setLogDataDiff(request, { before, after: sortData });
break;
}
@ -2499,7 +2508,8 @@ export class OrganizationController extends Controller {
id: data.id,
orgChild4Order: requestBody.sortId.indexOf(data.id) + 1,
}));
await this.child4Repository.save(sortData);
await this.child4Repository.save(sortData, { data: request });
setLogDataDiff(request, { before, after: sortData });
break;
}