@tomei/sso 0.38.7 → 0.38.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/sso",
-  "version": "0.38.7",
+  "version": "0.38.9",
   "description": "Tomei SSO Package",
   "main": "dist/index.js",
   "scripts": {

package/src/components/group/group.ts

@@ -72,6 +72,10 @@ export class Group extends TreeNodeBase<Group> {
     return this._UpdatedAt;
   }
 
+  get Path(): string {
+    return this._Path;
+  }
+
   set Path(value: string) {
     this._Path = value;
   }
@@ -167,7 +171,8 @@ export class Group extends TreeNodeBase<Group> {
     }
 
     if (this.parent) {
-      this._Path = (await this.parent.getPath(dbTransaction)) + '/' + this.Name;
+      this._Path =
+        (await this.parent.getPath(dbTransaction)) + '/' + this.GroupCode;
       return this._Path;
     }
     this._Path = this.GroupCode;
@@ -433,10 +438,12 @@ export class Group extends TreeNodeBase<Group> {
         //Break the path into array with oldGroupCode/ as separator;
         const path = children.Path.split(`${oldGroupCode}/`);
         //Retrive the last element of the array
-        const childPath = path[path.length - 1];
-        //Combine the childPath with this.Path
-        children.Path = `${this.Path}/${childPath}`;
-        await children.update({ Path: path }, { transaction: dbTransaction });
+        const childPath = path[1];
+        //Combine the childPath with this.Path then save it to the children.Path
+        await children.update(
+          { Path: `${this._Path}/${childPath}` },
+          { transaction: dbTransaction },
+        );
       });
     } catch (error) {
       throw error;
@@ -473,39 +480,38 @@ export class Group extends TreeNodeBase<Group> {
       );
     }
     try {
-      const currentGroup = await Group.init(dbTransaction, group.GroupCode);
       if (group.NewGroupCode) {
         await Group.checkDuplicateGroupCode(dbTransaction, group.NewGroupCode);
       }
 
       const entityValueBefore = {
-        GroupCode: currentGroup.GroupCode,
-        Name: currentGroup.Name,
-        Type: currentGroup.Type,
-        Description: currentGroup.Description,
-        ParentGroupCode: currentGroup.ParentGroupCode,
-        InheritParentPrivilegeYN: currentGroup.InheritParentPrivilegeYN,
-        InheritParentSystemAccessYN: currentGroup.InheritParentSystemAccessYN,
-        Path: currentGroup.Path,
-        Status: currentGroup.Status,
-        CreatedById: currentGroup._CreatedById,
-        UpdatedById: currentGroup._UpdatedById,
-        CreatedAt: currentGroup._CreatedAt,
-        UpdatedAt: currentGroup._UpdatedAt,
+        GroupCode: this.GroupCode,
+        Name: this.Name,
+        Type: this.Type,
+        Description: this.Description,
+        ParentGroupCode: this.ParentGroupCode,
+        InheritParentPrivilegeYN: this.InheritParentPrivilegeYN,
+        InheritParentSystemAccessYN: this.InheritParentSystemAccessYN,
+        Path: this.Path,
+        Status: this.Status,
+        CreatedById: this._CreatedById,
+        UpdatedById: this._UpdatedById,
+        CreatedAt: this._CreatedAt,
+        UpdatedAt: this._UpdatedAt,
       };
 
       let isPathChanged = false;
-      const oldGroupCode = currentGroup.GroupCode;
+      const oldGroupCode = this.GroupCode;
       if (group.NewGroupCode) {
-        currentGroup.GroupCode = group.NewGroupCode;
+        this.GroupCode = group.NewGroupCode;
         isPathChanged = true;
       }
 
       //Check if ParentGroupCode is changed or added
       if (
         (group.ParentGroupCode &&
-          currentGroup.ParentGroupCode !== group.ParentGroupCode) ||
-        (group.ParentGroupCode && !currentGroup.ParentGroupCode)
+          this.ParentGroupCode !== group.ParentGroupCode) ||
+        (group.ParentGroupCode && !this.ParentGroupCode)
       ) {
         const parentGroup = await Group.init(
           dbTransaction,
@@ -518,46 +524,43 @@ export class Group extends TreeNodeBase<Group> {
             'Parent Group Code not found',
           );
         }
-        await currentGroup.setParent(parentGroup);
+        await this.setParent(parentGroup);
         //Check if ParentGroupCode is removed
         isPathChanged = true;
-      } else if (!group.ParentGroupCode && currentGroup.ParentGroupCode) {
-        await currentGroup.setParent(null);
+      } else if (!group.ParentGroupCode && this.ParentGroupCode) {
+        await this.setParent(null);
         isPathChanged = true;
       }
 
       if (isPathChanged) {
-        await currentGroup.updateChildrenPath(oldGroupCode, dbTransaction);
+        await this.updateChildrenPath(oldGroupCode, dbTransaction);
       }
 
