@iservice365/module-hygiene 1.5.1 → 1.6.0

package/dist/index.mjs

@@ -147,6 +147,7 @@ function useAreaRepo() {
     page = 1,
     limit = 10,
     search = "",
+    type = "all",
     site
   }) {
     page = page > 0 ? page - 1 : 0;
@@ -164,6 +165,10 @@ function useAreaRepo() {
     } catch (error) {
       throw new BadRequestError2("Invalid site ID format.");
     }
+    if (type && type !== "all") {
+      query.type = type;
+      cacheOptions.type = type;
+    }
     if (search) {
       query.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
@@ -656,6 +661,7 @@ function useAreaController() {
       page: Joi2.number().min(1).optional().allow("", null),
       limit: Joi2.number().min(1).optional().allow("", null),
       search: Joi2.string().optional().allow("", null),
+      type: Joi2.string().valid("all", ...allowedTypes).optional().allow("", null),
       site: Joi2.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -667,12 +673,14 @@ function useAreaController() {
     const page = parseInt(req.query.page) ?? 1;
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
+    const type = req.query.type ?? "all";
     const site = req.params.site ?? "";
     try {
       const data = await _getAreas({
         page,
         limit,
         search,
+        type,
         site
       });
       res.json(data);
@@ -1433,7 +1441,8 @@ function useParentChecklistRepo() {
     search = "",
     site,
     startDate = "",
-    endDate = ""
+    endDate = "",
+    status = "all"
   }) {
     page = page > 0 ? page - 1 : 0;
     const query = {};
@@ -1466,6 +1475,10 @@ function useParentChecklistRepo() {
       query.createdAt = { $lte: new Date(endDate) };
       cacheOptions.endDate = new Date(endDate).toISOString().split("T")[0];
     }
+    if (status && status !== "all") {
+      query.status = status;
+      cacheOptions.status = status;
+    }
     const cacheKey = makeCacheKey3(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
@@ -1622,7 +1635,8 @@ function useParentChecklistController() {
       search: Joi6.string().optional().allow("", null),
       site: Joi6.string().hex().required(),
       startDate: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null),
-      endDate: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null)
+      endDate: Joi6.alternatives().try(Joi6.date(), Joi6.string()).optional().allow("", null),
+      status: Joi6.string().valid(...allowedStatus, "all").optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -1636,6 +1650,7 @@ function useParentChecklistController() {
     const site = req.params.site ?? "";
     const startDate = req.query.startDate ?? "";
     const endDate = req.query.endDate ?? "";
+    const status = req.query.status ?? "all";
     try {
       const data = await _getAllParentChecklist({
         page,
@@ -1643,7 +1658,8 @@ function useParentChecklistController() {
         search,
         site,
         startDate,
-        endDate
+        endDate,
+        status
       });
       res.json(data);
       return;
@@ -1822,7 +1838,8 @@ function useAreaChecklistRepo() {
     page = 1,
     limit = 10,
     search = "",
-    type,
+    type = "all",
+    status = "all",
     schedule
   }, session) {
     page = page > 0 ? page - 1 : 0;
@@ -1837,10 +1854,14 @@ function useAreaChecklistRepo() {
     } catch (error) {
       throw new BadRequestError13("Invalid parent checklist ID format.");
     }
-    if (type) {
+    if (type && type !== "all") {
       query.type = type;
       cacheOptions.type = type;
     }
+    if (status && status !== "all") {
+      query.status = status;
+      cacheOptions.status = status;
+    }
     if (search) {
       query.$text = { $search: search };
       cacheOptions.search = search;
@@ -2607,7 +2628,8 @@ function useAreaChecklistController() {
       page: Joi8.number().min(1).optional().allow("", null),
       limit: Joi8.number().min(1).optional().allow("", null),
       search: Joi8.string().optional().allow("", null),
-      type: Joi8.string().optional().allow("", ...allowedTypes),
+      type: Joi8.string().valid(...allowedTypes, "all").optional().allow("", null),
+      status: Joi8.string().valid(...allowedStatus, "all").optional().allow("", null),
       schedule: Joi8.string().hex().required()
     });
     const { error } = validation.validate(query);
@@ -2619,7 +2641,8 @@ function useAreaChecklistController() {
     const page = parseInt(req.query.page) ?? 1;
     const limit = parseInt(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
-    const type = req.query.type ?? "";
+    const type = req.query.type ?? "all";
+    const status = req.query.status ?? "all";
     const schedule = req.params.schedule ?? "";
     try {
       const data = await _getAllAreaChecklist({
@@ -2627,6 +2650,7 @@ function useAreaChecklistController() {
         limit,
         search,
         type,
+        status,
         schedule
       });
       res.json(data);