@goweekdays/core 2.0.0 → 2.1.1

package/dist/index.mjs

@@ -6549,6 +6549,11 @@ var schemaApp = Joi19.object({
   name: Joi19.string().max(255).required(),
   description: Joi19.string().max(1024).optional().allow("", null)
 });
+var schemaAppUpdate = Joi19.object({
+  code: Joi19.string().alphanum().max(20).optional().allow("", null),
+  name: Joi19.string().max(255).optional().allow("", null),
+  description: Joi19.string().max(1024).optional().allow("", null)
+});
 function modelApp(value) {
   const { error } = schemaApp.validate(value);
   if (error) {
@@ -6589,15 +6594,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.");
@@ -6835,24 +6849,21 @@ function useAppService() {
 }
 
 // src/resources/app/app.controller.ts
-import { BadRequestError as BadRequestError36, logger as logger20 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError36 } from "@goweekdays/utils";
 import Joi20 from "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 = Joi20.object({
-      name: Joi20.string().required(),
-      school: Joi20.string().hex().required(),
-      levels: Joi20.number().integer().min(1).required(),
-      serial: Joi20.string().optional().allow("", null),
-      status: Joi20.string().optional().allow("", null)
-    });
-    const { error } = validation.validate(value);
+    const { error } = schemaApp.validate(value);
     if (error) {
       next(new BadRequestError36(error.message));
-      logger20.info(`Controller: ${error.message}`);
       return;
     }
     try {
@@ -6863,6 +6874,27 @@ function useAppController() {
       next(error2);
     }
   }
