@7365admin1/module-hygiene 4.16.0 → 4.18.0

package/dist/index.js

@@ -38,7 +38,6 @@ __export(src_exports, {
   MStock: () => MStock,
   MSupply: () => MSupply,
   MUnit: () => MUnit,
-  ServiceType: () => ServiceType,
   allowedCheckOutItemStatus: () => allowedCheckOutItemStatus,
   allowedChecklistStatus: () => allowedChecklistStatus,
   allowedPeriods: () => allowedPeriods,
@@ -84,17 +83,6 @@ __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",
@@ -634,9 +622,10 @@ function useHygieneDashboardController() {
 var import_joi2 = __toESM(require("joi"));
 var import_mongodb2 = require("mongodb");
 var import_node_server_utils3 = require("@7365admin1/node-server-utils");
+var import_core = require("@7365admin1/core");
 var areaSchema = import_joi2.default.object({
   site: import_joi2.default.string().hex().required(),
-  serviceType: import_joi2.default.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: import_joi2.default.string().valid(...Object.values(import_core.AppServiceType)).required(),
   name: import_joi2.default.string().required(),
   type: import_joi2.default.string().valid(...allowedTypes).required(),
   set: import_joi2.default.number().min(0).optional(),
@@ -1140,9 +1129,10 @@ var import_node_server_utils7 = require("@7365admin1/node-server-utils");
 var import_joi3 = __toESM(require("joi"));
 var import_mongodb4 = require("mongodb");
 var import_node_server_utils6 = require("@7365admin1/node-server-utils");
+var import_core2 = require("@7365admin1/core");
 var unitSchema = import_joi3.default.object({
   site: import_joi3.default.string().hex().required(),
-  serviceType: import_joi3.default.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: import_joi3.default.string().valid(...Object.values(import_core2.AppServiceType)).required(),
   name: import_joi3.default.string().required()
 });
 function MUnit(value) {
@@ -1563,6 +1553,7 @@ function useAreaService() {
 // src/controllers/hygiene-area.controller.ts
 var import_joi4 = __toESM(require("joi"));
 var import_node_server_utils9 = require("@7365admin1/node-server-utils");
+var import_core3 = require("@7365admin1/core");
 
 // src/utils/convert-excel.util.ts
 var import_stream = require("stream");
@@ -1627,7 +1618,7 @@ function useAreaController() {
       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(),
-      serviceType: import_joi4.default.string().valid(...Object.values(ServiceType)).required()
+      serviceType: import_joi4.default.string().valid(...Object.values(import_core3.AppServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -1736,7 +1727,7 @@ function useAreaController() {
     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()
+      serviceType: import_joi4.default.string().valid(...Object.values(import_core3.AppServiceType)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -1759,7 +1750,7 @@ function useAreaController() {
     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()
+      serviceType: import_joi4.default.string().valid(...Object.values(import_core3.AppServiceType)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -2037,6 +2028,7 @@ function useUnitService() {
 // src/controllers/hygiene-unit.controller.ts
 var import_joi5 = __toESM(require("joi"));
 var import_node_server_utils12 = require("@7365admin1/node-server-utils");
+var import_core4 = require("@7365admin1/core");
 function useUnitController() {
   const { createUnit: _createUnit, getUnits: _getUnits } = useUnitRepository();
   const {
@@ -2070,7 +2062,7 @@ function useUnitController() {
       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(),
-      serviceType: import_joi5.default.string().valid(...Object.values(ServiceType)).required()
+      serviceType: import_joi5.default.string().valid(...Object.values(import_core4.AppServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -2151,7 +2143,7 @@ function useUnitController() {
     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()
+      serviceType: import_joi5.default.string().valid(...Object.values(import_core4.AppServiceType)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -2174,7 +2166,7 @@ function useUnitController() {
     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()
+      serviceType: import_joi5.default.string().valid(...Object.values(import_core4.AppServiceType)).required()
     });
     const { error, value } = validation.validate(query);
     if (error) {
@@ -2220,10 +2212,11 @@ function useUnitController() {
 var import_joi6 = __toESM(require("joi"));
 var import_mongodb6 = require("mongodb");
 var import_node_server_utils13 = require("@7365admin1/node-server-utils");
+var import_core5 = require("@7365admin1/core");
 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(),
-  serviceType: import_joi6.default.string().valid(...Object.values(ServiceType)).required()
+  serviceType: import_joi6.default.string().valid(...Object.values(import_core5.AppServiceType)).required()
 });
 function MParentChecklist(value) {
   const { error } = parentChecklistSchema.validate(value);
@@ -2250,6 +2243,7 @@ function MParentChecklist(value) {
 // src/repositories/hygiene-parent-checklist.repository.ts
 var import_mongodb7 = require("mongodb");
 var import_node_server_utils14 = require("@7365admin1/node-server-utils");
+var import_core6 = require("@7365admin1/core");
 function useParentChecklistRepo() {
   const db = import_node_server_utils14.useAtlas.getDb();
   if (!db) {
@@ -2281,7 +2275,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(import_core6.AppServiceType);
       const dateStr = currentDate.toISOString().split("T")[0];
       if (value.site) {
         let siteObjectId;
@@ -2686,6 +2680,7 @@ function useParentChecklistRepo() {
 // src/controllers/hygiene-parent-checklist.controller.ts
 var import_joi7 = __toESM(require("joi"));
 var import_node_server_utils15 = require("@7365admin1/node-server-utils");
+var import_core7 = require("@7365admin1/core");
 function useParentChecklistController() {
   const {
     createParentChecklist: _createParentChecklist,
@@ -2696,7 +2691,7 @@ function useParentChecklistController() {
     const validation = import_joi7.default.object({
       createdAt: import_joi7.default.alternatives().try(import_joi7.default.date(), import_joi7.default.string()).optional().allow("", null),
       site: import_joi7.default.string().hex().required(),
-      serviceType: import_joi7.default.string().valid(...Object.values(ServiceType)).optional().allow("", null)
+      serviceType: import_joi7.default.string().valid(...Object.values(import_core7.AppServiceType)).optional().allow("", null)
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -2721,7 +2716,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(),
+      serviceType: import_joi7.default.string().valid(...Object.values(import_core7.AppServiceType)).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)
@@ -2769,10 +2764,11 @@ function useParentChecklistController() {
 var import_joi8 = __toESM(require("joi"));
 var import_mongodb8 = require("mongodb");
 var import_node_server_utils16 = require("@7365admin1/node-server-utils");
+var import_core8 = require("@7365admin1/core");
 var allowedChecklistStatus = ["open", "completed", "closed"];
 var areaChecklistSchema = import_joi8.default.object({
   schedule: import_joi8.default.string().hex().required(),
-  serviceType: import_joi8.default.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: import_joi8.default.string().valid(...Object.values(import_core8.AppServiceType)).required(),
   area: import_joi8.default.string().hex().required(),
   name: import_joi8.default.string().required(),
   type: import_joi8.default.string().valid(...allowedTypes).required(),
@@ -2788,8 +2784,7 @@ var areaChecklistSchema = import_joi8.default.object({
       isScheduleTask: import_joi8.default.boolean().optional().default(false),
       scheduleTaskId: import_joi8.default.string().hex().optional().allow(null)
     }).required()
-  ).optional().default([]),
-  createdBy: import_joi8.default.string().hex().required()
+  ).optional().default([])
 });
 function MAreaChecklist(value) {
   const { error } = areaChecklistSchema.validate(value);
@@ -2830,13 +2825,6 @@ function MAreaChecklist(value) {
       };
     });
   }
-  if (value.createdBy) {
-    try {
-      value.createdBy = new import_mongodb8.ObjectId(value.createdBy);
-    } catch (error2) {
-      throw new import_node_server_utils16.BadRequestError("Invalid createdBy ID format.");
-    }
-  }
   return {
     schedule: value.schedule,
     serviceType: value.serviceType,
@@ -2845,7 +2833,6 @@ function MAreaChecklist(value) {
     type: value.type,
     checklist: value.checklist || [],
     status: "open",
-    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     completedAt: "",
     updatedAt: ""
@@ -2855,7 +2842,7 @@ function MAreaChecklist(value) {
 // src/services/hygiene-area-checklist.service.ts
 var import_mongodb10 = require("mongodb");
 var import_node_server_utils18 = require("@7365admin1/node-server-utils");
-var import_core = require("@7365admin1/core");
+var import_core9 = require("@7365admin1/core");
 
 // src/repositories/hygiene-area-checklist.repository.ts
 var import_mongodb9 = require("mongodb");
@@ -2988,32 +2975,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: {
@@ -3065,8 +3026,7 @@ function useAreaChecklistRepo() {
                 },
                 else: 0
               }
-            },
-            createdByName: "$createdByDoc.name"
+            }
           }
         },
         { $skip: page * limit },
@@ -4018,7 +3978,7 @@ function useAreaChecklistService() {
     insertAutoGenSets
   } = useAreaChecklistRepo();
   const { updateParentChecklistStatuses, getParentChecklistById } = useParentChecklistRepo();
-  const { getUserById } = (0, import_core.useUserRepo)();
+  const { getUserById } = (0, import_core9.useUserRepo)();
   async function createAreaChecklist(value) {
     const results = [];
     let totalChecklistsCreated = 0;
@@ -4120,8 +4080,7 @@ function useAreaChecklistService() {
                   unit: unit.unit.toString(),
                   name: unit.name
                 }))
-              })),
-              createdBy: value.createdBy
+              }))
             };
             const insertedId = await _createAreaChecklist(checklistData);
             totalChecklistsCreated++;
@@ -4245,6 +4204,7 @@ function useAreaChecklistService() {
 // src/controllers/hygiene-area-checklist.controller.ts
 var import_joi9 = __toESM(require("joi"));
 var import_node_server_utils20 = require("@7365admin1/node-server-utils");
+var import_core10 = require("@7365admin1/core");
 
 // src/services/hygiene-checklist-pdf.service.ts
 var import_puppeteer = require("puppeteer");
@@ -4478,16 +4438,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 = import_joi9.default.object({
       site: import_joi9.default.string().hex().required(),
-      schedule: import_joi9.default.string().hex().required(),
-      createdBy: import_joi9.default.string().hex().required()
+      schedule: import_joi9.default.string().hex().required()
     });
     const { error, value } = validation.validate(payload);
     if (error) {
@@ -4514,7 +4471,7 @@ function useAreaChecklistController() {
       type: import_joi9.default.string().valid(...allowedTypes, "all").optional().allow("", null),
       status: import_joi9.default.string().valid(...allowedStatus, "all").optional().allow("", null),
       schedule: import_joi9.default.string().hex().required(),
-      serviceType: import_joi9.default.string().valid(...Object.values(ServiceType)).required()
+      serviceType: import_joi9.default.string().valid(...Object.values(import_core10.AppServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -4614,7 +4571,7 @@ function useAreaChecklistController() {
       page: import_joi9.default.number().min(1).optional().allow("", null),
       limit: import_joi9.default.number().min(1).optional().allow("", null),
       search: import_joi9.default.string().optional().allow("", null),
-      serviceType: import_joi9.default.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: import_joi9.default.string().valid(...Object.values(import_core10.AppServiceType)).required(),
       id: import_joi9.default.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -4743,9 +4700,10 @@ function useAreaChecklistController() {
 var import_joi10 = __toESM(require("joi"));
 var import_mongodb12 = require("mongodb");
 var import_node_server_utils21 = require("@7365admin1/node-server-utils");
+var import_core11 = require("@7365admin1/core");
 var supplySchema = import_joi10.default.object({
   site: import_joi10.default.string().hex().required(),
-  serviceType: import_joi10.default.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: import_joi10.default.string().valid(...Object.values(import_core11.AppServiceType)).required(),
   name: import_joi10.default.string().required(),
   unitOfMeasurement: import_joi10.default.string().required()
 });
@@ -5027,6 +4985,7 @@ function useSupplyRepository() {
 // src/controllers/hygiene-supply.controller.ts
 var import_joi11 = __toESM(require("joi"));
 var import_node_server_utils23 = require("@7365admin1/node-server-utils");
+var import_core12 = require("@7365admin1/core");
 function useSupplyController() {
   const {
     createSupply: _createSupply,
@@ -5060,7 +5019,7 @@ function useSupplyController() {
       limit: import_joi11.default.number().min(1).optional().allow("", null),
       search: import_joi11.default.string().optional().allow("", null),
       site: import_joi11.default.string().hex().required(),
-      serviceType: import_joi11.default.string().valid(...Object.values(ServiceType)).required()
+      serviceType: import_joi11.default.string().valid(...Object.values(import_core12.AppServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5165,9 +5124,10 @@ function useSupplyController() {
 var import_joi12 = __toESM(require("joi"));
 var import_mongodb14 = require("mongodb");
 var import_node_server_utils24 = require("@7365admin1/node-server-utils");
+var import_core13 = require("@7365admin1/core");
 var stockSchema = import_joi12.default.object({
   site: import_joi12.default.string().hex().required(),
-  serviceType: import_joi12.default.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: import_joi12.default.string().valid(...Object.values(import_core13.AppServiceType)).required(),
   supply: import_joi12.default.string().hex().required(),
   in: import_joi12.default.number().min(0).optional(),
   out: import_joi12.default.number().min(0).optional(),
@@ -5389,6 +5349,7 @@ function useStockService() {
 // src/controllers/hygiene-stock.controller.ts
 var import_joi13 = __toESM(require("joi"));
 var import_node_server_utils27 = require("@7365admin1/node-server-utils");
+var import_core14 = require("@7365admin1/core");
 function useStockController() {
   const { getStocksBySupplyId: _getStocksBySupplyId } = useStockRepository();
   const { createStock: _createStock } = useStockService();
@@ -5396,7 +5357,7 @@ function useStockController() {
     const payload = { ...req.body, ...req.params };
     const validation = import_joi13.default.object({
       site: import_joi13.default.string().hex().required(),
-      serviceType: import_joi13.default.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: import_joi13.default.string().valid(...Object.values(import_core14.AppServiceType)).required(),
       supply: import_joi13.default.string().hex().required(),
       qty: import_joi13.default.number().min(0).required(),
       remarks: import_joi13.default.string().optional().allow("", null)
@@ -5424,7 +5385,7 @@ function useStockController() {
       limit: import_joi13.default.number().min(1).optional().allow("", null),
       search: import_joi13.default.string().optional().allow("", null),
       site: import_joi13.default.string().hex().required(),
-      serviceType: import_joi13.default.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: import_joi13.default.string().valid(...Object.values(import_core14.AppServiceType)).required(),
       supply: import_joi13.default.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -5466,10 +5427,11 @@ function useStockController() {
 var import_joi14 = __toESM(require("joi"));
 var import_mongodb16 = require("mongodb");
 var import_node_server_utils28 = require("@7365admin1/node-server-utils");
+var import_core15 = require("@7365admin1/core");
 var allowedCheckOutItemStatus = ["pending", "completed"];
 var checkOutItemSchema = import_joi14.default.object({
   site: import_joi14.default.string().hex().required(),
-  serviceType: import_joi14.default.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: import_joi14.default.string().valid(...Object.values(import_core15.AppServiceType)).required(),
   supply: import_joi14.default.string().hex().required(),
   supplyName: import_joi14.default.string().required(),
   qty: import_joi14.default.number().min(0).required(),
@@ -5761,7 +5723,7 @@ function useCheckOutItemRepository() {
 }
 
 // src/services/hygiene-checkout-item.service.ts
-var import_core2 = require("@7365admin1/core");
+var import_core16 = require("@7365admin1/core");
 var import_node_server_utils30 = require("@7365admin1/node-server-utils");
 function useCheckOutItemService() {
   const {
@@ -5770,7 +5732,7 @@ function useCheckOutItemService() {
     completeCheckOutItem
   } = useCheckOutItemRepository();
   const { getSupplyById } = useSupplyRepository();
-  const { getUserById } = (0, import_core2.useUserRepo)();
+  const { getUserById } = (0, import_core16.useUserRepo)();
   const { createStock } = useStockService();
   async function createCheckOutItem(value) {
     const session = import_node_server_utils30.useAtlas.getClient()?.startSession();
@@ -5865,6 +5827,7 @@ function useCheckOutItemService() {
 // src/controllers/hygiene-checkout-item.controller.ts
 var import_joi15 = __toESM(require("joi"));
 var import_node_server_utils31 = require("@7365admin1/node-server-utils");
+var import_core17 = require("@7365admin1/core");
 function useCheckOutItemController() {
   const {
     getCheckOutItems: _getCheckOutItems,
@@ -5887,7 +5850,7 @@ function useCheckOutItemController() {
     };
     const validation = import_joi15.default.object({
       site: import_joi15.default.string().hex().required(),
-      serviceType: import_joi15.default.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: import_joi15.default.string().valid(...Object.values(import_core17.AppServiceType)).required(),
       supply: import_joi15.default.string().hex().required(),
       qty: import_joi15.default.number().min(0).required(),
       attachment: import_joi15.default.array().items(import_joi15.default.string()).optional().allow(null),
@@ -5922,7 +5885,7 @@ function useCheckOutItemController() {
     };
     const validation = import_joi15.default.object({
       site: import_joi15.default.string().hex().required(),
-      serviceType: import_joi15.default.string().valid(...Object.values(ServiceType)).required(),
+      serviceType: import_joi15.default.string().valid(...Object.values(import_core17.AppServiceType)).required(),
       createdBy: import_joi15.default.string().hex().required(),
       items: import_joi15.default.array().items(
         import_joi15.default.object({
@@ -5955,7 +5918,7 @@ function useCheckOutItemController() {
       limit: import_joi15.default.number().min(1).optional().allow("", null),
       search: import_joi15.default.string().optional().allow("", null),
       site: import_joi15.default.string().hex().required(),
-      serviceType: import_joi15.default.string().valid(...Object.values(ServiceType)).required()
+      serviceType: import_joi15.default.string().valid(...Object.values(import_core17.AppServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -6013,11 +5976,12 @@ function useCheckOutItemController() {
 
 // src/models/hygiene-schedule-task.model.ts
 var import_node_server_utils32 = require("@7365admin1/node-server-utils");
+var import_core18 = require("@7365admin1/core");
 var import_joi16 = __toESM(require("joi"));
 var import_mongodb18 = require("mongodb");
 var scheduleTaskSchema = import_joi16.default.object({
   site: import_joi16.default.string().hex().required(),
-  serviceType: import_joi16.default.string().valid(...Object.values(ServiceType)).required(),
+  serviceType: import_joi16.default.string().valid(...Object.values(import_core18.AppServiceType)).required(),
   title: import_joi16.default.string().required(),
   time: import_joi16.default.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
   dates: import_joi16.default.array().min(1).items(
@@ -6029,8 +5993,7 @@ var scheduleTaskSchema = import_joi16.default.object({
       name: import_joi16.default.string().required(),
       value: import_joi16.default.any().required()
     })
-  ).required(),
-  createdBy: import_joi16.default.string().hex().required()
+  ).required()
 });
 function MScheduleTask(value) {
   const { error } = scheduleTaskSchema.validate(value);
@@ -6057,13 +6020,6 @@ function MScheduleTask(value) {
       }
     });
   }
-  if (value.createdBy) {
-    try {
-      value.createdBy = new import_mongodb18.ObjectId(value.createdBy);
-    } catch (error2) {
-      throw new import_node_server_utils32.BadRequestError("Invalid createdBy ID format.");
-    }
-  }
   return {
     site: value.site,
     serviceType: value.serviceType,
@@ -6073,7 +6029,6 @@ function MScheduleTask(value) {
     description: value.description,
     areas: value.areas,
     status: "active",
-    createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     updatedAt: "",
     deletedAt: ""
@@ -6586,8 +6541,7 @@ function useScheduleTaskService() {
                   area: areaId,
                   name: area.name,
                   type: areaDetails.type || "common",
-                  checklist: schedTaskSets,
-                  createdBy: scheduleTask.createdBy
+                  checklist: schedTaskSets
                 };
                 import_node_server_utils34.logger.info(
                   `Area ${area.name} (${areaId}): Creating new area checklist with schedule-task sets only`
@@ -6633,6 +6587,7 @@ function useScheduleTaskService() {
 // src/controllers/hygiene-schedule-task.controller.ts
 var import_joi17 = __toESM(require("joi"));
 var import_node_server_utils35 = require("@7365admin1/node-server-utils");
+var import_core19 = require("@7365admin1/core");
 function useScheduleTaskController() {
   const {
     createScheduleTask: _createScheduleTask,
@@ -6642,12 +6597,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) {
       import_node_server_utils35.logger.log({ level: "error", message: error.message });
@@ -6671,7 +6621,7 @@ function useScheduleTaskController() {
       limit: import_joi17.default.number().min(1).optional().allow("", null),
       search: import_joi17.default.string().optional().allow("", null),
       site: import_joi17.default.string().hex().required(),
-      serviceType: import_joi17.default.string().valid(...Object.values(ServiceType)).required()
+      serviceType: import_joi17.default.string().valid(...Object.values(import_core19.AppServiceType)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -7068,7 +7018,6 @@ function useQRController() {
   MStock,
   MSupply,
   MUnit,
-  ServiceType,
   allowedCheckOutItemStatus,
   allowedChecklistStatus,
   allowedPeriods,