@tomei/sso 0.33.3 → 0.33.5

package/package.json

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

package/src/components/group/group.ts

@@ -485,9 +485,7 @@ export class Group extends ObjectBase {
 
       if (Search) {
         Object.entries(Search).forEach(([key, value]) => {
-          queryObj[key] = {
-            [Op.eq]: value,
-          };
+          queryObj[key] = value;
         });
       }
 
@@ -502,14 +500,13 @@ export class Group extends ObjectBase {
           ...options,
           limit: Rows,
           offset: Rows * (Page - 1),
-          order: [
-            ['CreatedAt', 'DESC'],
-            ['Status', 'Active'],
-          ],
+          order: [['CreatedAt', 'DESC']],
         };
       }
 
-      const systemAccess = await Group._GroupSystemAccessRepo.findAndCountAll();
+      const systemAccess = await Group._GroupSystemAccessRepo.findAndCountAll(
+        options,
+      );
       return systemAccess;
     } catch (error) {
       return error;
@@ -706,7 +703,7 @@ export class Group extends ObjectBase {
         { SystemCode: SystemCode },
       );
 
-      if (!currentGroupSystemAccess) {
+      if (currentGroupSystemAccess.count < 1) {
         throw new ClassError(
           'Group',
           'GroupErrMsg10',
@@ -721,13 +718,13 @@ export class Group extends ObjectBase {
       );
 
       const EntityValueBefore = {
-        GroupCode: currentGroupSystemAccess.GroupCode,
-        SystemCode: currentGroupSystemAccess.SystemCode,
-        Status: currentGroupSystemAccess.Status,
-        CreatedById: currentGroupSystemAccess.CreatedById,
-        CreatedAt: currentGroupSystemAccess.CreatedAt,
-        UpdatedById: currentGroupSystemAccess.UpdatedById,
-        UpdatedAt: currentGroupSystemAccess.UpdatedAt,
+        GroupCode: currentGroupSystemAccess?.rows[0]?.GroupCode,
+        SystemCode: currentGroupSystemAccess?.rows[0]?.SystemCode,
+        Status: currentGroupSystemAccess?.rows[0]?.Status,
+        CreatedById: currentGroupSystemAccess?.rows[0]?.CreatedById,
+        CreatedAt: currentGroupSystemAccess?.rows[0]?.CreatedAt,
+        UpdatedById: currentGroupSystemAccess?.rows[0]?.UpdatedById,
+        UpdatedAt: currentGroupSystemAccess?.rows[0]?.UpdatedAt,
       };
 
       const activity = new Activity();
@@ -736,7 +733,7 @@ export class Group extends ObjectBase {
       activity.Description = 'Delete Group System Access';
       activity.EntityType = 'GroupSystemAccess';
       activity.EntityId =
-        currentGroupSystemAccess.GroupSystemAccessId?.toString();
+        currentGroupSystemAccess?.rows[0]?.GroupSystemAccessId?.toString();
       activity.EntityValueBefore = JSON.stringify(EntityValueBefore);
       activity.EntityValueAfter = JSON.stringify({});