+  async function updateById(req, res, next) {
+    const id = req.params.id ?? "";
+    const { error: errorId } = Joi20.string().hex().required().validate(id);
+    if (errorId) {
+      next(new BadRequestError36(errorId.message));
+      return;
+    }
+    const value = req.body;
+    const { error } = schemaAppUpdate.validate(value);
+    if (error) {
+      next(new BadRequestError36(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 = Joi20.object({
@@ -6947,6 +6979,7 @@ function useAppController() {
   }
   return {
     add,
+    updateById,
     getAll,
     getById,
     deleteById
@@ -6963,6 +6996,11 @@ var schemaPermission = Joi21.object({
   description: Joi21.string().max(1024).required(),
   deprecated: Joi21.boolean().optional().allow(null)
 });
+var schemaPermissionUpdate = Joi21.object({
+  key: Joi21.string().optional().allow("", null),
+  group: Joi21.string().optional().allow("", null),
+  description: Joi21.string().max(1024).optional().allow("", null)
+});
 function modelPermission(value) {
   const { error } = schemaPermission.validate(value);
   if (error) {
@@ -6975,6 +7013,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: ""
@@ -7049,9 +7088,13 @@ function usePermissionRepo() {
   async function updateById(_id, value, session) {
     try {
       _id = new ObjectId20(_id);
-    } catch (error) {
+    } catch (error2) {
       throw new BadRequestError38("Invalid ID.");
     }
+    const { error } = schemaPermissionUpdate.validate(value);
+    if (error) {
+      throw new BadRequestError38(`Invalid data: ${error.message}`);
+    }
     try {
       const res = await collection.updateOne(
         { _id },
@@ -7060,13 +7103,13 @@ function usePermissionRepo() {
       );
       delCachedData();
       return res;
-    } catch (error) {
+    } catch (error2) {
       logger21.log({
         level: "error",
-        message: error.message
+        message: error2.message
       });
-      if (error instanceof AppError14) {
-        throw error;
+      if (error2 instanceof AppError14) {
+        throw error2;
       } else {
         throw new Error("Failed to update permission.");
       }
@@ -7077,35 +7120,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 ObjectId20(school);
-      } catch (error) {
-        throw new BadRequestError38("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 = makeCacheKey14(namespace_collection, cacheParams);
     logger21.log({
       level: "info",
@@ -7199,7 +7234,7 @@ function usePermissionRepo() {
         return cached;
       }
       const result = await collection.countDocuments({
-        key: group
+        group
       });
       setCache(cacheKey, result, 300).then(() => {
         logger21.log({
@@ -7294,7 +7329,12 @@ function usePermissionService() {
 import { BadRequestError as BadRequestError39, logger as logger22 } from "@goweekdays/utils";
 import Joi22 from "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;
@@ -7318,7 +7358,7 @@ function usePermissionController() {
       page: Joi22.number().min(1).optional().allow("", null),
       limit: Joi22.number().min(1).optional().allow("", null),
       search: Joi22.string().optional().allow("", null),
-      school: Joi22.string().hex().optional().allow("", null),
+      app: Joi22.string().optional().allow("", null),
       status: Joi22.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
@@ -7337,17 +7377,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;
@@ -7394,11 +7434,33 @@ function usePermissionController() {
       next(error2);
     }
   }
+  async function updateById(req, res, next) {
+    const id = req.params.id;
+    const { error: errorId } = Joi22.string().hex().required().validate(id);
+    if (errorId) {
+      next(new BadRequestError39(errorId.message));
+      return;
+    }
+    const payload = req.body;
+    const { error } = schemaPermissionUpdate.validate(payload);
+    if (error) {
+      next(new BadRequestError39(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
   };
 }
 
@@ -7409,7 +7471,12 @@ var schemaPermissionGroup = Joi23.object({
   app: Joi23.string().required(),
   key: Joi23.string().required(),
   label: Joi23.string().required(),
-  order: Joi23.number().integer().required()
+  order: Joi23.number().integer().optional().allow("", null)
+});
+var schemaPermissionGroupUpdate = Joi23.object({
+  key: Joi23.string().optional().allow("", null),
+  label: Joi23.string().optional().allow("", null),
+  order: Joi23.number().integer().optional().allow("", null)
 });
 function modelPermissionGroup(value) {
   const { error } = schemaPermissionGroup.validate(value);
@@ -7421,7 +7488,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: ""
@@ -7459,7 +7527,7 @@ function usePermissionGroupRepo() {
           name: "text_index"
         },
         {
-          key: { app: 1, key: 1 },
+          key: { app: 1, key: 1, label: 1 },
           unique: true,
           name: "unique_permission_group"
         }
@@ -7496,9 +7564,13 @@ function usePermissionGroupRepo() {
   async function updateById(_id, value, session) {
     try {
       _id = new ObjectId21(_id);
-    } catch (error) {
+    } catch (error2) {
       throw new BadRequestError41("Invalid ID.");
     }
+    const { error } = schemaPermissionGroupUpdate.validate(value);
+    if (error) {
+      throw new BadRequestError41(`Invalid data: ${error.message}`);
+    }
     try {
       const res = await collection.updateOne(
         { _id },
@@ -7507,13 +7579,13 @@ function usePermissionGroupRepo() {
       );
       delCachedData();
       return res;
-    } catch (error) {
+    } catch (error2) {
       logger23.log({
         level: "error",
-        message: error.message
+        message: error2.message
       });
-      if (error instanceof AppError15) {
-        throw error;
+      if (error2 instanceof AppError15) {
+        throw error2;
       } else {
         throw new Error("Failed to update permission group.");
       }
@@ -7524,35 +7596,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 ObjectId21(school);
-      } catch (error) {
-        throw new BadRequestError41("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 = makeCacheKey15(namespace_collection, cacheParams);
     logger23.log({
       level: "info",
@@ -7680,6 +7744,11 @@ function usePermissionGroupRepo() {
 }
 
 // src/resources/permission/permission.group.service.ts
+import {
+  AppError as AppError16,
+  BadRequestError as BadRequestError42,
+  InternalServerError as InternalServerError22
+} from "@goweekdays/utils";
 function usePermissionGroupService() {
   const {
     updateById: _updateById,
@@ -7694,7 +7763,7 @@ function usePermissionGroupService() {
     }
     const associatedPermissionsCount = await countByGroup(permission.key);
     if (associatedPermissionsCount > 0) {
-      throw new Error(
+      throw new BadRequestError42(
         "Cannot delete Permission Group with associated Permissions."
       );
     }
@@ -7702,7 +7771,11 @@ function usePermissionGroupService() {
       await _deleteById(id);
       return "Permission deleted successfully.";
     } catch (error) {
-      throw error;
+      if (error instanceof AppError16) {
+        throw error;
+      } else {
+        throw new InternalServerError22("Failed to delete Permission Group.");
+      }
     }
   }
   return {
@@ -7711,20 +7784,21 @@ function usePermissionGroupService() {
 }
 
 // src/resources/permission/permission.group.controller.ts
-import { BadRequestError as BadRequestError42, logger as logger24 } from "@goweekdays/utils";
+import { BadRequestError as BadRequestError43, logger as logger24 } from "@goweekdays/utils";
 import Joi24 from "joi";
 function usePermissionGroupController() {
   const {
     getAll: _getAll,
     getById: _getById,
-    add: _add
+    add: _add,
+    updateById: _updateById
   } = usePermissionGroupRepo();
   const { deleteById: _deleteById } = usePermissionGroupService();
   async function add(req, res, next) {
     const value = req.body;
     const { error } = schemaPermissionGroup.validate(value);
     if (error) {
-      next(new BadRequestError42(error.message));
+      next(new BadRequestError43(error.message));
       logger24.info(`Controller: ${error.message}`);
       return;
     }
@@ -7742,12 +7816,12 @@ function usePermissionGroupController() {
       page: Joi24.number().min(1).optional().allow("", null),
       limit: Joi24.number().min(1).optional().allow("", null),
       search: Joi24.string().optional().allow("", null),
-      school: Joi24.string().hex().optional().allow("", null),
+      app: Joi24.string().optional().allow("", null),
       status: Joi24.string().optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
-      next(new BadRequestError42(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     const page = parseInt(req.query.page) ?? 1;
@@ -7761,17 +7835,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;
@@ -7786,7 +7860,7 @@ function usePermissionGroupController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError42(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
@@ -7807,7 +7881,7 @@ function usePermissionGroupController() {
     });
     const { error } = validation.validate({ id });
     if (error) {
-      next(new BadRequestError42(error.message));
+      next(new BadRequestError43(error.message));
       return;
     }
     try {
@@ -7818,11 +7892,33 @@ function usePermissionGroupController() {
       next(error2);
     }
   }
+  async function updateById(req, res, next) {
+    const id = req.params.id;
+    const { error: errorId } = Joi24.string().hex().required().validate(id);
+    if (errorId) {
+      next(new BadRequestError43(errorId.message));
+      return;
+    }
+    const payload = req.body;
+    const { error } = schemaPermissionGroupUpdate.validate(payload);
+    if (error) {
+      next(new BadRequestError43(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
   };
 }
 export {
@@ -7879,12 +7975,15 @@ export {
   modelPermission,
   modelPermissionGroup,
   schemaApp,
+  schemaAppUpdate,
   schemaBuilding,
   schemaBuildingUnit,
   schemaOrg,
   schemaPSGC,
   schemaPermission,
   schemaPermissionGroup,
+  schemaPermissionGroupUpdate,
+  schemaPermissionUpdate,
   schemaUpdateOptions,
   transactionSchema,
   useAddressController,