-      currentGroup.Name = group?.Name || currentGroup.Name;
-      currentGroup.Type = group?.Type || currentGroup.Type;
-      currentGroup.Description = group?.Description || currentGroup.Description;
-      currentGroup.ParentGroupCode =
-        group?.ParentGroupCode || currentGroup.ParentGroupCode;
-      currentGroup.InheritParentPrivilegeYN =
-        group?.InheritParentPrivilegeYN ||
-        currentGroup.InheritParentPrivilegeYN;
-      currentGroup.InheritParentSystemAccessYN =
-        group?.InheritParentSystemAccessYN ||
-        currentGroup.InheritParentSystemAccessYN;
-      currentGroup.Status = group?.Status || currentGroup.Status;
-      currentGroup._UpdatedById = loginUser.UserId;
-      currentGroup._UpdatedAt = new Date();
+      this.Name = group?.Name || this.Name;
+      this.Type = group?.Type || this.Type;
+      this.Description = group?.Description || this.Description;
+      this.ParentGroupCode = group?.ParentGroupCode || this.ParentGroupCode;
+      this.InheritParentPrivilegeYN =
+        group?.InheritParentPrivilegeYN || this.InheritParentPrivilegeYN;
+      this.InheritParentSystemAccessYN =
+        group?.InheritParentSystemAccessYN || this.InheritParentSystemAccessYN;
+      this.Status = group?.Status || this.Status;
+      this._UpdatedById = loginUser.UserId;
+      this._UpdatedAt = new Date();
 
       await Group._Repo.update(
         {
-          GroupCode: currentGroup.GroupCode,
-          Name: currentGroup.Name,
-          Type: currentGroup.Type,
-          Description: currentGroup.Description,
-          ParentGroupCode: currentGroup.ParentGroupCode,
-          InheritParentPrivilegeYN: currentGroup.InheritParentPrivilegeYN,
-          InheritParentSystemAccessYN: currentGroup.InheritParentSystemAccessYN,
-          Status: currentGroup.Status,
-          Path: currentGroup._Path,
-          UpdatedById: currentGroup._UpdatedById,
-          UpdatedAt: currentGroup._UpdatedAt,
+          GroupCode: this.GroupCode,
+          Name: this.Name,
+          Type: this.Type,
+          Description: this.Description,
+          ParentGroupCode: this.ParentGroupCode,
+          InheritParentPrivilegeYN: this.InheritParentPrivilegeYN,
+          InheritParentSystemAccessYN: this.InheritParentSystemAccessYN,
+          Status: this.Status,
+          Path: this._Path,
+          UpdatedById: this._UpdatedById,
+          UpdatedAt: this._UpdatedAt,
         },
         {
           where: {
@@ -568,19 +571,19 @@ export class Group extends TreeNodeBase<Group> {
       );
 
       const entityValueAfter = {
-        GroupCode: currentGroup.GroupCode,
-        Name: currentGroup.Name,
-        Type: currentGroup.Type,
-        Description: currentGroup.Description,
-        ParentGroupCode: currentGroup.ParentGroupCode,
-        InheritParentPrivilegeYN: currentGroup.InheritParentPrivilegeYN,
-        InheritParentSystemAccessYN: currentGroup.InheritParentSystemAccessYN,
-        Status: currentGroup.Status,
-        Path: currentGroup._Path,
-        CreatedById: currentGroup._CreatedById,
-        UpdatedById: currentGroup._UpdatedById,
-        CreatedAt: currentGroup._CreatedAt,
-        UpdatedAt: currentGroup._UpdatedAt,
+        GroupCode: this.GroupCode,
+        Name: this.Name,
+        Type: this.Type,
+        Description: this.Description,
+        ParentGroupCode: this.ParentGroupCode,
+        InheritParentPrivilegeYN: this.InheritParentPrivilegeYN,
+        InheritParentSystemAccessYN: this.InheritParentSystemAccessYN,
+        Status: this.Status,
+        Path: this._Path,
+        CreatedById: this._CreatedById,
+        UpdatedById: this._UpdatedById,
+        CreatedAt: this._CreatedAt,
+        UpdatedAt: this._UpdatedAt,
       };
 
       const activity = new Activity();
@@ -593,7 +596,7 @@ export class Group extends TreeNodeBase<Group> {
       activity.EntityValueAfter = JSON.stringify(entityValueAfter);
       await activity.create(loginUser.ObjectId, dbTransaction);
 
-      return currentGroup;
+      return this;
     } catch (error) {
       throw error;
     }