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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
Kittapath 2024-06-12 15:17:13 +07:00
commit 681b0aa326
1 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/controllers/AuthRoleController.ts
View file

@ -115,17 +115,51 @@ export class AuthRoleController extends Controller {
where: { authRoleId: roleId }, where: { authRoleId: roleId },
}); });
const updatedRoleAttrData = roleAttrData.map((attr) => { // const updatedRoleAttrData = roleAttrData.map((attr) => {
const updatedAttr = body.authRoleAttrs.find((a) => a.authSysId === attr.authSysId); // const updatedAttr = body.authRoleAttrs.find((a) => a.authSysId === attr.authSysId);
if (updatedAttr) { // if (updatedAttr) {
return Object.assign(attr, updatedAttr, { lastUpdateFullName: req.user.name }); // return Object.assign(attr, updatedAttr, { lastUpdateFullName: req.user.name });
} // }
return attr; // return attr;
// });
// const newAttrs = body.authRoleAttrs
// .filter((a) => !roleAttrData.some((attr) => attr.authSysId === a.authSysId))
// .map((attr) => {
// const newAttr = new AuthRoleAttr();
// Object.assign(newAttr, attr, {
// authRoleId: roleId,
// createdUserId: req.user.sub,
// createdFullName: req.user.name,
// lastUpdateUserId: req.user.sub,
// lastUpdateFullName: req.user.name,
// });
// return newAttr;
// });
// await Promise.all([
// this.authRoleRepo.save(record),
// ...updatedRoleAttrData.map((attr) => this.authRoleAttrRepo.save(attr)),
// ...newAttrs.map((attr) => this.authRoleAttrRepo.save(attr)),
// ]);
await this.authRoleAttrRepo.remove(roleAttrData);
const newAttrs = body.authRoleAttrs.map((attr) => {
const newAttr = new AuthRoleAttr();
Object.assign(newAttr, attr, {
authRoleId: roleId,
createdUserId: req.user.sub,
createdFullName: req.user.name,
lastUpdateUserId: req.user.sub,
lastUpdateFullName: req.user.name,
});
return newAttr;
}); });
await Promise.all([ await Promise.all([
this.authRoleRepo.save(record), this.authRoleRepo.save(record),
...updatedRoleAttrData.map((attr) => this.authRoleAttrRepo.save(attr)), ...newAttrs.map((attr) => this.authRoleAttrRepo.save(attr)),
]); ]);
return new HttpSuccess(); return new HttpSuccess();