@goweekdays/core 2.10.1 → 2.10.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @goweekdays/core
 
+## 2.10.2
+
+### Patch Changes
+
+- 4902c2a: Fix organization, no subscription by default
+
 ## 2.10.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -398,6 +398,7 @@ declare function useOrgRepo(): {
     getByEmail: (email: string) => Promise<TOrg | null>;
     updateById: (_id: string | ObjectId, options: Pick<TOrg, "name" | "description" | "email" | "contact">) => Promise<void>;
     updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<string>;
+    companySearch: (name: string) => Promise<bson.Document[]>;
 };
 
 declare function useOrgService(): {
@@ -417,6 +418,7 @@ declare function useOrgController(): {
     getAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    companySearch: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TPromo = {
@@ -765,9 +767,7 @@ declare function useVerificationService(): {
     }) => Promise<bson.ObjectId>;
     cancelInviteMember: (id: string) => Promise<string>;
     forgetPassword: (email: string) => Promise<string>;
-    orgSetupFee: (value: TOrg & {
-        seats: number;
-    }) => Promise<{
+    orgSetupFee: (value: TOrg) => Promise<{
         paypalOrderLink: any;
     }>;
 };
@@ -1077,6 +1077,8 @@ type TJobPost = {
     _id?: ObjectId;
     org: ObjectId | string;
     orgName?: string;
+    company: ObjectId;
+    companyName?: string;
     title: string;
     setup: string;
     location: string;

package/dist/index.js

@@ -4446,8 +4446,7 @@ var schemaOrg = import_joi15.default.object({
 });
 var schemaOrgAdd = import_joi15.default.object({
   ...schema,
-  createdBy: import_joi15.default.string().hex().required(),
-  seats: import_joi15.default.number().required()
+  createdBy: import_joi15.default.string().hex().required()
 });
 var schemaOrgUpdate = import_joi15.default.object({
   ...schema,
@@ -4808,6 +4807,50 @@ function useOrgRepo() {
       throw new import_utils22.InternalServerError("Failed to update organization status.");
     }
   }
+  async function companySearch(name) {
+    const { error } = import_joi16.default.string().trim().min(2).required().validate(name);
+    if (error) {
+      throw new import_utils22.BadRequestError(error.message);
+    }
+    try {
+      const cacheKey = (0, import_utils22.makeCacheKey)(namespace_collection, {
+        name,
+        tag: "companySearch"
+      });
+      const cached = await getCache(
+        cacheKey
+      );
+      if (cached) {
+        import_utils22.logger.log({
+          level: "info",
+          message: `Cache hit for companySearch: ${cacheKey}`
+        });
+        return cached;
+      }
+      const results = await collection.aggregate([
+        { $match: { $text: { $search: name }, status: "active" } },
+        { $limit: 100 },
+        { $project: { value: "$_id", title: "$name" } }
+      ]).toArray();
+      setCache(cacheKey, results, 300).then(() => {
+        import_utils22.logger.log({
+          level: "info",
+          message: `Cache set for companySearch: ${cacheKey}`
+        });
+      }).catch((err) => {
+        import_utils22.logger.log({
+          level: "error",
+          message: `Failed to set cache for companySearch: ${err.message}`
+        });
+      });
+      return results;
+    } catch (error2) {
+      if (error2 instanceof import_utils22.AppError) {
+        throw error2;
+      }
+      throw new import_utils22.InternalServerError("Failed to search companies.");
+    }
+  }
   return {
     createIndexes,
     add,
@@ -4818,7 +4861,8 @@ function useOrgRepo() {
     getByName,
     getByEmail,
     updateById,
-    updateStatusById
+    updateStatusById,
+    companySearch
   };
 }
 
@@ -7807,6 +7851,12 @@ function useSubscriptionController() {
     }
     try {
       const data = await _getByOrg(value.org);
+      if (!data) {
+        next(
+          new import_utils41.BadRequestError("Subscription not found for this organization")
+        );
+        return;
+      }
       res.json(data);
       return;
     } catch (error2) {
@@ -8279,9 +8329,6 @@ function useOrgService() {
       if (!verification.metadata?.orgName) {
         throw new import_utils44.BadRequestError("Organization name is required.");
       }
-      if (!verification.metadata?.seats) {
-        throw new import_utils44.BadRequestError("Number of seats is required.");
-      }
       if (!verification.metadata?.createdBy) {
         throw new import_utils44.BadRequestError("CreatedBy is required.");
       }
@@ -8306,19 +8353,6 @@ function useOrgService() {
       const currentDate = /* @__PURE__ */ new Date();
       const nextBillingDate = new Date(currentDate);
       nextBillingDate.setMonth(currentDate.getMonth() + 1);
-      const amount = plan.price * verification.metadata.seats;
-      await addSubscription(
-        {
-          amount,
-          org: String(org),
-          seats: verification.metadata.seats,
-          paidSeats: verification.metadata.seats,
-          currency: plan.currency,
-          billingCycle: plan.billingCycle,
-          nextBillingDate
-        },
-        session
-      );
       const createdBy = String(verification.metadata.createdBy);
       const user = await getUserById(createdBy);
       if (!user) {
@@ -8418,7 +8452,8 @@ function useOrgController() {
     getByName: _getByName,
     getAll: getAllOrg,
     getById: _getById,
-    updateById: _updateById
+    updateById: _updateById,
+    companySearch: _companySearch
   } = useOrgRepo();
   async function add(req, res, next) {
     const value = req.body;
@@ -8559,13 +8594,29 @@ function useOrgController() {
       next(error2);
     }
   }
+  async function companySearch(req, res, next) {
+    const search = req.query.search ?? "";
+    const { error } = import_joi37.default.string().min(1).required().validate(search);
+    if (error) {
+      next(new import_utils45.BadRequestError(`${error.message} - controller`));
+      return;
+    }
+    try {
+      const companies = await _companySearch(search);
+      res.json(companies);
+      return;
+    } catch (error2) {
+      next(error2);
+    }
+  }
   return {
     add,
     getOrgsByUserId,
     getByName,
     getAll,
     getById,
-    updateById
+    updateById,
+    companySearch
   };
 }
 
@@ -9492,6 +9543,7 @@ function useVerificationService() {
       throw error;
     }
   }
+  const { getByOrg } = useSubscriptionRepo();
   async function inviteMember(value) {
     const { error } = schemaInviteMember.validate(value);
     if (error) {
@@ -9507,6 +9559,12 @@ function useVerificationService() {
       if (!org) {
         throw new import_utils48.NotFoundError("Organization not found.");
       }
+      const subscription = await getByOrg(String(value.org));
+      if (!subscription) {
+        throw new import_utils48.BadRequestError(
+          "Organization does not have an active subscription."
+        );
+      }
     }
     let verificationData = {
       type: "user-invite",
@@ -9673,7 +9731,6 @@ function useVerificationService() {
           type: "org-setup-fee",
           email: value.email,
           metadata: {
-            seats: value.seats,
             contact: value.contact,
             orgName: value.name,
             createdBy: value.createdBy,
@@ -11902,6 +11959,10 @@ function usePromoController() {
     }
     try {
       const promo = await _getByCode(code);
+      if (!promo) {
+        next(new import_utils65.BadRequestError("Invalid promo code, promo code not found."));
+        return;
+      }
       res.json(promo);
       return;
     } catch (error2) {
@@ -11981,6 +12042,8 @@ var schemaJobPost = import_joi50.default.object({
   _id: import_joi50.default.string().hex().optional(),
   org: import_joi50.default.string().hex().required(),
   orgName: import_joi50.default.string().optional().allow("", null),
+  company: import_joi50.default.string().hex().required(),
+  companyName: import_joi50.default.string().optional().allow("", null),
   title: import_joi50.default.string().trim().required(),
   setup: import_joi50.default.string().trim().required(),
   location: import_joi50.default.string().trim().required(),
@@ -11997,6 +12060,8 @@ var schemaJobPost = import_joi50.default.object({
 });
 var schemaJobPostUpdate = import_joi50.default.object({
   _id: import_joi50.default.string().hex().required(),
+  company: import_joi50.default.string().hex().required(),
+  companyName: import_joi50.default.string().optional().allow("", null),
   title: import_joi50.default.string().trim().required(),
   setup: import_joi50.default.string().trim().required(),
   location: import_joi50.default.string().trim().required(),
@@ -12024,10 +12089,17 @@ function modelJobPost(value) {
   } catch (error2) {
     throw new import_utils66.BadRequestError("Invalid Org ID");
   }
+  try {
+    value.company = new import_mongodb29.ObjectId(value.company);
+  } catch (error2) {
+    throw new import_utils66.BadRequestError("Invalid Company ID");
+  }
   return {
     _id: value._id,
     org: value.org,
     orgName: value.orgName ?? "",
+    company: value.company,
+    companyName: value.companyName ?? "",
     title: value.title,
     setup: value.setup,
     location: value.location,