@goweekdays/core 0.0.7 → 0.0.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @goweekdays/core
 
+## 0.0.9
+
+### Patch Changes
+
+- 7b07858: Add validation layer
+
+## 0.0.8
+
+### Patch Changes
+
+- 31c434e: fix organization creation with session
+
 ## 0.0.7
 
 ### Patch Changes

package/dist/index.d.ts

@@ -989,14 +989,19 @@ declare function usePaymentMethodRepo(): {
 };
 
 declare function usePaymentMethodService(): {
-    linkEWallet: ({ user, mobile_number, type, success_return_url, failure_return_url, cancel_return_url, }?: {
+    linkEWallet: ({ user, mobile_number, type, success_return_url, failure_return_url, cancel_return_url, metadata, }?: {
         user?: string | undefined;
         mobile_number?: string | undefined;
         type?: string | undefined;
         success_return_url?: string | undefined;
         failure_return_url?: string | undefined;
         cancel_return_url?: string | undefined;
-    }) => Promise<any>;
+        metadata?: {} | undefined;
+    }) => Promise<{
+        paymentMethod: any;
+        customer: any;
+        actions: any;
+    }>;
     linkCard: ({ user, type, success_return_url, failure_return_url, card_number, expiry_month, expiry_year, cvv, cardholder_name, currency, }?: {
         user?: string | undefined;
         type?: string | undefined;

package/dist/index.js

@@ -19215,7 +19215,7 @@ function useOrgRepo() {
   async function add(value, session) {
     try {
       value = MOrg(value);
-      const res = await collection.insertOne(value, session);
+      const res = await collection.insertOne(value, { session });
       return res.insertedId;
     } catch (error) {
       import_utils58.logger.log({
@@ -19535,8 +19535,43 @@ function useSubscriptionService() {
 }
 
 // src/controllers/subscription.controller.ts
-var import_joi11 = __toESM(require("joi"));
+var import_joi12 = __toESM(require("joi"));
 var import_utils62 = require("@goweekdays/utils");
+
+// src/validations/subscription.schema.ts
+var import_joi11 = __toESM(require("joi"));
+function useSubscriptionSchema() {
+  const schema = import_joi11.default.object({
+    user: import_joi11.default.string().required(),
+    amount: import_joi11.default.number().required(),
+    customer_id: import_joi11.default.string().required(),
+    payment_method_id: import_joi11.default.string().required(),
+    currency: import_joi11.default.string().optional().allow("", null),
+    organization: import_joi11.default.object({
+      name: import_joi11.default.string().required(),
+      description: import_joi11.default.string().optional().allow("", null),
+      type: import_joi11.default.string().allow("personal", "business").required(),
+      email: import_joi11.default.string().email().required(),
+      contact: import_joi11.default.string().required(),
+      busInst: import_joi11.default.string().optional().allow(null, "")
+    }).required(),
+    billingAddress: import_joi11.default.object({
+      type: import_joi11.default.string().required(),
+      country: import_joi11.default.string().required(),
+      address: import_joi11.default.string().required(),
+      continuedAddress: import_joi11.default.string().optional().allow(null, ""),
+      city: import_joi11.default.string().required(),
+      province: import_joi11.default.string().required(),
+      postalCode: import_joi11.default.string().required(),
+      taxId: import_joi11.default.string().optional().allow(null, "")
+    }).required()
+  });
+  return {
+    schema
+  };
+}
+
+// src/controllers/subscription.controller.ts
 function useSubscriptionController() {
   const { add: _add, getSubscriptions: _getSubscriptions } = useSubscriptionRepo();
   const {
@@ -19547,9 +19582,9 @@ function useSubscriptionController() {
   } = useSubscriptionService();
   async function add(req, res, next) {
     const value = req.body;
-    const validation = import_joi11.default.object({
-      user: import_joi11.default.string().required(),
-      subscriptionId: import_joi11.default.string().required()
+    const validation = import_joi12.default.object({
+      user: import_joi12.default.string().required(),
+      subscriptionId: import_joi12.default.string().required()
     });
     const { error } = validation.validate(value);
     if (error) {
@@ -19566,7 +19601,7 @@ function useSubscriptionController() {
   }
   async function getByUserId(req, res, next) {
     const id = req.params.id;
-    const validation = import_joi11.default.string().required();
+    const validation = import_joi12.default.string().required();
     const { error } = validation.validate(id);
     if (error) {
       next(new import_utils62.BadRequestError(error.message));
@@ -19583,10 +19618,10 @@ function useSubscriptionController() {
     const status = req.query.status ?? "";
     const search = req.query.search ?? "";
     const page = Number(req.query.page) ?? 1;
-    const validation = import_joi11.default.object({
-      status: import_joi11.default.string().required(),
-      search: import_joi11.default.string().optional().allow("", null),
-      page: import_joi11.default.number().required()
+    const validation = import_joi12.default.object({
+      status: import_joi12.default.string().required(),
+      search: import_joi12.default.string().optional().allow("", null),
+      page: import_joi12.default.number().required()
     });
     const { error } = validation.validate({ status, search, page });
     if (error) {
@@ -19602,7 +19637,7 @@ function useSubscriptionController() {
   }
   async function getSubscriptionStatus(req, res, next) {
     const id = req.params.id;
-    const validation = import_joi11.default.string().required();
+    const validation = import_joi12.default.string().required();
     const { error } = validation.validate(id);
     if (error) {
       next(new import_utils62.BadRequestError(error.message));
@@ -19621,12 +19656,12 @@ function useSubscriptionController() {
     const customer_id = req.body.customer_id ?? "";
     const currency = req.body.currency ?? "PHP";
     const user = req.headers["user"];
-    const validation = import_joi11.default.object({
-      user: import_joi11.default.string().required(),
-      amount: import_joi11.default.number().required(),
-      customer_id: import_joi11.default.string().required(),
-      payment_method_id: import_joi11.default.string().required(),
-      currency: import_joi11.default.string().optional().allow("", null)
+    const validation = import_joi12.default.object({
+      user: import_joi12.default.string().required(),
+      amount: import_joi12.default.number().required(),
+      customer_id: import_joi12.default.string().required(),
+      payment_method_id: import_joi12.default.string().required(),
+      currency: import_joi12.default.string().optional().allow("", null)
     });
     const { error } = validation.validate({
       user,
@@ -19654,35 +19689,11 @@ function useSubscriptionController() {
       return;
     }
   }
+  const { schema: subscriptionSchema } = useSubscriptionSchema();
   async function createOrgSubscription(req, res, next) {
     const value = req.body;
     value.user = req.headers["user"];
-    const validation = import_joi11.default.object({
-      user: import_joi11.default.string().required(),
-      amount: import_joi11.default.number().required(),
-      customer_id: import_joi11.default.string().required(),
-      payment_method_id: import_joi11.default.string().required(),
-      currency: import_joi11.default.string().optional().allow("", null),
-      organization: import_joi11.default.object({
-        name: import_joi11.default.string().required(),
-        description: import_joi11.default.string().optional().allow("", null),
-        type: import_joi11.default.string().allow("personal", "business").required(),
-        email: import_joi11.default.string().email().required(),
-        contact: import_joi11.default.string().required(),
-        busInst: import_joi11.default.string().optional().allow(null, "")
-      }).required(),
-      billingAddress: import_joi11.default.object({
-        type: import_joi11.default.string().required(),
-        country: import_joi11.default.string().required(),
-        address: import_joi11.default.string().required(),
-        continuedAddress: import_joi11.default.string().optional().allow(null, ""),
-        city: import_joi11.default.string().required(),
-        province: import_joi11.default.string().required(),
-        postalCode: import_joi11.default.string().required(),
-        taxId: import_joi11.default.string().optional().allow(null, "")
-      }).required()
-    });
-    const { error } = validation.validate(value);
+    const { error } = subscriptionSchema.validate(value);
     if (error) {
       next(new import_utils62.BadRequestError(error.message));
       return;
@@ -19756,7 +19767,8 @@ function usePaymentMethodService() {
     type = "GCASH",
     success_return_url = "",
     failure_return_url = "",
-    cancel_return_url = ""
+    cancel_return_url = "",
+    metadata = {}
   } = {}) {
     const session = import_utils63.useAtlas.getClient()?.startSession();
     session?.startTransaction();
@@ -19774,7 +19786,7 @@ function usePaymentMethodService() {
         given_names: _user.firstName,
         surname: _user.lastName
       });
-      const result = await linkPaymentMethodEWallet({
+      const paymentMethod = await linkPaymentMethodEWallet({
         customerId: customer.id,
         type,
         success_return_url,
@@ -19786,17 +19798,20 @@ function usePaymentMethodService() {
           user: _user._id,
           type,
           status: "active",
-          paymentId: result.id,
+          paymentId: paymentMethod.id,
           customerId: customer.id,
-          name: result.type,
+          name: paymentMethod.type,
           number: mobile_number
         },
         session
       );
       await session?.commitTransaction();
-      return result;
+      return {
+        paymentMethod: paymentMethod.id,
+        customer: customer.id,
+        actions: paymentMethod.actions
+      };
     } catch (error) {
-      console.log(error);
       await session?.abortTransaction();
       throw error;
     } finally {
@@ -19863,7 +19878,7 @@ function usePaymentMethodService() {
 }
 
 // src/controllers/payment-method.controller.ts
-var import_joi12 = __toESM(require("joi"));
+var import_joi13 = __toESM(require("joi"));
 var import_utils64 = require("@goweekdays/utils");
 function usePaymentMethodController() {
   const { linkEWallet: _linkEWallet, linkCard: _linkCard } = usePaymentMethodService();
@@ -19874,13 +19889,13 @@ function usePaymentMethodController() {
     const success_return_url = req.body.success_return_url ?? "";
     const failure_return_url = req.body.failure_return_url ?? "";
     const cancel_return_url = req.body.cancel_return_url ?? "";
-    const validation = import_joi12.default.object({
-      user: import_joi12.default.string().hex().required(),
-      mobile_number: import_joi12.default.string().required(),
-      type: import_joi12.default.string().valid("GCASH", "PAYMAYA").required(),
-      success_return_url: import_joi12.default.string().uri().required(),
-      failure_return_url: import_joi12.default.string().uri().required(),
-      cancel_return_url: import_joi12.default.string().uri().required()
+    const validation = import_joi13.default.object({
+      user: import_joi13.default.string().hex().required(),
+      mobile_number: import_joi13.default.string().required(),
+      type: import_joi13.default.string().valid("GCASH", "PAYMAYA").required(),
+      success_return_url: import_joi13.default.string().uri().required(),
+      failure_return_url: import_joi13.default.string().uri().required(),
+      cancel_return_url: import_joi13.default.string().uri().required()
     });
     const { error } = validation.validate({
       user,
@@ -19919,17 +19934,17 @@ function usePaymentMethodController() {
     const failure_return_url = req.body.failure_return_url ?? "";
     const cardType = req.body.cardType ?? "";
     const user = req.headers["user"] ?? "";
-    const validation = import_joi12.default.object({
-      cardNumber: import_joi12.default.string().required(),
-      expiryMonth: import_joi12.default.string().required(),
-      expiryYear: import_joi12.default.string().required(),
-      cvv: import_joi12.default.string().required(),
-      cardholderName: import_joi12.default.string().required(),
-      currency: import_joi12.default.string().optional().allow("", null),
-      success_return_url: import_joi12.default.string().uri().required(),
-      failure_return_url: import_joi12.default.string().uri().required(),
-      cardType: import_joi12.default.string().required(),
-      user: import_joi12.default.string().hex().required()
+    const validation = import_joi13.default.object({
+      cardNumber: import_joi13.default.string().required(),
+      expiryMonth: import_joi13.default.string().required(),
+      expiryYear: import_joi13.default.string().required(),
+      cvv: import_joi13.default.string().required(),
+      cardholderName: import_joi13.default.string().required(),
+      currency: import_joi13.default.string().optional().allow("", null),
+      success_return_url: import_joi13.default.string().uri().required(),
+      failure_return_url: import_joi13.default.string().uri().required(),
+      cardType: import_joi13.default.string().required(),
+      user: import_joi13.default.string().hex().required()
     });
     const { error } = validation.validate({
       user,
@@ -19984,22 +19999,22 @@ function usePaymentMethodController() {
 
 // src/controllers/address.controller.ts
 var import_utils65 = require("@goweekdays/utils");
-var import_joi13 = __toESM(require("joi"));
+var import_joi14 = __toESM(require("joi"));
 function useAddressController() {
   const { add: _add, getByUserId: _getByUserId } = useAddressRepo();
   async function add(req, res, next) {
     const value = req.body;
-    const validation = import_joi13.default.object({
-      type: import_joi13.default.string().required(),
-      user: import_joi13.default.string().hex().optional().allow("", null),
-      org: import_joi13.default.string().hex().optional().allow("", null),
-      country: import_joi13.default.string().required(),
-      address: import_joi13.default.string().required(),
-      continuedAddress: import_joi13.default.string().optional().allow("", null),
-      city: import_joi13.default.string().required(),
-      province: import_joi13.default.string().required(),
-      postalCode: import_joi13.default.string().required(),
-      taxId: import_joi13.default.string().optional().allow("", null)
+    const validation = import_joi14.default.object({
+      type: import_joi14.default.string().required(),
+      user: import_joi14.default.string().hex().optional().allow("", null),
+      org: import_joi14.default.string().hex().optional().allow("", null),
+      country: import_joi14.default.string().required(),
+      address: import_joi14.default.string().required(),
+      continuedAddress: import_joi14.default.string().optional().allow("", null),
+      city: import_joi14.default.string().required(),
+      province: import_joi14.default.string().required(),
+      postalCode: import_joi14.default.string().required(),
+      taxId: import_joi14.default.string().optional().allow("", null)
     });
     const { error } = validation.validate(value);
     if (error) {
@@ -20016,7 +20031,7 @@ function useAddressController() {
   }
   async function getByUserId(req, res, next) {
     const user = req.params.user;
-    const validation = import_joi13.default.string().hex().required();
+    const validation = import_joi14.default.string().hex().required();
     const { error } = validation.validate(user);
     if (error) {
       next(new import_utils65.BadRequestError(error.message));
@@ -20047,19 +20062,19 @@ var import_utils67 = require("@goweekdays/utils");
 
 // src/models/member.model.ts
 var import_utils66 = require("@goweekdays/utils");
-var import_joi14 = __toESM(require("joi"));
+var import_joi15 = __toESM(require("joi"));
 var import_mongodb27 = require("mongodb");
 function MMember(value) {
-  const schema = import_joi14.default.object({
-    _id: import_joi14.default.string().hex().optional().allow("", null),
-    org: import_joi14.default.string().hex().required(),
-    name: import_joi14.default.string().required(),
-    user: import_joi14.default.string().hex().required(),
-    role: import_joi14.default.string().hex().required(),
-    status: import_joi14.default.string().optional().allow("", null),
-    createdAt: import_joi14.default.string().optional().allow("", null),
-    updatedAt: import_joi14.default.string().optional().allow("", null),
-    deletedAt: import_joi14.default.string().optional().allow("", null)
+  const schema = import_joi15.default.object({
+    _id: import_joi15.default.string().hex().optional().allow("", null),
+    org: import_joi15.default.string().hex().required(),
+    name: import_joi15.default.string().required(),
+    user: import_joi15.default.string().hex().required(),
+    role: import_joi15.default.string().hex().required(),
+    status: import_joi15.default.string().optional().allow("", null),
+    createdAt: import_joi15.default.string().optional().allow("", null),
+    updatedAt: import_joi15.default.string().optional().allow("", null),
+    deletedAt: import_joi15.default.string().optional().allow("", null)
   });
   const { error } = schema.validate(value);
   if (error) {
@@ -20314,19 +20329,19 @@ function useOrgService() {
 
 // src/controllers/organization.controller.ts
 var import_utils69 = require("@goweekdays/utils");
-var import_joi15 = __toESM(require("joi"));
+var import_joi16 = __toESM(require("joi"));
 function useOrgController() {
   const { createOrg: _createOrg } = useOrgService();
   const { getOrgsByUserId: _getOrgsByUserId } = useMemberRepo();
   async function createOrg(req, res, next) {
     const value = req.body;
-    const validation = import_joi15.default.object({
-      name: import_joi15.default.string().required(),
-      type: import_joi15.default.string().required(),
-      email: import_joi15.default.string().email().required(),
-      contact: import_joi15.default.string().required(),
-      description: import_joi15.default.string().required(),
-      user: import_joi15.default.string().hex().required()
+    const validation = import_joi16.default.object({
+      name: import_joi16.default.string().required(),
+      type: import_joi16.default.string().required(),
+      email: import_joi16.default.string().email().required(),
+      contact: import_joi16.default.string().required(),
+      description: import_joi16.default.string().required(),
+      user: import_joi16.default.string().hex().required()
     });
     const { error } = validation.validate(value);
     if (error) {
@@ -20346,11 +20361,11 @@ function useOrgController() {
     const limit = Number(req.query.limit) ?? 10;
     const search = req.query.search ?? "";
     const user = req.headers["user"];
-    const validation = import_joi15.default.object({
-      user: import_joi15.default.string().hex().required(),
-      page: import_joi15.default.number().min(1).optional().allow("", null),
-      limit: import_joi15.default.number().min(1).optional().allow("", null),
-      search: import_joi15.default.string().optional().allow("", null)
+    const validation = import_joi16.default.object({
+      user: import_joi16.default.string().hex().required(),
+      page: import_joi16.default.number().min(1).optional().allow("", null),
+      limit: import_joi16.default.number().min(1).optional().allow("", null),
+      search: import_joi16.default.string().optional().allow("", null)
     });
     const { error } = validation.validate({ user, page, limit, search });
     if (error) {