@goweekdays/core 2.0.0 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @goweekdays/core
 
+## 2.1.0
+
+### Minor Changes
+
+- 6cb41ce: App & Permission management initial release
+
 ## 2.0.0
 
 ### Major Changes

package/dist/index.d.ts

@@ -802,6 +802,7 @@ type TApp = {
     deletedAt?: string | Date;
 };
 declare const schemaApp: Joi.ObjectSchema<any>;
+declare const schemaAppUpdate: Joi.ObjectSchema<any>;
 declare function modelApp(value: TApp): TApp;
 
 declare function useAppRepo(): {
@@ -818,8 +819,7 @@ declare function useAppRepo(): {
     getById: (_id: string | ObjectId) => Promise<TApp | null>;
     updateById: (_id: ObjectId | string, value: {
         name: string;
-        serial: string;
-        levels: number;
+        description: string;
     }, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
@@ -830,6 +830,7 @@ declare function useAppService(): {
 
 declare function useAppController(): {
     add: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
@@ -842,29 +843,31 @@ type TPermission = {
     group: string;
     description: string;
     deprecated: boolean;
+    status?: string;
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
 };
 declare const schemaPermission: Joi.ObjectSchema<any>;
+declare const schemaPermissionUpdate: Joi.ObjectSchema<any>;
 declare function modelPermission(value: TPermission): TPermission;
 
 declare function usePermissionRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TPermission, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, school, status, }?: {
+    getAll: ({ search, page, limit, sort, app, status, }?: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
         sort?: {} | undefined;
-        school?: string | undefined;
+        app?: string | undefined;
         status?: string | undefined;
     }) => Promise<Record<string, any>>;
     getById: (_id: string | ObjectId) => Promise<TPermission | null>;
     updateById: (_id: ObjectId | string, value: {
-        name: string;
-        serial: string;
-        levels: number;
+        key?: string;
+        group?: string;
+        description?: string;
     }, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     deleteById: (_id: string | ObjectId, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     countByGroup: (group: string) => Promise<number>;
@@ -879,6 +882,7 @@ declare function usePermissionController(): {
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TPermissionGroup = {
@@ -886,23 +890,25 @@ type TPermissionGroup = {
     app: string;
     key: string;
     label: string;
-    order: number;
+    order?: number;
+    status?: string;
     createdAt?: string | Date;
     updatedAt?: string | Date;
     deletedAt?: string | Date;
 };
 declare const schemaPermissionGroup: Joi.ObjectSchema<any>;
+declare const schemaPermissionGroupUpdate: Joi.ObjectSchema<any>;
 declare function modelPermissionGroup(value: TPermissionGroup): TPermissionGroup;
 
 declare function usePermissionGroupRepo(): {
     createIndexes: () => Promise<void>;
     add: (value: TPermissionGroup, session?: ClientSession) => Promise<ObjectId>;
-    getAll: ({ search, page, limit, sort, school, status, }?: {
+    getAll: ({ search, page, limit, sort, app, status, }?: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
         sort?: {} | undefined;
-        school?: string | undefined;
+        app?: string | undefined;
         status?: string | undefined;
     }) => Promise<Record<string, any>>;
     getById: (_id: string | ObjectId) => Promise<TPermissionGroup | null>;
@@ -923,6 +929,7 @@ declare function usePermissionGroupController(): {
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare const MONGO_URI: string;
@@ -962,4 +969,4 @@ declare const XENDIT_SECRET_KEY: string;
 declare const XENDIT_BASE_URL: string;
 declare const DOMAIN: string;
 
-export { ACCESS_TOKEN_EXPIRY, ACCESS_TOKEN_SECRET, APP_ACCOUNT, APP_MAIN, DEFAULT_USER_EMAIL, DEFAULT_USER_FIRST_NAME, DEFAULT_USER_LAST_NAME, DEFAULT_USER_PASSWORD, DOMAIN, MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT, MAILER_TRANSPORT_SECURE, MAddress, MBuilding, MBuildingUnit, MFile, MMember, MONGO_DB, MONGO_URI, MOrg, MRole, MUser, MUserRole, MVerification, OrgTypes, PAYPAL_API_URL, PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PORT, REDIS_HOST, REDIS_PASSWORD, REDIS_PORT, REFRESH_TOKEN_EXPIRY, REFRESH_TOKEN_SECRET, SECRET_KEY, SPACES_ACCESS_KEY, SPACES_BUCKET, SPACES_ENDPOINT, SPACES_REGION, SPACES_SECRET_KEY, TAddress, TApp, TBuilding, TBuildingUnit, TCounter, TFile, TMember, TMiniRole, TOrg, TPSGC, TPermission, TPermissionGroup, TRole, TUser, TUserRole, TVerification, TVerificationMetadata, VERIFICATION_FORGET_PASSWORD_DURATION, VERIFICATION_USER_INVITE_DURATION, XENDIT_BASE_URL, XENDIT_SECRET_KEY, addressSchema, isDev, modelApp, modelPSGC, modelPermission, modelPermissionGroup, schemaApp, schemaBuilding, schemaBuildingUnit, schemaOrg, schemaPSGC, schemaPermission, schemaPermissionGroup, schemaUpdateOptions, transactionSchema, useAddressController, useAddressRepo, useAppController, useAppRepo, useAppService, useAuthController, useAuthService, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCounterModel, useCounterRepo, useFileController, useFileRepo, useFileService, useGitHubService, useMemberController, useMemberRepo, useOrgController, useOrgRepo, useOrgService, usePSGCController, usePSGCRepo, usePermissionController, usePermissionGroupController, usePermissionGroupRepo, usePermissionGroupService, usePermissionRepo, usePermissionService, useRoleController, useRoleRepo, useUserController, useUserRepo, useUserService, useUtilController, useVerificationController, useVerificationRepo, useVerificationService };
+export { ACCESS_TOKEN_EXPIRY, ACCESS_TOKEN_SECRET, APP_ACCOUNT, APP_MAIN, DEFAULT_USER_EMAIL, DEFAULT_USER_FIRST_NAME, DEFAULT_USER_LAST_NAME, DEFAULT_USER_PASSWORD, DOMAIN, MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT, MAILER_TRANSPORT_SECURE, MAddress, MBuilding, MBuildingUnit, MFile, MMember, MONGO_DB, MONGO_URI, MOrg, MRole, MUser, MUserRole, MVerification, OrgTypes, PAYPAL_API_URL, PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PORT, REDIS_HOST, REDIS_PASSWORD, REDIS_PORT, REFRESH_TOKEN_EXPIRY, REFRESH_TOKEN_SECRET, SECRET_KEY, SPACES_ACCESS_KEY, SPACES_BUCKET, SPACES_ENDPOINT, SPACES_REGION, SPACES_SECRET_KEY, TAddress, TApp, TBuilding, TBuildingUnit, TCounter, TFile, TMember, TMiniRole, TOrg, TPSGC, TPermission, TPermissionGroup, TRole, TUser, TUserRole, TVerification, TVerificationMetadata, VERIFICATION_FORGET_PASSWORD_DURATION, VERIFICATION_USER_INVITE_DURATION, XENDIT_BASE_URL, XENDIT_SECRET_KEY, addressSchema, isDev, modelApp, modelPSGC, modelPermission, modelPermissionGroup, schemaApp, schemaAppUpdate, schemaBuilding, schemaBuildingUnit, schemaOrg, schemaPSGC, schemaPermission, schemaPermissionGroup, schemaPermissionGroupUpdate, schemaPermissionUpdate, schemaUpdateOptions, transactionSchema, useAddressController, useAddressRepo, useAppController, useAppRepo, useAppService, useAuthController, useAuthService, useBuildingController, useBuildingRepo, useBuildingService, useBuildingUnitController, useBuildingUnitRepo, useBuildingUnitService, useCounterModel, useCounterRepo, useFileController, useFileRepo, useFileService, useGitHubService, useMemberController, useMemberRepo, useOrgController, useOrgRepo, useOrgService, usePSGCController, usePSGCRepo, usePermissionController, usePermissionGroupController, usePermissionGroupRepo, usePermissionGroupService, usePermissionRepo, usePermissionService, useRoleController, useRoleRepo, useUserController, useUserRepo, useUserService, useUtilController, useVerificationController, useVerificationRepo, useVerificationService };

package/dist/index.js

@@ -83,12 +83,15 @@ __export(src_exports, {
   modelPermission: () => modelPermission,
   modelPermissionGroup: () => modelPermissionGroup,
   schemaApp: () => schemaApp,
+  schemaAppUpdate: () => schemaAppUpdate,
   schemaBuilding: () => schemaBuilding,
   schemaBuildingUnit: () => schemaBuildingUnit,
   schemaOrg: () => schemaOrg,
   schemaPSGC: () => schemaPSGC,
   schemaPermission: () => schemaPermission,
   schemaPermissionGroup: () => schemaPermissionGroup,
+  schemaPermissionGroupUpdate: () => schemaPermissionGroupUpdate,
+  schemaPermissionUpdate: () => schemaPermissionUpdate,
   schemaUpdateOptions: () => schemaUpdateOptions,
   transactionSchema: () => transactionSchema,
   useAddressController: () => useAddressController,
@@ -6556,6 +6559,11 @@ var schemaApp = import_joi19.default.object({
   name: import_joi19.default.string().max(255).required(),
   description: import_joi19.default.string().max(1024).optional().allow("", null)
 });
+var schemaAppUpdate = import_joi19.default.object({
+  code: import_joi19.default.string().alphanum().max(20).optional().allow("", null),
+  name: import_joi19.default.string().max(255).optional().allow("", null),
+  description: import_joi19.default.string().max(1024).optional().allow("", null)
+});
 function modelApp(value) {
   const { error } = schemaApp.validate(value);
   if (error) {
@@ -6587,15 +6595,24 @@ function useAppRepo() {
   async function createIndexes() {
     try {
       await collection.createIndexes([
-        { key: { name: 1 }, unique: true, name: "unique_name_index" },
         { key: { code: 1 } },
         { key: { status: 1 } },
         {
           key: { code: "text", name: "text", description: "text" },
           name: "text_index"
         },
-        { key: { code: 1, status: 1 }, unique: true, name: "unique_code" },
-        { key: { name: 1, status: 1 }, unique: true, name: "unique_name" }
+        {
+          key: { code: 1, status: 1 },
+          unique: true,
+          name: "unique_code",
+          partialFilterExpression: { status: { $in: ["active", "draft"] } }
+        },
+        {
+          key: { name: 1, status: 1 },
+          unique: true,
+          name: "unique_name",
+          partialFilterExpression: { status: { $in: ["active", "draft"] } }
+        }
       ]);
     } catch (error) {
       throw new Error("Failed to create index on apps.");
@@ -6836,21 +6853,18 @@ function useAppService() {
 var import_utils40 = require("@goweekdays/utils");
 var import_joi20 = __toESM(require("joi"));
 function useAppController() {
-  const { getAll: _getAll, getById: _getById, add: _add } = useAppRepo();
+  const {
+    getAll: _getAll,
+    getById: _getById,
+    add: _add,
+    updateById: _updateById
+  } = useAppRepo();
   const { deleteById: _deleteById } = useAppService();
   async function add(req, res, next) {
     const value = req.body;
-    const validation = import_joi20.default.object({
-      name: import_joi20.default.string().required(),
-      school: import_joi20.default.string().hex().required(),
-      levels: import_joi20.default.number().integer().min(1).required(),
-      serial: import_joi20.default.string().optional().allow("", null),
-      status: import_joi20.default.string().optional().allow("", null)
-    });
-    const { error } = validation.validate(value);
+    const { error } = schemaApp.validate(value);
     if (error) {
       next(new import_utils40.BadRequestError(error.message));
-      import_utils40.logger.info(`Controller: ${error.message}`);
       return;
     }
     try {
@@ -6861,6 +6875,27 @@ function useAppController() {
       next(error2);
     }
   }
+  async function updateById(req, res, next) {
+    const id = req.params.id ?? "";
+    const { error: errorId } = import_joi20.default.string().hex().required().validate(id);
+    if (errorId) {
+      next(new import_utils40.BadRequestError(errorId.message));
+      return;
+    }
+    const value = req.body;
+    const { error } = schemaAppUpdate.validate(value);
+    if (error) {
+      next(new import_utils40.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const result = await _updateById(req.params.id, value);
+      res.json(result);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   async function getAll(req, res, next) {
     const query = req.query;
     const validation = import_joi20.default.object({
@@ -6945,6 +6980,7 @@ function useAppController() {
   }
   return {
     add,
+    updateById,
     getAll,
     getById,
     deleteById
@@ -6961,6 +6997,11 @@ var schemaPermission = import_joi21.default.object({
   description: import_joi21.default.string().max(1024).required(),
   deprecated: import_joi21.default.boolean().optional().allow(null)
 });
+var schemaPermissionUpdate = import_joi21.default.object({
+  key: import_joi21.default.string().optional().allow("", null),
+  group: import_joi21.default.string().optional().allow("", null),
+  description: import_joi21.default.string().max(1024).optional().allow("", null)
+});
 function modelPermission(value) {
   const { error } = schemaPermission.validate(value);
   if (error) {
@@ -6973,6 +7014,7 @@ function modelPermission(value) {
     group: value.group,
     description: value.description,
     deprecated: value.deprecated ?? false,
+    status: value.status ?? "active",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -7038,9 +7080,13 @@ function usePermissionRepo() {
   async function updateById(_id, value, session) {
     try {
       _id = new import_mongodb20.ObjectId(_id);
-    } catch (error) {
+    } catch (error2) {
       throw new import_utils42.BadRequestError("Invalid ID.");
     }
+    const { error } = schemaPermissionUpdate.validate(value);
+    if (error) {
+      throw new import_utils42.BadRequestError(`Invalid data: ${error.message}`);
+    }
     try {
       const res = await collection.updateOne(
         { _id },
@@ -7049,13 +7095,13 @@ function usePermissionRepo() {
       );
       delCachedData();
       return res;
-    } catch (error) {
+    } catch (error2) {
       import_utils42.logger.log({
         level: "error",
-        message: error.message
+        message: error2.message
       });
-      if (error instanceof import_utils42.AppError) {
-        throw error;
+      if (error2 instanceof import_utils42.AppError) {
+        throw error2;
       } else {
         throw new Error("Failed to update permission.");
       }
@@ -7066,35 +7112,27 @@ function usePermissionRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    school = "",
+    app = "",
     status = "active"
   } = {}) {
     page = page > 0 ? page - 1 : 0;
-    const query = {
-      status
-    };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
-    if (search) {
-      query.$text = { $search: search };
-    }
-    if (school) {
-      try {
-        query.school = new import_mongodb20.ObjectId(school);
-      } catch (error) {
-        throw new import_utils42.BadRequestError("Invalid school ID.");
-      }
-    }
+    const query = {};
     const cacheParams = {
       page,
       limit,
       sort: JSON.stringify(sort)
     };
-    if (search)
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    query.status = status;
+    cacheParams.status = status;
+    if (search) {
+      query.$text = { $search: search };
       cacheParams.search = search;
-    if (school)
-      cacheParams.school = school;
-    if (status !== "active")
-      cacheParams.status = status;
+    }
+    if (app) {
+      query.app = app;
+      cacheParams.app = app;
+    }
     const cacheKey = (0, import_utils42.makeCacheKey)(namespace_collection, cacheParams);
     import_utils42.logger.log({
       level: "info",
@@ -7283,7 +7321,12 @@ function usePermissionService() {
 var import_utils43 = require("@goweekdays/utils");
 var import_joi22 = __toESM(require("joi"));
 function usePermissionController() {
-  const { getAll: _getAll, getById: _getById, add: _add } = usePermissionRepo();
+  const {
+    getAll: _getAll,
+    getById: _getById,
+    add: _add,
+    updateById: _updateById
+  } = usePermissionRepo();
   const { deleteById: _deleteById } = usePermissionService();
   async function add(req, res, next) {
     const value = req.body;
@@ -7307,7 +7350,7 @@ function usePermissionController() {
       page: import_joi22.default.number().min(1).optional().allow("", null),
       limit: import_joi22.default.number().min(1).optional().allow("", null),
       search: import_joi22.default.string().optional().allow("", null),
-      school: import_joi22.default.string().hex().optional().allow("", null),
+      app: import_joi22.default.string().optional().allow("", null),
       status: import_joi22.default.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
@@ -7326,17 +7369,17 @@ function usePermissionController() {
         sortObj[field] = sortOrder[index] === "desc" ? -1 : 1;
       });
     }
-    const status = req.query.status ?? "active";
-    const school = req.query.school ?? "";
+    const app = req.query.app ?? "";
     const search = req.query.search ?? "";
+    const status = req.query.status ?? "active";
     try {
       const buildings = await _getAll({
         page,
         limit,
         sort: sortObj,
-        status,
-        school,
-        search
+        app,
+        search,
+        status
       });
       res.json(buildings);
       return;
@@ -7383,11 +7426,33 @@ function usePermissionController() {
       next(error2);
     }
   }
+  async function updateById(req, res, next) {
+    const id = req.params.id;
+    const { error: errorId } = import_joi22.default.string().hex().required().validate(id);
+    if (errorId) {
+      next(new import_utils43.BadRequestError(errorId.message));
+      return;
+    }
+    const payload = req.body;
+    const { error } = schemaPermissionUpdate.validate(payload);
+    if (error) {
+      next(new import_utils43.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const message = await _updateById(id, payload);
+      res.json(message);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     add,
     getAll,
     getById,
-    deleteById
+    deleteById,
+    updateById
   };
 }
 
@@ -7398,7 +7463,12 @@ var schemaPermissionGroup = import_joi23.default.object({
   app: import_joi23.default.string().required(),
   key: import_joi23.default.string().required(),
   label: import_joi23.default.string().required(),
-  order: import_joi23.default.number().integer().required()
+  order: import_joi23.default.number().integer().optional().allow("", null)
+});
+var schemaPermissionGroupUpdate = import_joi23.default.object({
+  key: import_joi23.default.string().optional().allow("", null),
+  label: import_joi23.default.string().optional().allow("", null),
+  order: import_joi23.default.number().integer().optional().allow("", null)
 });
 function modelPermissionGroup(value) {
   const { error } = schemaPermissionGroup.validate(value);
@@ -7410,7 +7480,8 @@ function modelPermissionGroup(value) {
     app: value.app,
     key: value.key,
     label: value.label,
-    order: value.order,
+    order: value.order ?? Date.now(),
+    status: value.status ?? "active",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -7439,7 +7510,7 @@ function usePermissionGroupRepo() {
           name: "text_index"
         },
         {
-          key: { app: 1, key: 1 },
+          key: { app: 1, key: 1, label: 1 },
           unique: true,
           name: "unique_permission_group"
         }
@@ -7476,9 +7547,13 @@ function usePermissionGroupRepo() {
   async function updateById(_id, value, session) {
     try {
       _id = new import_mongodb21.ObjectId(_id);
-    } catch (error) {
+    } catch (error2) {
       throw new import_utils45.BadRequestError("Invalid ID.");
     }
+    const { error } = schemaPermissionGroupUpdate.validate(value);
+    if (error) {
+      throw new import_utils45.BadRequestError(`Invalid data: ${error.message}`);
+    }
     try {
       const res = await collection.updateOne(
         { _id },
@@ -7487,13 +7562,13 @@ function usePermissionGroupRepo() {
       );
       delCachedData();
       return res;
-    } catch (error) {
+    } catch (error2) {
       import_utils45.logger.log({
         level: "error",
-        message: error.message
+        message: error2.message
       });
-      if (error instanceof import_utils45.AppError) {
-        throw error;
+      if (error2 instanceof import_utils45.AppError) {
+        throw error2;
       } else {
         throw new Error("Failed to update permission group.");
       }
@@ -7504,35 +7579,27 @@ function usePermissionGroupRepo() {
     page = 1,
     limit = 10,
     sort = {},
-    school = "",
+    app = "",
     status = "active"
   } = {}) {
     page = page > 0 ? page - 1 : 0;
-    const query = {
-      status
-    };
-    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
-    if (search) {
-      query.$text = { $search: search };
-    }
-    if (school) {
-      try {
-        query.school = new import_mongodb21.ObjectId(school);
-      } catch (error) {
-        throw new import_utils45.BadRequestError("Invalid school ID.");
-      }
-    }
+    const query = {};
     const cacheParams = {
       page,
       limit,
       sort: JSON.stringify(sort)
     };
-    if (search)
+    sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    query.status = status;
+    cacheParams.status = status;
+    if (search) {
+      query.$text = { $search: search };
       cacheParams.search = search;
-    if (school)
-      cacheParams.school = school;
-    if (status !== "active")
-      cacheParams.status = status;
+    }
+    if (app) {
+      query.app = app;
+      cacheParams.app = app;
+    }
     const cacheKey = (0, import_utils45.makeCacheKey)(namespace_collection, cacheParams);
     import_utils45.logger.log({
       level: "info",
@@ -7697,7 +7764,8 @@ function usePermissionGroupController() {
   const {
     getAll: _getAll,
     getById: _getById,
-    add: _add
+    add: _add,
+    updateById: _updateById
   } = usePermissionGroupRepo();
   const { deleteById: _deleteById } = usePermissionGroupService();
   async function add(req, res, next) {
@@ -7722,7 +7790,7 @@ function usePermissionGroupController() {
       page: import_joi24.default.number().min(1).optional().allow("", null),
       limit: import_joi24.default.number().min(1).optional().allow("", null),
       search: import_joi24.default.string().optional().allow("", null),
-      school: import_joi24.default.string().hex().optional().allow("", null),
+      app: import_joi24.default.string().optional().allow("", null),
       status: import_joi24.default.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
@@ -7741,17 +7809,17 @@ function usePermissionGroupController() {
         sortObj[field] = sortOrder[index] === "desc" ? -1 : 1;
       });
     }
-    const status = req.query.status ?? "active";
-    const school = req.query.school ?? "";
+    const app = req.query.app ?? "";
     const search = req.query.search ?? "";
+    const status = req.query.status ?? "active";
     try {
       const buildings = await _getAll({
         page,
         limit,
         sort: sortObj,
-        status,
-        school,
-        search
+        app,
+        search,
+        status
       });
       res.json(buildings);
       return;
@@ -7798,11 +7866,33 @@ function usePermissionGroupController() {
       next(error2);
     }
   }
+  async function updateById(req, res, next) {
+    const id = req.params.id;
+    const { error: errorId } = import_joi24.default.string().hex().required().validate(id);
+    if (errorId) {
+      next(new import_utils46.BadRequestError(errorId.message));
+      return;
+    }
+    const payload = req.body;
+    const { error } = schemaPermissionGroupUpdate.validate(payload);
+    if (error) {
+      next(new import_utils46.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const message = await _updateById(id, payload);
+      res.json(message);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     add,
     getAll,
     getById,
-    deleteById
+    deleteById,
+    updateById
   };
 }
 // Annotate the CommonJS export names for ESM import in node:
@@ -7860,12 +7950,15 @@ function usePermissionGroupController() {
   modelPermission,
   modelPermissionGroup,
   schemaApp,
+  schemaAppUpdate,
   schemaBuilding,
   schemaBuildingUnit,
   schemaOrg,
   schemaPSGC,
   schemaPermission,
   schemaPermissionGroup,
+  schemaPermissionGroupUpdate,
+  schemaPermissionUpdate,
   schemaUpdateOptions,
   transactionSchema,
   useAddressController,