@7365admin1/module-hygiene 4.12.0 → 4.13.0

package/dist/index.js

@@ -38,6 +38,7 @@ __export(src_exports, {
   MStock: () => MStock,
   MSupply: () => MSupply,
   MUnit: () => MUnit,
+  ServiceType: () => ServiceType,
   allowedCheckOutItemStatus: () => allowedCheckOutItemStatus,
   allowedChecklistStatus: () => allowedChecklistStatus,
   allowedPeriods: () => allowedPeriods,
@@ -83,6 +84,17 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/models/hygiene-base.model.ts
+var ServiceType = /* @__PURE__ */ ((ServiceType2) => {
+  ServiceType2["REAL_ESTATE_DEVELOPER"] = "real_estate_developer";
+  ServiceType2["PROPERTY_MANAGEMENT_AGENCY"] = "property_management_agency";
+  ServiceType2["SECURITY_AGENCY"] = "security_agency";
+  ServiceType2["CLEANING_SERVICES"] = "cleaning_services";
+  ServiceType2["MECHANICAL_ELECTRICAL_SERVICES"] = "mechanical_electrical_services";
+  ServiceType2["LANDSCAPING_SERVICES"] = "landscaping_services";
+  ServiceType2["PEST_CONTROL_SERVICES"] = "pest_control_services";
+  ServiceType2["POOL_MAINTENANCE_SERVICES"] = "pool_maintenance_services";
+  return ServiceType2;
+})(ServiceType || {});
 var allowedTypes = ["common", "toilet"];
 var allowedStatus = [
   "open",
@@ -624,6 +636,7 @@ var import_mongodb2 = require("mongodb");
 var import_node_server_utils3 = require("@7365admin1/node-server-utils");
 var areaSchema = import_joi2.default.object({
   site: import_joi2.default.string().hex().required(),
+  serviceType: import_joi2.default.string().valid(...Object.values(ServiceType)).required(),
   name: import_joi2.default.string().required(),
   type: import_joi2.default.string().valid(...allowedTypes).required(),
   set: import_joi2.default.number().min(0).optional(),
@@ -663,6 +676,7 @@ function MArea(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     name: value.name,
     type: value.type,
     set: value.set ?? 0,
@@ -698,6 +712,7 @@ function useAreaRepo() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { type: 1 } },
         { key: { status: 1 } },
         { key: { "units.unit": 1 } }
@@ -718,7 +733,7 @@ function useAreaRepo() {
   async function createUniqueIndex() {
     try {
       await collection.createIndex(
-        { site: 1, name: 1, type: 1, deletedAt: 1 },
+        { site: 1, serviceType: 1, name: 1, type: 1, deletedAt: 1 },
         { unique: true }
       );
     } catch (error) {
@@ -755,15 +770,18 @@ function useAreaRepo() {
     limit = 10,
     search = "",
     type = "all",
-    site
+    site,
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
-      status: { $ne: "deleted" }
+      status: { $ne: "deleted" },
+      serviceType
     };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new import_mongodb3.ObjectId(site);
@@ -812,9 +830,15 @@ function useAreaRepo() {
       throw error;
     }
   }
-  async function getAreasForChecklist(site) {
-    const query = { status: { $ne: "deleted" } };
+  async function getAreasForChecklist(site, serviceType) {
+    const query = {
+      status: { $ne: "deleted" }
+    };
     const cacheOptions = {};
+    if (serviceType) {
+      query.serviceType = serviceType;
+      cacheOptions.serviceType = serviceType;
+    }
     try {
       site = new import_mongodb3.ObjectId(site);
       query.site = site;
@@ -894,28 +918,6 @@ function useAreaRepo() {
       throw error;
     }
   }
-  async function getAreaByMultipleId(_id) {
-    for (let i = 0; i < _id.length; i++) {
-      try {
-        _id[i] = new import_mongodb3.ObjectId(_id[i]);
-      } catch (error) {
-        throw new import_node_server_utils4.BadRequestError("Invalid area ID format.");
-      }
-    }
-    const query = {
-      _id: { $in: _id },
-      status: { $ne: "deleted" }
-    };
-    try {
-      const data = await collection.aggregate([{ $match: query }]).toArray();
-      if (!data || data.length === 0) {
-        throw new import_node_server_utils4.NotFoundError("Area not found.");
-      }
-      return data;
-    } catch (error) {
-      throw error;
-    }
-  }
   async function verifyAreaByUnitId(unitId) {
     try {
       unitId = new import_mongodb3.ObjectId(unitId);
@@ -1077,7 +1079,6 @@ function useAreaRepo() {
     getAreas,
     getAreasForChecklist,
     getAreaById,
-    getAreaByMultipleId,
     verifyAreaByUnitId,
     updateArea,
     updateAreaChecklist,
@@ -1144,6 +1145,7 @@ var import_mongodb4 = require("mongodb");
 var import_node_server_utils6 = require("@7365admin1/node-server-utils");
 var unitSchema = import_joi3.default.object({
   site: import_joi3.default.string().hex().required(),
+  serviceType: import_joi3.default.string().valid(...Object.values(ServiceType)).required(),
   name: import_joi3.default.string().required()
 });
 function MUnit(value) {
@@ -1161,6 +1163,7 @@ function MUnit(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     name: value.name,
     status: "active",
     createdAt: /* @__PURE__ */ new Date(),
@@ -1182,6 +1185,7 @@ function useUnitRepository() {
     try {
       await collection.createIndexes([
         { key: { site: 1 } },
+        { key: { serviceType: 1 } },
         { key: { status: 1 } }
       ]);
     } catch (error) {
@@ -1200,7 +1204,7 @@ function useUnitRepository() {
   async function createUniqueIndex() {
     try {
       await collection.createIndex(
-        { site: 1, name: 1, deletedAt: 1 },
+        { site: 1, serviceType: 1, name: 1, deletedAt: 1 },
         { unique: true }
       );
     } catch (error) {
@@ -1234,7 +1238,8 @@ function useUnitRepository() {
     page = 1,
     limit = 10,
     search = "",
-    site
+    site,
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {
@@ -1251,6 +1256,10 @@ function useUnitRepository() {
     } catch (error) {
       throw new import_node_server_utils7.BadRequestError("Invalid site ID format.");
     }
+    if (serviceType) {
+      query.serviceType = serviceType;
+      cacheOptions.serviceType = serviceType;
+    }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
@@ -1309,7 +1318,7 @@ function useUnitRepository() {
     } catch (error) {
       const isDuplicated = error.message.includes("duplicate");
       if (isDuplicated) {
-        throw new import_node_server_utils7.BadRequestError("Area already exists.");
+        throw new import_node_server_utils7.BadRequestError("Unit already exists.");
       }
       throw error;
     }
@@ -1365,7 +1374,8 @@ function useAreaService() {
   const { getUnits: _getUnits } = useUnitRepository();
   async function importArea({
     dataJson,
-    site
+    site,
+    serviceType
   }) {
     let dataArray;
     try {
@@ -1386,7 +1396,8 @@ function useAreaService() {
         page: 1,
         limit: 999999,
         search: "",
-        site
+        site,
+        serviceType
       });
       if (unitsData && unitsData.items) {
         availableUnits = unitsData.items;
@@ -1433,7 +1444,8 @@ function useAreaService() {
           const areaData = {
             type: areaType,
             name: areaName,
-            site
+            site,
+            serviceType
           };
           if (row.SET !== void 0 && row.SET !== null && row.SET !== "") {
             const setNumber = parseInt(String(row.SET).trim());
@@ -1527,9 +1539,12 @@ function useAreaService() {
       }
     }
   }
-  async function exportAreas(site) {
+  async function exportAreas({
+    site,
+    serviceType
+  }) {
     try {
-      const areas = await getAreasForChecklist(site);
+      const areas = await getAreasForChecklist(site, serviceType);
       if (!areas || !Array.isArray(areas) || areas.length === 0) {
         throw new import_node_server_utils8.BadRequestError(
           "There are no areas to export yet. Please add some areas first, then try again."
@@ -1616,7 +1631,8 @@ function useAreaController() {
       limit: import_joi4.default.number().min(1).optional().allow("", null),
       search: import_joi4.default.string().optional().allow("", null),
       type: import_joi4.default.string().valid("all", ...allowedTypes).optional().allow("", null),
-      site: import_joi4.default.string().hex().required()
+      site: import_joi4.default.string().hex().required(),
+      serviceType: import_joi4.default.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -1629,13 +1645,15 @@ function useAreaController() {
     const search = req.query.search ?? "";
     const type = req.query.type ?? "all";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getAreas({
         page,
         limit,
         search,
         type,
-        site
+        site,
+        serviceType
       });
       res.json(data);
       return;
@@ -1720,9 +1738,12 @@ function useAreaController() {
       next(new import_node_server_utils9.BadRequestError("File is required!"));
       return;
     }
-    const { site } = req.params;
-    const schema = import_joi4.default.string().hex().required();
-    const { error, value } = schema.validate(site);
+    const query = { ...req.query, ...req.params };
+    const validation = import_joi4.default.object({
+      site: import_joi4.default.string().hex().required(),
+      serviceType: import_joi4.default.string().valid(...Object.values(ServiceType)).required()
+    });
+    const { error, value } = validation.validate(query);
     if (error) {
       import_node_server_utils9.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils9.BadRequestError(error.message));
@@ -1731,7 +1752,7 @@ function useAreaController() {
     try {
       const xlsData = await convertBufferFile(req.file.buffer);
       const dataJson = JSON.stringify(xlsData);
-      const result = await _importArea({ dataJson, site: value });
+      const result = await _importArea({ dataJson, ...value });
       return res.status(201).json(result);
     } catch (error2) {
       import_node_server_utils9.logger.log({ level: "error", message: error2.message });
@@ -1740,9 +1761,12 @@ function useAreaController() {
     }
   }
   async function exportAreas(req, res, next) {
-    const { site } = req.params;
-    const validation = import_joi4.default.string().hex().required();
-    const { error, value } = validation.validate(site);
+    const query = { ...req.query, ...req.params };
+    const validation = import_joi4.default.object({
+      site: import_joi4.default.string().hex().required(),
+      serviceType: import_joi4.default.string().valid(...Object.values(ServiceType)).required()
+    });
+    const { error, value } = validation.validate(query);
     if (error) {
       import_node_server_utils9.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils9.BadRequestError(error.message));
@@ -1833,7 +1857,8 @@ function useUnitService() {
   } = useUnitRepository();
   async function importUnit({
     dataJson,
-    site
+    site,
+    serviceType
   }) {
     let dataArray;
     try {
@@ -1874,7 +1899,8 @@ function useUnitService() {
         try {
           const insertedId = await _createUnit({
             name: unitName,
-            site
+            site,
+            serviceType
           });
           insertedUnitIds.push(insertedId);
           import_node_server_utils11.logger.info(`Successfully created unit: ${unitName}`);
@@ -1979,7 +2005,10 @@ function useUnitService() {
       session?.endSession();
     }
   }
-  async function exportUnits(site) {
+  async function exportUnits({
+    site,
+    serviceType
+  }) {
     const { generateUnitExcel: _generateUnitExcel } = useUnitExportService();
     const { getUnits: _getUnits } = useUnitRepository();
     try {
@@ -1987,7 +2016,8 @@ function useUnitService() {
         page: 1,
         limit: 999999,
         search: "",
-        site
+        site,
+        serviceType
       });
       if (!data || !data.items || data.items.length === 0) {
         throw new import_node_server_utils11.BadRequestError(
@@ -2044,7 +2074,8 @@ function useUnitController() {
       page: import_joi5.default.number().min(1).optional().allow("", null),
       limit: import_joi5.default.number().min(1).optional().allow("", null),
       search: import_joi5.default.string().optional().allow("", null),
-      site: import_joi5.default.string().hex().required()
+      site: import_joi5.default.string().hex().required(),
+      serviceType: import_joi5.default.string().valid(...Object.values(ServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -2056,12 +2087,14 @@ function useUnitController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     try {
       const data = await _getUnits({
         page,
         limit,
         search,
-        site
+        site,
+        serviceType
       });
       res.json(data);
       return;
@@ -2120,9 +2153,12 @@ function useUnitController() {
       next(new import_node_server_utils12.BadRequestError("File is required!"));
       return;
     }
-    const { site } = req.params;
-    const validation = import_joi5.default.string().hex().required();
-    const { error, value } = validation.validate(site);
+    const query = { ...req.query, ...req.params };
+    const validation = import_joi5.default.object({
+      site: import_joi5.default.string().hex().required(),
+      serviceType: import_joi5.default.string().valid(...Object.values(ServiceType)).required()
+    });
+    const { error, value } = validation.validate(query);
     if (error) {
       import_node_server_utils12.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils12.BadRequestError(error.message));
@@ -2131,7 +2167,7 @@ function useUnitController() {
     try {
       const xlsData = await convertBufferFile(req.file.buffer);
       const dataJson = JSON.stringify(xlsData);
-      const result = await _importUnit({ dataJson, site: value });
+      const result = await _importUnit({ dataJson, ...value });
       return res.status(201).json(result);
     } catch (error2) {
       import_node_server_utils12.logger.log({ level: "error", message: error2.message });
@@ -2140,9 +2176,12 @@ function useUnitController() {
     }
   }
   async function exportUnits(req, res, next) {
-    const { site } = req.params;
-    const validation = import_joi5.default.string().hex().required();
-    const { error, value } = validation.validate(site);
+    const query = { ...req.query, ...req.params };
+    const validation = import_joi5.default.object({
+      site: import_joi5.default.string().hex().required(),
+      serviceType: import_joi5.default.string().valid(...Object.values(ServiceType)).required()
+    });
+    const { error, value } = validation.validate(query);
     if (error) {
       import_node_server_utils12.logger.log({ level: "error", message: error.message });
       next(new import_node_server_utils12.BadRequestError(error.message));
@@ -2188,7 +2227,8 @@ var import_mongodb6 = require("mongodb");
 var import_node_server_utils13 = require("@7365admin1/node-server-utils");
 var parentChecklistSchema = import_joi6.default.object({
   createdAt: import_joi6.default.alternatives().try(import_joi6.default.date(), import_joi6.default.string()).optional().allow("", null),
-  site: import_joi6.default.string().hex().required()
+  site: import_joi6.default.string().hex().required(),
+  serviceType: import_joi6.default.string().valid(...Object.values(ServiceType)).required()
 });
 function MParentChecklist(value) {
   const { error } = parentChecklistSchema.validate(value);
@@ -2205,6 +2245,7 @@ function MParentChecklist(value) {
   }
   return {
     site: value.site,
+    serviceType: value.serviceType,
     status: "open",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt ?? ""
@@ -2279,12 +2320,16 @@ function useParentChecklistRepo() {
         );
         return existingChecklist._id;
       }
+      const allServiceTypes = Object.values(ServiceType);
       if (value.site) {
-        const checklistDoc = MParentChecklist({
-          site: value.site,
-          createdAt: currentDate
-        });
-        const result2 = await collection.insertOne(checklistDoc, { session });
+        const checklistDocs2 = allServiceTypes.map(
+          (serviceType) => MParentChecklist({
+            site: value.site,
+            createdAt: currentDate,
+            serviceType
+          })
+        );
+        const result2 = await collection.insertMany(checklistDocs2, { session });
         delNamespace().then(() => {
           import_node_server_utils14.logger.info(`Cache cleared for namespace: ${namespace_collection}`);
         }).catch((err) => {
@@ -2295,9 +2340,9 @@ function useParentChecklistRepo() {
         });
         const dateStr2 = currentDate.toISOString().split("T")[0];
         import_node_server_utils14.logger.info(
-          `Created parent checklist for site ${value.site} for today: ${dateStr2}`
+          `Created ${checklistDocs2.length} parent checklists for site ${value.site} for today: ${dateStr2}`
         );
-        return result2.insertedId;
+        return Object.values(result2.insertedIds);
       }
       const siteIds = await getHygieneSiteIds();
       if (!Array.isArray(siteIds)) {
@@ -2310,12 +2355,15 @@ function useParentChecklistRepo() {
       }
       const checklistDocs = [];
       for (const site of siteIds) {
-        checklistDocs.push(
-          MParentChecklist({
-            site,
-            createdAt: currentDate
-          })
-        );
+        for (const serviceType of allServiceTypes) {
+          checklistDocs.push(
+            MParentChecklist({
+              site,
+              createdAt: currentDate,
+              serviceType
+            })
+          );
+        }
       }
       const result = await collection.insertMany(checklistDocs, { session });
       delNamespace().then(() => {
@@ -2343,13 +2391,15 @@ function useParentChecklistRepo() {
     site,
     startDate = "",
     endDate = "",
-    status = "all"
+    status = "all",
+    serviceType
   }) {
     page = page > 0 ? page - 1 : 0;
-    const query = {};
+    const query = { serviceType };
     const cacheOptions = {
       page,
-      limit
+      limit,
+      serviceType
     };
     try {
       site = new import_mongodb7.ObjectId(site);
@@ -2589,6 +2639,7 @@ function useParentChecklistController() {
       limit: import_joi7.default.number().min(1).optional().allow("", null),
       search: import_joi7.default.string().optional().allow("", null),
       site: import_joi7.default.string().hex().required(),
+      serviceType: import_joi7.default.string().valid(...Object.values(ServiceType)).required(),
       startDate: import_joi7.default.alternatives().try(import_joi7.default.date(), import_joi7.default.string()).optional().allow("", null),
       endDate: import_joi7.default.alternatives().try(import_joi7.default.date(), import_joi7.default.string()).optional().allow("", null),
       status: import_joi7.default.string().valid(...allowedStatus, "all").optional().allow("", null)
@@ -2603,6 +2654,7 @@ function useParentChecklistController() {
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
+    const serviceType = req.query.serviceType ?? "";
     const startDate = req.query.startDate ?? "";
     const endDate = req.query.endDate ?? "";
     const status = req.query.status ?? "all";
@@ -2612,6 +2664,7 @@ function useParentChecklistController() {
         limit,
         search,
         site,
+        serviceType,
         startDate,
         endDate,
         status
@@ -6865,6 +6918,7 @@ function useQRController() {
   MStock,
   MSupply,
   MUnit,
+  ServiceType,
   allowedCheckOutItemStatus,
   allowedChecklistStatus,
   allowedPeriods,