@goweekdays/core 1.2.5 → 1.3.1

package/dist/index.mjs

@@ -25752,6 +25752,27 @@ function usePriceController() {
 import { BadRequestError as BadRequestError51 } from "@goweekdays/utils";
 import Joi28 from "joi";
 import { ObjectId as ObjectId34 } from "mongodb";
+var schemaPropertyUpdate = Joi28.object({
+  propertyName: Joi28.string().trim().required(),
+  propertyType: Joi28.string().trim().required(),
+  propertyDescription: Joi28.string().trim().required(),
+  streetAddress: Joi28.string().trim().required(),
+  barangay: Joi28.string().trim().required(),
+  city: Joi28.string().trim().required(),
+  province: Joi28.string().trim().required(),
+  region: Joi28.string().trim().required(),
+  zipCode: Joi28.string().trim().optional().allow(""),
+  latitude: Joi28.string().trim().optional().allow(""),
+  longitude: Joi28.string().trim().optional().allow(""),
+  ownerId: Joi28.string().trim().optional().allow(""),
+  managerName: Joi28.string().trim().optional().allow(""),
+  managerEmail: Joi28.string().trim().email().optional().allow(""),
+  managerPhone: Joi28.string().trim().optional().allow(""),
+  amenities: Joi28.array().items(Joi28.string().trim()).optional(),
+  numberOfFloors: Joi28.string().trim().required(),
+  floorLabels: Joi28.string().optional().allow(""),
+  stayType: Joi28.string().trim().required()
+});
 var schemaProperty = Joi28.object({
   _id: Joi28.string().optional(),
   propertyName: Joi28.string().trim().required(),
@@ -25772,20 +25793,8 @@ var schemaProperty = Joi28.object({
   amenities: Joi28.array().items(Joi28.string().trim()).optional(),
   numberOfFloors: Joi28.string().trim().required(),
   floorLabels: Joi28.string().optional().allow(""),
-  coverPhoto: Joi28.object({
-    name: Joi28.string().trim().optional().allow(""),
-    size: Joi28.string().trim().optional().allow(""),
-    type: Joi28.string().trim().optional().allow(""),
-    webkitRelativePath: Joi28.string().trim().optional().allow("")
-  }),
-  photoGallery: Joi28.array().items(
-    Joi28.object({
-      name: Joi28.string().trim().optional().allow(""),
-      size: Joi28.string().trim().optional().allow(""),
-      type: Joi28.string().trim().optional().allow(""),
-      webkitRelativePath: Joi28.string().trim().optional().allow("")
-    })
-  ).required(),
+  coverPhoto: Joi28.string().optional().allow("", null),
+  photoGallery: Joi28.array().items(Joi28.string()),
   stayType: Joi28.string().trim().required(),
   createdAt: Joi28.date().optional(),
   updatedAt: Joi28.date().optional(),
@@ -25826,6 +25835,7 @@ function modelProperty(value) {
     coverPhoto: value.coverPhoto,
     photoGallery: value.photoGallery ?? [],
     stayType: value.stayType,
+    status: value.status ?? "active",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt,
     deletedAt: value.deletedAt
@@ -25839,7 +25849,8 @@ import {
   useCache as useCache18,
   makeCacheKey as makeCacheKey17,
   logger as logger26,
-  InternalServerError as InternalServerError24
+  InternalServerError as InternalServerError24,
+  paginate as paginate12
 } from "@goweekdays/utils";
 import { ObjectId as ObjectId35 } from "mongodb";
 function usePropertyRepo() {
@@ -25897,18 +25908,25 @@ function usePropertyRepo() {
   async function updateById(_id, value, session) {
     try {
       _id = new ObjectId35(_id);
-    } catch (error) {
+    } catch (error2) {
       throw new BadRequestError52("Invalid ID.");
     }
+    const { error } = schemaPropertyUpdate.validate(value);
+    if (error) {
+      throw new BadRequestError52(
+        `Invalid property data: ${error.message}. Repository validation.`
+      );
+    }
     try {
+      value.updatedAt = /* @__PURE__ */ new Date();
       const res = await collection.updateOne(
         { _id },
-        { $set: { value, updatedAt: /* @__PURE__ */ new Date() } },
+        { $set: value },
         { session }
       );
       delCachedData();
       return res;
-    } catch (error) {
+    } catch (error2) {
       throw new InternalServerError24("Failed to update property.");
     }
   }
@@ -25926,8 +25944,25 @@ function usePropertyRepo() {
       throw new InternalServerError24("Failed to delete property.");
     }
   }
-  async function getAll() {
-    const cacheKey = makeCacheKey17(namespace_collection, { action: "getAll" });
+  async function getAll({
+    page = 1,
+    limit = 20,
+    status = "active",
+    search = ""
+  } = {}) {
+    page = page > 0 ? page - 1 : 0;
+    const query = { status };
+    const cacheKeyOptions = {
+      action: "getAll",
+      page,
+      limit,
+      status
+    };
+    if (search) {
+      query.$text = { $search: search };
+      cacheKeyOptions.search = search;
+    }
+    const cacheKey = makeCacheKey17(namespace_collection, cacheKeyOptions);
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -25937,8 +25972,14 @@ function usePropertyRepo() {
         });
         return cached;
       }
-      const properties = await collection.find({}).toArray();
-      setCache(cacheKey, properties, 300).then(() => {
+      const items = await collection.aggregate([
+        { $match: query },
+        { $skip: page * limit },
+        { $limit: limit }
+      ]).toArray();
+      const length = await collection.countDocuments(query);
+      const data = paginate12(items, page, limit, length);
+      setCache(cacheKey, data, 300).then(() => {
         logger26.log({
           level: "info",
           message: `Cache set for getAll: ${cacheKey}`
@@ -25949,7 +25990,7 @@ function usePropertyRepo() {
           message: `Failed to set cache: ${err.message}`
         });
       });
-      return properties;
+      return data;
     } catch (error) {
       throw new InternalServerError24(
         `Failed to fetch properties: ${error.message}`
@@ -26015,7 +26056,8 @@ function usePropertyController() {
     add: _add,
     updateById: _updateById,
     getAll: _getAll,
-    getById: _getById
+    getById: _getById,
+    deleteById: _deleteById
   } = usePropertyRepo();
   async function add(req, res, next) {
     const value = req.body;
@@ -26034,32 +26076,15 @@ function usePropertyController() {
   }
   async function updateById(req, res, next) {
     const _id = req.params.id ?? "";
-    const value = { _id, ...req.body };
-    const validation = Joi29.object({
-      _id: Joi29.string().required(),
-      name: Joi29.string().trim().required(),
-      type: Joi29.string().trim().required(),
-      description: Joi29.string().trim().required(),
-      street: Joi29.string().trim().required(),
-      barangay: Joi29.string().trim().required(),
-      cityMunicipality: Joi29.string().trim().required(),
-      province: Joi29.string().trim().required(),
-      region: Joi29.string().trim().required(),
-      zipCode: Joi29.string().trim().optional().allow(""),
-      latitude: Joi29.string().trim().optional().allow(""),
-      longitude: Joi29.string().trim().optional().allow(""),
-      ownerId: Joi29.string().trim().optional().allow(""),
-      ownerName: Joi29.string().trim().optional().allow(""),
-      email: Joi29.string().trim().email().optional().allow(""),
-      phone: Joi29.string().trim().optional().allow(""),
-      amenities: Joi29.array().items(Joi29.string().trim()).optional(),
-      floorNumber: Joi29.string().trim().required(),
-      floorLabel: Joi29.string().optional().allow(""),
-      coverPhoto: Joi29.string().trim().required(),
-      photoGallery: Joi29.array().items(Joi29.string().trim()).required(),
-      stayType: Joi29.string().trim().required()
+    const idValidation = Joi29.object({
+      _id: Joi29.string().required()
     });
-    const { error } = validation.validate(value);
+    const { error: idValidationError } = idValidation.validate({ _id });
+    if (idValidationError) {
+      throw new BadRequestError53(`Invalid ID`);
+    }
+    const value = req.body;
+    const { error } = schemaPropertyUpdate.validate(value);
     if (error) {
       throw new BadRequestError53(`Invalid property data: ${error.message}`);
     }
@@ -26071,12 +26096,23 @@ function usePropertyController() {
     }
   }
   async function getAll(req, res, next) {
+    const validation = Joi29.object({
+      page: Joi29.number().integer().min(1).default(1),
+      limit: Joi29.number().integer().min(1).max(100).default(10),
+      search: Joi29.string().trim().allow("").default(""),
+      status: Joi29.string().default("active")
+    });
+    const { error, value } = validation.validate(req.query);
+    if (error) {
+      next(new BadRequestError53(error.message));
+      return;
+    }
     try {
-      const properties = await _getAll();
+      const properties = await _getAll(value);
       res.json(properties);
       return;
-    } catch (error) {
-      next(error);
+    } catch (error2) {
+      next(error2);
     }
   }
   async function getById(req, res, next) {
@@ -26093,11 +26129,26 @@ function usePropertyController() {
       next(error);
     }
   }
+  async function deleteById(req, res, next) {
+    const id = req.params.id;
+    if (!id) {
+      next(new BadRequestError53("Property ID is required."));
+      return;
+    }
+    try {
+      const message = await _deleteById(id);
+      res.json(message);
+      return;
+    } catch (error) {
+      next(error);
+    }
+  }
   return {
     add,
     updateById,
     getAll,
-    getById
+    getById,
+    deleteById
   };
 }
 
@@ -26427,6 +26478,7 @@ export {
   modelProperty,
   schema,
   schemaProperty,
+  schemaPropertyUpdate,
   useAddressController,
   useAddressRepo,
   useAuthController,