@7365admin1/module-hygiene 4.22.0 → 4.23.1

package/dist/index.mjs

@@ -2499,6 +2499,7 @@ function MParentChecklist(value) {
 
 // src/repositories/hygiene-parent-checklist.repository.ts
 import { ObjectId as ObjectId7 } from "mongodb";
+import moment2 from "moment-timezone";
 import {
   useAtlas as useAtlas5,
   InternalServerError as InternalServerError4,
@@ -2536,10 +2537,8 @@ function useParentChecklistRepo() {
   async function createParentChecklist(value, session) {
     try {
       const currentDate = value.createdAt ? new Date(value.createdAt) : /* @__PURE__ */ new Date();
-      const startOfDay = new Date(currentDate);
-      startOfDay.setUTCHours(0, 0, 0, 0);
-      const endOfDay = new Date(currentDate);
-      endOfDay.setUTCHours(23, 59, 59, 999);
+      const startOfDay = moment2(currentDate).tz("Asia/Singapore").startOf("day").toDate();
+      const endOfDay = moment2(currentDate).tz("Asia/Singapore").endOf("day").toDate();
       const allServiceTypes = Object.values(AppServiceType7);
       const dateStr = currentDate.toISOString().split("T")[0];
       if (value.site) {
@@ -2890,11 +2889,8 @@ function useParentChecklistRepo() {
     }
   }
   async function getTodayParentChecklists() {
-    const now = /* @__PURE__ */ new Date();
-    const start = new Date(now);
-    start.setUTCHours(0, 0, 0, 0);
-    const end = new Date(now);
-    end.setUTCHours(23, 59, 59, 999);
+    const start = moment2().tz("Asia/Singapore").startOf("day").toDate();
+    const end = moment2().tz("Asia/Singapore").endOf("day").toDate();
     try {
       const items = await collection.find(
         { createdAt: { $gte: start, $lte: end } },
@@ -2907,11 +2903,8 @@ function useParentChecklistRepo() {
     }
   }
   async function getTodayParentChecklistsForAreaGen() {
-    const now = /* @__PURE__ */ new Date();
-    const start = new Date(now);
-    start.setUTCHours(0, 0, 0, 0);
-    const end = new Date(now);
-    end.setUTCHours(23, 59, 59, 999);
+    const start = moment2().tz("Asia/Singapore").startOf("day").toDate();
+    const end = moment2().tz("Asia/Singapore").endOf("day").toDate();
     try {
       const items = await collection.find(
         {
@@ -4986,7 +4979,8 @@ var supplySchema = Joi10.object({
   site: Joi10.string().hex().required(),
   serviceType: Joi10.string().valid(...Object.values(AppServiceType11)).required(),
   name: Joi10.string().required(),
-  unitOfMeasurement: Joi10.string().required()
+  unitOfMeasurement: Joi10.string().required(),
+  attachment: Joi10.string().allow(null, "").optional()
 });
 function MSupply(value) {
   const { error } = supplySchema.validate(value);
@@ -5007,6 +5001,7 @@ function MSupply(value) {
     name: value.name,
     unitOfMeasurement: value.unitOfMeasurement,
     qty: 0,
+    attachment: value.attachment,
     status: "active",
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: "",
@@ -5127,6 +5122,7 @@ function useSupplyRepository() {
         { $match: query },
         {
           $project: {
+            attachment: 1,
             name: 1,
             qty: 1,
             status: 1
@@ -5175,6 +5171,7 @@ function useSupplyRepository() {
         { $match: query },
         {
           $project: {
+            attachment: 1,
             name: 1,
             unitOfMeasurement: 1,
             qty: 1
@@ -5363,7 +5360,8 @@ function useSupplyController() {
       id: Joi11.string().hex().required(),
       name: Joi11.string().optional().allow("", null),
       unitOfMeasurement: Joi11.string().optional().allow("", null),
-      qty: Joi11.number().min(0).optional().allow("", null)
+      qty: Joi11.number().min(0).optional().allow("", null),
+      attachment: Joi11.string().optional().allow("", null)
     });
     const { error } = validation.validate(payload);
     if (error) {