@goweekdays/core 1.2.5 → 1.3.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @goweekdays/core
 
+## 1.3.1
+
+### Patch Changes
+
+- 216fd0d: Add default query
+
+## 1.3.0
+
+### Minor Changes
+
+- f8f8694: Property management initial release
+
 ## 1.2.5
 
 ### Patch Changes

package/dist/index.d.ts

@@ -2274,10 +2274,12 @@ type TProperty = {
     coverPhoto: object;
     photoGallery: Array<object>;
     stayType: string;
+    status?: string;
     createdAt?: Date;
     updatedAt?: Date;
     deletedAt?: Date;
 };
+declare const schemaPropertyUpdate: Joi.ObjectSchema<any>;
 declare const schemaProperty: Joi.ObjectSchema<any>;
 declare function modelProperty(value: TProperty): TProperty;
 
@@ -2286,7 +2288,12 @@ declare function usePropertyRepo(): {
     add: (value: TProperty, session?: ClientSession) => Promise<ObjectId>;
     deleteById: (_id: string | ObjectId) => Promise<mongodb.DeleteResult>;
     updateById: (_id: string | ObjectId, value: TProperty, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
-    getAll: () => Promise<mongodb.WithId<bson.Document>[] | TProperty[]>;
+    getAll: ({ page, limit, status, search, }?: {
+        page?: number | undefined;
+        limit?: number | undefined;
+        status?: string | undefined;
+        search?: string | undefined;
+    }) => Promise<{}>;
     getById: (_id: string | ObjectId) => Promise<mongodb.WithId<bson.Document> | TProperty>;
 };
 
@@ -2295,6 +2302,7 @@ declare function usePropertyController(): {
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    deleteById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 declare function usePaypalService(): {
@@ -2355,4 +2363,4 @@ declare const XENDIT_SECRET_KEY: string;
 declare const XENDIT_BASE_URL: string;
 declare const DOMAIN: string;
 
-export { ACCESS_TOKEN_EXPIRY, ACCESS_TOKEN_SECRET, APP_ACCOUNT, APP_MAIN, CardPayment, CardPaymentSchema, DEFAULT_USER_EMAIL, DEFAULT_USER_FIRST_NAME, DEFAULT_USER_LAST_NAME, DEFAULT_USER_PASSWORD, DOMAIN, DirectDebit, DirectDebitSchema, EWalletPayment, EWalletPaymentSchema, MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT, MAILER_TRANSPORT_SECURE, MAddress, MEntity, MFile, MMember, MONGO_DB, MONGO_URI, MOrder, MOrg, MPaymentMethod, MPromoCode, MRole, MSubscription, MToken, MUser, MUserRole, MVerification, PAYPAL_API_URL, PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PORT, REDIS_HOST, REDIS_PASSWORD, REDIS_PORT, REFRESH_TOKEN_EXPIRY, REFRESH_TOKEN_SECRET, SECRET_KEY, SPACES_ACCESS_KEY, SPACES_BUCKET, SPACES_ENDPOINT, SPACES_REGION, SPACES_SECRET_KEY, TAddress, TBillingRecipient, TCounter, TEntity, TFile, TInvoice, TMember, TMiniRole, TOrder, TOrderMetadata, TOrg, TPayment, TPaymentMethod$1 as TPaymentMethod, TPaymentMethodType, TPrice, TPriceType, TPromoCode, TPromoTier, TProperty, TRole, TSubscription, TToken, TUser, TUserRole, TVerification, TVerificationMetadata, VERIFICATION_FORGET_PASSWORD_DURATION, VERIFICATION_USER_INVITE_DURATION, XENDIT_BASE_URL, XENDIT_SECRET_KEY, addressSchema, isDev, modelProperty, schema, schemaProperty, useAddressController, useAddressRepo, useAuthController, useAuthService, useCounterModel, useCounterRepo, useEntityController, useEntityRepo, useFileController, useFileRepo, useFileService, useInvoiceController, useInvoiceModel, useInvoiceRepo, useInvoiceService, useMemberController, useMemberRepo, useOrderController, useOrderRepo, useOrgController, useOrgRepo, useOrgService, usePaymentController, usePaymentMethodController, usePaymentMethodRepo, usePaymentMethodService, usePaymentModel, usePaymentRepo, usePaypalService, usePriceController, usePriceModel, usePriceRepo, usePromoCodeController, usePromoCodeRepo, usePropertyController, usePropertyRepo, useRoleController, useRoleRepo, useSubscriptionController, useSubscriptionRepo, useSubscriptionService, useTokenRepo, useUserController, useUserRepo, useUserService, useUtilController, useVerificationController, useVerificationRepo, useVerificationService, useXenditService, validateCardPayment, validateDirectDebit, validateEWalletPayment };
+export { ACCESS_TOKEN_EXPIRY, ACCESS_TOKEN_SECRET, APP_ACCOUNT, APP_MAIN, CardPayment, CardPaymentSchema, DEFAULT_USER_EMAIL, DEFAULT_USER_FIRST_NAME, DEFAULT_USER_LAST_NAME, DEFAULT_USER_PASSWORD, DOMAIN, DirectDebit, DirectDebitSchema, EWalletPayment, EWalletPaymentSchema, MAILER_EMAIL, MAILER_PASSWORD, MAILER_TRANSPORT_HOST, MAILER_TRANSPORT_PORT, MAILER_TRANSPORT_SECURE, MAddress, MEntity, MFile, MMember, MONGO_DB, MONGO_URI, MOrder, MOrg, MPaymentMethod, MPromoCode, MRole, MSubscription, MToken, MUser, MUserRole, MVerification, PAYPAL_API_URL, PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PORT, REDIS_HOST, REDIS_PASSWORD, REDIS_PORT, REFRESH_TOKEN_EXPIRY, REFRESH_TOKEN_SECRET, SECRET_KEY, SPACES_ACCESS_KEY, SPACES_BUCKET, SPACES_ENDPOINT, SPACES_REGION, SPACES_SECRET_KEY, TAddress, TBillingRecipient, TCounter, TEntity, TFile, TInvoice, TMember, TMiniRole, TOrder, TOrderMetadata, TOrg, TPayment, TPaymentMethod$1 as TPaymentMethod, TPaymentMethodType, TPrice, TPriceType, TPromoCode, TPromoTier, TProperty, TRole, TSubscription, TToken, TUser, TUserRole, TVerification, TVerificationMetadata, VERIFICATION_FORGET_PASSWORD_DURATION, VERIFICATION_USER_INVITE_DURATION, XENDIT_BASE_URL, XENDIT_SECRET_KEY, addressSchema, isDev, modelProperty, schema, schemaProperty, schemaPropertyUpdate, useAddressController, useAddressRepo, useAuthController, useAuthService, useCounterModel, useCounterRepo, useEntityController, useEntityRepo, useFileController, useFileRepo, useFileService, useInvoiceController, useInvoiceModel, useInvoiceRepo, useInvoiceService, useMemberController, useMemberRepo, useOrderController, useOrderRepo, useOrgController, useOrgRepo, useOrgService, usePaymentController, usePaymentMethodController, usePaymentMethodRepo, usePaymentMethodService, usePaymentModel, usePaymentRepo, usePaypalService, usePriceController, usePriceModel, usePriceRepo, usePromoCodeController, usePromoCodeRepo, usePropertyController, usePropertyRepo, useRoleController, useRoleRepo, useSubscriptionController, useSubscriptionRepo, useSubscriptionService, useTokenRepo, useUserController, useUserRepo, useUserService, useUtilController, useVerificationController, useVerificationRepo, useVerificationService, useXenditService, validateCardPayment, validateDirectDebit, validateEWalletPayment };

package/dist/index.js

@@ -11599,6 +11599,7 @@ __export(src_exports, {
   modelProperty: () => modelProperty,
   schema: () => schema,
   schemaProperty: () => schemaProperty,
+  schemaPropertyUpdate: () => schemaPropertyUpdate,
   useAddressController: () => useAddressController,
   useAddressRepo: () => useAddressRepo,
   useAuthController: () => useAuthController,
@@ -25693,6 +25694,27 @@ function usePriceController() {
 var import_utils83 = require("@goweekdays/utils");
 var import_joi28 = __toESM(require("joi"));
 var import_mongodb34 = require("mongodb");
+var schemaPropertyUpdate = import_joi28.default.object({
+  propertyName: import_joi28.default.string().trim().required(),
+  propertyType: import_joi28.default.string().trim().required(),
+  propertyDescription: import_joi28.default.string().trim().required(),
+  streetAddress: import_joi28.default.string().trim().required(),
+  barangay: import_joi28.default.string().trim().required(),
+  city: import_joi28.default.string().trim().required(),
+  province: import_joi28.default.string().trim().required(),
+  region: import_joi28.default.string().trim().required(),
+  zipCode: import_joi28.default.string().trim().optional().allow(""),
+  latitude: import_joi28.default.string().trim().optional().allow(""),
+  longitude: import_joi28.default.string().trim().optional().allow(""),
+  ownerId: import_joi28.default.string().trim().optional().allow(""),
+  managerName: import_joi28.default.string().trim().optional().allow(""),
+  managerEmail: import_joi28.default.string().trim().email().optional().allow(""),
+  managerPhone: import_joi28.default.string().trim().optional().allow(""),
+  amenities: import_joi28.default.array().items(import_joi28.default.string().trim()).optional(),
+  numberOfFloors: import_joi28.default.string().trim().required(),
+  floorLabels: import_joi28.default.string().optional().allow(""),
+  stayType: import_joi28.default.string().trim().required()
+});
 var schemaProperty = import_joi28.default.object({
   _id: import_joi28.default.string().optional(),
   propertyName: import_joi28.default.string().trim().required(),
@@ -25713,20 +25735,8 @@ var schemaProperty = import_joi28.default.object({
   amenities: import_joi28.default.array().items(import_joi28.default.string().trim()).optional(),
   numberOfFloors: import_joi28.default.string().trim().required(),
   floorLabels: import_joi28.default.string().optional().allow(""),
-  coverPhoto: import_joi28.default.object({
-    name: import_joi28.default.string().trim().optional().allow(""),
-    size: import_joi28.default.string().trim().optional().allow(""),
-    type: import_joi28.default.string().trim().optional().allow(""),
-    webkitRelativePath: import_joi28.default.string().trim().optional().allow("")
-  }),
-  photoGallery: import_joi28.default.array().items(
-    import_joi28.default.object({
-      name: import_joi28.default.string().trim().optional().allow(""),
-      size: import_joi28.default.string().trim().optional().allow(""),
-      type: import_joi28.default.string().trim().optional().allow(""),
-      webkitRelativePath: import_joi28.default.string().trim().optional().allow("")
-    })
-  ).required(),
+  coverPhoto: import_joi28.default.string().optional().allow("", null),
+  photoGallery: import_joi28.default.array().items(import_joi28.default.string()),
   stayType: import_joi28.default.string().trim().required(),
   createdAt: import_joi28.default.date().optional(),
   updatedAt: import_joi28.default.date().optional(),
@@ -25767,6 +25777,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
@@ -25831,18 +25842,25 @@ function usePropertyRepo() {
   async function updateById(_id, value, session) {
     try {
       _id = new import_mongodb35.ObjectId(_id);
-    } catch (error) {
+    } catch (error2) {
       throw new import_utils84.BadRequestError("Invalid ID.");
     }
+    const { error } = schemaPropertyUpdate.validate(value);
+    if (error) {
+      throw new import_utils84.BadRequestError(
+        `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 import_utils84.InternalServerError("Failed to update property.");
     }
   }
@@ -25860,8 +25878,25 @@ function usePropertyRepo() {
       throw new import_utils84.InternalServerError("Failed to delete property.");
     }
   }
-  async function getAll() {
-    const cacheKey = (0, import_utils84.makeCacheKey)(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 = (0, import_utils84.makeCacheKey)(namespace_collection, cacheKeyOptions);
     try {
       const cached = await getCache(cacheKey);
       if (cached) {
@@ -25871,8 +25906,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 = (0, import_utils84.paginate)(items, page, limit, length);
+      setCache(cacheKey, data, 300).then(() => {
         import_utils84.logger.log({
           level: "info",
           message: `Cache set for getAll: ${cacheKey}`
@@ -25883,7 +25924,7 @@ function usePropertyRepo() {
           message: `Failed to set cache: ${err.message}`
         });
       });
-      return properties;
+      return data;
     } catch (error) {
       throw new import_utils84.InternalServerError(
         `Failed to fetch properties: ${error.message}`
@@ -25949,7 +25990,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;
@@ -25968,32 +26010,15 @@ function usePropertyController() {
   }
   async function updateById(req, res, next) {
     const _id = req.params.id ?? "";
-    const value = { _id, ...req.body };
-    const validation = import_joi29.default.object({
-      _id: import_joi29.default.string().required(),
-      name: import_joi29.default.string().trim().required(),
-      type: import_joi29.default.string().trim().required(),
-      description: import_joi29.default.string().trim().required(),
-      street: import_joi29.default.string().trim().required(),
-      barangay: import_joi29.default.string().trim().required(),
-      cityMunicipality: import_joi29.default.string().trim().required(),
-      province: import_joi29.default.string().trim().required(),
-      region: import_joi29.default.string().trim().required(),
-      zipCode: import_joi29.default.string().trim().optional().allow(""),
-      latitude: import_joi29.default.string().trim().optional().allow(""),
-      longitude: import_joi29.default.string().trim().optional().allow(""),
-      ownerId: import_joi29.default.string().trim().optional().allow(""),
-      ownerName: import_joi29.default.string().trim().optional().allow(""),
-      email: import_joi29.default.string().trim().email().optional().allow(""),
-      phone: import_joi29.default.string().trim().optional().allow(""),
-      amenities: import_joi29.default.array().items(import_joi29.default.string().trim()).optional(),
-      floorNumber: import_joi29.default.string().trim().required(),
-      floorLabel: import_joi29.default.string().optional().allow(""),
-      coverPhoto: import_joi29.default.string().trim().required(),
-      photoGallery: import_joi29.default.array().items(import_joi29.default.string().trim()).required(),
-      stayType: import_joi29.default.string().trim().required()
+    const idValidation = import_joi29.default.object({
+      _id: import_joi29.default.string().required()
     });
-    const { error } = validation.validate(value);
+    const { error: idValidationError } = idValidation.validate({ _id });
+    if (idValidationError) {
+      throw new import_utils85.BadRequestError(`Invalid ID`);
+    }
+    const value = req.body;
+    const { error } = schemaPropertyUpdate.validate(value);
     if (error) {
       throw new import_utils85.BadRequestError(`Invalid property data: ${error.message}`);
     }
@@ -26005,12 +26030,23 @@ function usePropertyController() {
     }
   }
   async function getAll(req, res, next) {
+    const validation = import_joi29.default.object({
+      page: import_joi29.default.number().integer().min(1).default(1),
+      limit: import_joi29.default.number().integer().min(1).max(100).default(10),
+      search: import_joi29.default.string().trim().allow("").default(""),
+      status: import_joi29.default.string().default("active")
+    });
+    const { error, value } = validation.validate(req.query);
+    if (error) {
+      next(new import_utils85.BadRequestError(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) {
@@ -26027,11 +26063,26 @@ function usePropertyController() {
       next(error);
     }
   }
+  async function deleteById(req, res, next) {
+    const id = req.params.id;
+    if (!id) {
+      next(new import_utils85.BadRequestError("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
   };
 }
 
@@ -26357,6 +26408,7 @@ function useUtilController() {
   modelProperty,
   schema,
   schemaProperty,
+  schemaPropertyUpdate,
   useAddressController,
   useAddressRepo,
   useAuthController,