@7365admin1/module-hygiene 4.16.0 → 4.18.0

package/dist/index.mjs

@@ -1,15 +1,4 @@
 // 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",
@@ -556,9 +545,10 @@ function useHygieneDashboardController() {
 import Joi2 from "joi";
 import { ObjectId as ObjectId2 } from "mongodb";
 import { BadRequestError as BadRequestError3, logger as logger3 } from "@7365admin1/node-server-utils";
+import { AppServiceType } from "@7365admin1/core";
 var areaSchema = Joi2.object({
   site: Joi2.string().hex().required(),
-  serviceType: Joi2.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: Joi2.string().valid(...Object.values(AppServiceType)).required(),
   name: Joi2.string().required(),
   type: Joi2.string().valid(...allowedTypes).required(),
   set: Joi2.number().min(0).optional(),
@@ -1083,9 +1073,10 @@ import {
 import Joi3 from "joi";
 import { ObjectId as ObjectId4 } from "mongodb";
 import { BadRequestError as BadRequestError5, logger as logger6 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType2 } from "@7365admin1/core";
 var unitSchema = Joi3.object({
   site: Joi3.string().hex().required(),
-  serviceType: Joi3.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: Joi3.string().valid(...Object.values(AppServiceType2)).required(),
   name: Joi3.string().required()
 });
 function MUnit(value) {
@@ -1506,6 +1497,7 @@ function useAreaService() {
 // src/controllers/hygiene-area.controller.ts
 import Joi4 from "joi";
 import { BadRequestError as BadRequestError8, logger as logger9 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType3 } from "@7365admin1/core";
 
 // src/utils/convert-excel.util.ts
 import { Readable } from "stream";
@@ -1570,7 +1562,7 @@ function useAreaController() {
       search: Joi4.string().optional().allow("", null),
       type: Joi4.string().valid("all", ...allowedTypes).optional().allow("", null),
       site: Joi4.string().hex().required(),
-      serviceType: Joi4.string().valid(...Object.values(ServiceType)).required()
+      serviceType: Joi4.string().valid(...Object.values(AppServiceType3)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -1679,7 +1671,7 @@ function useAreaController() {
     const query = { ...req.query, ...req.params };
     const validation = Joi4.object({
       site: Joi4.string().hex().required(),
-      serviceType: Joi4.string().valid(...Object.values(ServiceType)).required()
+      serviceType: Joi4.string().valid(...Object.values(AppServiceType3)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -1702,7 +1694,7 @@ function useAreaController() {
     const query = { ...req.query, ...req.params };
     const validation = Joi4.object({
       site: Joi4.string().hex().required(),
-      serviceType: Joi4.string().valid(...Object.values(ServiceType)).required()
+      serviceType: Joi4.string().valid(...Object.values(AppServiceType3)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -1985,6 +1977,7 @@ function useUnitService() {
 // src/controllers/hygiene-unit.controller.ts
 import Joi5 from "joi";
 import { BadRequestError as BadRequestError10, logger as logger12 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType4 } from "@7365admin1/core";
 function useUnitController() {
   const { createUnit: _createUnit, getUnits: _getUnits } = useUnitRepository();
   const {
@@ -2018,7 +2011,7 @@ function useUnitController() {
       limit: Joi5.number().min(1).optional().allow("", null),
       search: Joi5.string().optional().allow("", null),
       site: Joi5.string().hex().required(),
-      serviceType: Joi5.string().valid(...Object.values(ServiceType)).required()
+      serviceType: Joi5.string().valid(...Object.values(AppServiceType4)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -2099,7 +2092,7 @@ function useUnitController() {
     const query = { ...req.query, ...req.params };
     const validation = Joi5.object({
       site: Joi5.string().hex().required(),
-      serviceType: Joi5.string().valid(...Object.values(ServiceType)).required()
+      serviceType: Joi5.string().valid(...Object.values(AppServiceType4)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -2122,7 +2115,7 @@ function useUnitController() {
     const query = { ...req.query, ...req.params };
     const validation = Joi5.object({
       site: Joi5.string().hex().required(),
-      serviceType: Joi5.string().valid(...Object.values(ServiceType)).required()
+      serviceType: Joi5.string().valid(...Object.values(AppServiceType4)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -2168,10 +2161,11 @@ function useUnitController() {
 import Joi6 from "joi";
 import { ObjectId as ObjectId6 } from "mongodb";
 import { BadRequestError as BadRequestError11, logger as logger13 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType5 } from "@7365admin1/core";
 var parentChecklistSchema = Joi6.object({
   createdAt: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null),
   site: Joi6.string().hex().required(),
-  serviceType: Joi6.string().valid(...Object.values(ServiceType)).required()
+  serviceType: Joi6.string().valid(...Object.values(AppServiceType5)).required()
 });
 function MParentChecklist(value) {
   const { error } = parentChecklistSchema.validate(value);
@@ -2206,6 +2200,7 @@ import {
   makeCacheKey as makeCacheKey4,
   BadRequestError as BadRequestError12
 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType6 } from "@7365admin1/core";
 function useParentChecklistRepo() {
   const db = useAtlas5.getDb();
   if (!db) {
@@ -2237,7 +2232,7 @@ function useParentChecklistRepo() {
       startOfDay.setUTCHours(0, 0, 0, 0);
       const endOfDay = new Date(currentDate);
       endOfDay.setUTCHours(23, 59, 59, 999);
-      const allServiceTypes = Object.values(ServiceType);
+      const allServiceTypes = Object.values(AppServiceType6);
       const dateStr = currentDate.toISOString().split("T")[0];
       if (value.site) {
         let siteObjectId;
@@ -2642,6 +2637,7 @@ function useParentChecklistRepo() {
 // src/controllers/hygiene-parent-checklist.controller.ts
 import Joi7 from "joi";
 import { BadRequestError as BadRequestError13, logger as logger15 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType7 } from "@7365admin1/core";
 function useParentChecklistController() {
   const {
     createParentChecklist: _createParentChecklist,
@@ -2652,7 +2648,7 @@ function useParentChecklistController() {
     const validation = Joi7.object({
       createdAt: Joi7.alternatives().try(Joi7.date(), Joi7.string()).optional().allow("", null),
       site: Joi7.string().hex().required(),
-      serviceType: Joi7.string().valid(...Object.values(ServiceType)).optional().allow("", null)
+      serviceType: Joi7.string().valid(...Object.values(AppServiceType7)).optional().allow("", null)
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -2677,7 +2673,7 @@ function useParentChecklistController() {
       limit: Joi7.number().min(1).optional().allow("", null),
       search: Joi7.string().optional().allow("", null),
       site: Joi7.string().hex().required(),
-      serviceType: Joi7.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: Joi7.string().valid(...Object.values(AppServiceType7)).required(),
       startDate: Joi7.alternatives().try(Joi7.date(), Joi7.string()).optional().allow("", null),
       endDate: Joi7.alternatives().try(Joi7.date(), Joi7.string()).optional().allow("", null),
       status: Joi7.string().valid(...allowedStatus, "all").optional().allow("", null)
@@ -2725,10 +2721,11 @@ function useParentChecklistController() {
 import Joi8 from "joi";
 import { ObjectId as ObjectId8 } from "mongodb";
 import { BadRequestError as BadRequestError14, logger as logger16 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType8 } from "@7365admin1/core";
 var allowedChecklistStatus = ["open", "completed", "closed"];
 var areaChecklistSchema = Joi8.object({
   schedule: Joi8.string().hex().required(),
-  serviceType: Joi8.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: Joi8.string().valid(...Object.values(AppServiceType8)).required(),
   area: Joi8.string().hex().required(),
   name: Joi8.string().required(),
   type: Joi8.string().valid(...allowedTypes).required(),
@@ -2744,8 +2741,7 @@ var areaChecklistSchema = Joi8.object({
       isScheduleTask: Joi8.boolean().optional().default(false),
       scheduleTaskId: Joi8.string().hex().optional().allow(null)
     }).required()
-  ).optional().default([]),
-  createdBy: Joi8.string().hex().required()
+  ).optional().default([])
 });
 function MAreaChecklist(value) {
   const { error } = areaChecklistSchema.validate(value);
@@ -2786,13 +2782,6 @@ function MAreaChecklist(value) {
       };
     });
   }
-  if (value.createdBy) {
-    try {
-      value.createdBy = new ObjectId8(value.createdBy);
-    } catch (error2) {
-      throw new BadRequestError14("Invalid createdBy ID format.");
-    }
-  }
   return {
     schedule: value.schedule,
     serviceType: value.serviceType,
@@ -2801,7 +2790,6 @@ function MAreaChecklist(value) {
     type: value.type,
     checklist: value.checklist || [],
     status: "open",
-    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     completedAt: "",
     updatedAt: ""
@@ -2956,32 +2944,6 @@ function useAreaChecklistRepo() {
     try {
       const pipeline = [
         { $match: query },
-        {
-          $lookup: {
-            from: "users",
-            let: { createdById: "$createdBy" },
-            pipeline: [
-              {
-                $match: {
-                  $expr: {
-                    $and: [
-                      { $ne: ["$$createdById", ""] },
-                      { $eq: ["$_id", "$$createdById"] }
-                    ]
-                  }
-                }
-              },
-              { $project: { name: 1 } }
-            ],
-            as: "createdByDoc"
-          }
-        },
-        {
-          $unwind: {
-            path: "$createdByDoc",
-            preserveNullAndEmptyArrays: true
-          }
-        },
         {
           $addFields: {
             statusOrder: {
@@ -3033,8 +2995,7 @@ function useAreaChecklistRepo() {
                 },
                 else: 0
               }
-            },
-            createdByName: "$createdByDoc.name"
+            }
           }
         },
         { $skip: page * limit },
@@ -4088,8 +4049,7 @@ function useAreaChecklistService() {
                   unit: unit.unit.toString(),
                   name: unit.name
                 }))
-              })),
-              createdBy: value.createdBy
+              }))
             };
             const insertedId = await _createAreaChecklist(checklistData);
             totalChecklistsCreated++;
@@ -4217,6 +4177,7 @@ import {
   InternalServerError as InternalServerError7,
   logger as logger20
 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType9 } from "@7365admin1/core";
 
 // src/services/hygiene-checklist-pdf.service.ts
 import { launch } from "puppeteer";
@@ -4450,16 +4411,13 @@ function useAreaChecklistController() {
       (acc, [key, value2]) => ({ ...acc, [key]: value2 }),
       {}
     ) : {};
-    const createdBy = cookies["user"] || "";
     const payload = {
       site: req.params.site,
-      schedule: req.params.schedule,
-      createdBy
+      schedule: req.params.schedule
     };
     const validation = Joi9.object({
       site: Joi9.string().hex().required(),
-      schedule: Joi9.string().hex().required(),
-      createdBy: Joi9.string().hex().required()
+      schedule: Joi9.string().hex().required()
     });
     const { error, value } = validation.validate(payload);
     if (error) {
@@ -4486,7 +4444,7 @@ function useAreaChecklistController() {
       type: Joi9.string().valid(...allowedTypes, "all").optional().allow("", null),
       status: Joi9.string().valid(...allowedStatus, "all").optional().allow("", null),
       schedule: Joi9.string().hex().required(),
-      serviceType: Joi9.string().valid(...Object.values(ServiceType)).required()
+      serviceType: Joi9.string().valid(...Object.values(AppServiceType9)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -4586,7 +4544,7 @@ function useAreaChecklistController() {
       page: Joi9.number().min(1).optional().allow("", null),
       limit: Joi9.number().min(1).optional().allow("", null),
       search: Joi9.string().optional().allow("", null),
-      serviceType: Joi9.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: Joi9.string().valid(...Object.values(AppServiceType9)).required(),
       id: Joi9.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -4715,9 +4673,10 @@ function useAreaChecklistController() {
 import Joi10 from "joi";
 import { ObjectId as ObjectId12 } from "mongodb";
 import { BadRequestError as BadRequestError17, logger as logger21 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType10 } from "@7365admin1/core";
 var supplySchema = Joi10.object({
   site: Joi10.string().hex().required(),
-  serviceType: Joi10.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: Joi10.string().valid(...Object.values(AppServiceType10)).required(),
   name: Joi10.string().required(),
   unitOfMeasurement: Joi10.string().required()
 });
@@ -5008,6 +4967,7 @@ function useSupplyRepository() {
 // src/controllers/hygiene-supply.controller.ts
 import Joi11 from "joi";
 import { BadRequestError as BadRequestError19, logger as logger23 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType11 } from "@7365admin1/core";
 function useSupplyController() {
   const {
     createSupply: _createSupply,
@@ -5041,7 +5001,7 @@ function useSupplyController() {
       limit: Joi11.number().min(1).optional().allow("", null),
       search: Joi11.string().optional().allow("", null),
       site: Joi11.string().hex().required(),
-      serviceType: Joi11.string().valid(...Object.values(ServiceType)).required()
+      serviceType: Joi11.string().valid(...Object.values(AppServiceType11)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5146,9 +5106,10 @@ function useSupplyController() {
 import Joi12 from "joi";
 import { ObjectId as ObjectId14 } from "mongodb";
 import { BadRequestError as BadRequestError20, logger as logger24 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType12 } from "@7365admin1/core";
 var stockSchema = Joi12.object({
   site: Joi12.string().hex().required(),
-  serviceType: Joi12.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: Joi12.string().valid(...Object.values(AppServiceType12)).required(),
   supply: Joi12.string().hex().required(),
   in: Joi12.number().min(0).optional(),
   out: Joi12.number().min(0).optional(),
@@ -5382,6 +5343,7 @@ function useStockService() {
 // src/controllers/hygiene-stock.controller.ts
 import Joi13 from "joi";
 import { BadRequestError as BadRequestError23, logger as logger26 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType13 } from "@7365admin1/core";
 function useStockController() {
   const { getStocksBySupplyId: _getStocksBySupplyId } = useStockRepository();
   const { createStock: _createStock } = useStockService();
@@ -5389,7 +5351,7 @@ function useStockController() {
     const payload = { ...req.body, ...req.params };
     const validation = Joi13.object({
       site: Joi13.string().hex().required(),
-      serviceType: Joi13.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: Joi13.string().valid(...Object.values(AppServiceType13)).required(),
       supply: Joi13.string().hex().required(),
       qty: Joi13.number().min(0).required(),
       remarks: Joi13.string().optional().allow("", null)
@@ -5417,7 +5379,7 @@ function useStockController() {
       limit: Joi13.number().min(1).optional().allow("", null),
       search: Joi13.string().optional().allow("", null),
       site: Joi13.string().hex().required(),
-      serviceType: Joi13.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: Joi13.string().valid(...Object.values(AppServiceType13)).required(),
       supply: Joi13.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -5459,10 +5421,11 @@ function useStockController() {
 import Joi14 from "joi";
 import { ObjectId as ObjectId16 } from "mongodb";
 import { BadRequestError as BadRequestError24, logger as logger27 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType14 } from "@7365admin1/core";
 var allowedCheckOutItemStatus = ["pending", "completed"];
 var checkOutItemSchema = Joi14.object({
   site: Joi14.string().hex().required(),
-  serviceType: Joi14.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: Joi14.string().valid(...Object.values(AppServiceType14)).required(),
   supply: Joi14.string().hex().required(),
   supplyName: Joi14.string().required(),
   qty: Joi14.number().min(0).required(),
@@ -5867,6 +5830,7 @@ function useCheckOutItemService() {
 // src/controllers/hygiene-checkout-item.controller.ts
 import Joi15 from "joi";
 import { BadRequestError as BadRequestError27, logger as logger29 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType15 } from "@7365admin1/core";
 function useCheckOutItemController() {
   const {
     getCheckOutItems: _getCheckOutItems,
@@ -5889,7 +5853,7 @@ function useCheckOutItemController() {
     };
     const validation = Joi15.object({
       site: Joi15.string().hex().required(),
-      serviceType: Joi15.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: Joi15.string().valid(...Object.values(AppServiceType15)).required(),
       supply: Joi15.string().hex().required(),
       qty: Joi15.number().min(0).required(),
       attachment: Joi15.array().items(Joi15.string()).optional().allow(null),
@@ -5924,7 +5888,7 @@ function useCheckOutItemController() {
     };
     const validation = Joi15.object({
       site: Joi15.string().hex().required(),
-      serviceType: Joi15.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: Joi15.string().valid(...Object.values(AppServiceType15)).required(),
       createdBy: Joi15.string().hex().required(),
       items: Joi15.array().items(
         Joi15.object({
@@ -5957,7 +5921,7 @@ function useCheckOutItemController() {
       limit: Joi15.number().min(1).optional().allow("", null),
       search: Joi15.string().optional().allow("", null),
       site: Joi15.string().hex().required(),
-      serviceType: Joi15.string().valid(...Object.values(ServiceType)).required()
+      serviceType: Joi15.string().valid(...Object.values(AppServiceType15)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -6015,11 +5979,12 @@ function useCheckOutItemController() {
 
 // src/models/hygiene-schedule-task.model.ts
 import { BadRequestError as BadRequestError28, logger as logger30 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType16 } from "@7365admin1/core";
 import Joi16 from "joi";
 import { ObjectId as ObjectId18 } from "mongodb";
 var scheduleTaskSchema = Joi16.object({
   site: Joi16.string().hex().required(),
-  serviceType: Joi16.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: Joi16.string().valid(...Object.values(AppServiceType16)).required(),
   title: Joi16.string().required(),
   time: Joi16.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
   dates: Joi16.array().min(1).items(
@@ -6031,8 +5996,7 @@ var scheduleTaskSchema = Joi16.object({
       name: Joi16.string().required(),
       value: Joi16.any().required()
     })
-  ).required(),
-  createdBy: Joi16.string().hex().required()
+  ).required()
 });
 function MScheduleTask(value) {
   const { error } = scheduleTaskSchema.validate(value);
@@ -6059,13 +6023,6 @@ function MScheduleTask(value) {
       }
     });
   }
-  if (value.createdBy) {
-    try {
-      value.createdBy = new ObjectId18(value.createdBy);
-    } catch (error2) {
-      throw new BadRequestError28("Invalid createdBy ID format.");
-    }
-  }
   return {
     site: value.site,
     serviceType: value.serviceType,
@@ -6075,7 +6032,6 @@ function MScheduleTask(value) {
     description: value.description,
     areas: value.areas,
     status: "active",
-    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -6597,8 +6553,7 @@ function useScheduleTaskService() {
                   area: areaId,
                   name: area.name,
                   type: areaDetails.type || "common",
-                  checklist: schedTaskSets,
-                  createdBy: scheduleTask.createdBy
+                  checklist: schedTaskSets
                 };
                 logger32.info(
                   `Area ${area.name} (${areaId}): Creating new area checklist with schedule-task sets only`
@@ -6644,6 +6599,7 @@ function useScheduleTaskService() {
 // src/controllers/hygiene-schedule-task.controller.ts
 import Joi17 from "joi";
 import { BadRequestError as BadRequestError30, logger as logger33 } from "@7365admin1/node-server-utils";
+import { AppServiceType as AppServiceType17 } from "@7365admin1/core";
 function useScheduleTaskController() {
   const {
     createScheduleTask: _createScheduleTask,
@@ -6653,12 +6609,7 @@ function useScheduleTaskController() {
     deleteScheduleTask: _deleteScheduleTask
   } = useScheduleTaskRepository();
   async function createScheduleTask(req, res, next) {
-    const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
-      (acc, [key, value]) => ({ ...acc, [key]: value }),
-      {}
-    ) : {};
-    const createdBy = cookies["user"] || "";
-    const payload = { ...req.body, ...req.params, createdBy };
+    const payload = { ...req.body, ...req.params };
     const { error } = scheduleTaskSchema.validate(payload);
     if (error) {
       logger33.log({ level: "error", message: error.message });
@@ -6682,7 +6633,7 @@ function useScheduleTaskController() {
       limit: Joi17.number().min(1).optional().allow("", null),
       search: Joi17.string().optional().allow("", null),
       site: Joi17.string().hex().required(),
-      serviceType: Joi17.string().valid(...Object.values(ServiceType)).required()
+      serviceType: Joi17.string().valid(...Object.values(AppServiceType17)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -7078,7 +7029,6 @@ export {
   MStock,
   MSupply,
   MUnit,
-  ServiceType,
   allowedCheckOutItemStatus,
   allowedChecklistStatus,
   allowedPeriods,