@timardex/cluemart-server-shared 1.1.21 → 1.1.24

package/dist/service/index.d.mts

@@ -1,10 +1,11 @@
 import * as mongoose from 'mongoose';
 import * as _timardex_cluemart_shared from '@timardex/cluemart-shared';
-import { PromoCodeType, UserLicenceType, UserType, EnumAffiliateRewardType, EnumUserLicence, DateTimeType, EventListItemType, DateTimeWithPriceType } from '@timardex/cluemart-shared';
+import { PromoCodeType, EnumAffiliateRewardType, EnumUserLicence, DateTimeType, EventListItemType, DateTimeWithPriceType } from '@timardex/cluemart-shared';
 import { n as SchemaAffiliateResourceType, S as SchemaOwnerType, i as SchemaRelationType } from '../Affiliate-B76iZ3fE.mjs';
-import { G as GraphQLContext, O as ObjectId, f as SchemaCreateBulkNotificationInput } from '../Chat-Wn7yfc3v.mjs';
+import { O as ObjectId, G as GraphQLContext, f as SchemaCreateBulkNotificationInput } from '../Chat-Wn7yfc3v.mjs';
 import dayjs from 'dayjs';
 import { DateTimeType as DateTimeType$1 } from '@timardex/cluemart-shared/types';
+import { EnumUserLicence as EnumUserLicence$1 } from '@timardex/cluemart-shared/enums';
 import 'express';
 
 /**
@@ -82,7 +83,7 @@ declare function normalizeAffiliatePromoCodes(promoCodes: PromoCodeType[] | null
  * otherwise falls back to the Standard subscription reward.
  * Returns `null` when no non-expired vendor licence applies.
  */
-declare function mapVendorLicenceToSubscriptionRewardType(licences: UserLicenceType[] | null | undefined, now?: Date, stripe?: UserType["stripe"] | null): EnumAffiliateRewardType | null;
+declare function mapVendorLicenceToSubscriptionRewardType(userId: ObjectId | string, now?: Date): Promise<EnumAffiliateRewardType | null>;
 /** Inclusive start / exclusive end of the UTC calendar month containing `now`. */
 declare function getSubscriptionRewardPeriodBounds(now?: Date): {
     periodEnd: Date;
@@ -190,4 +191,25 @@ declare function didRemoveAnyEventDates(previousDateTime: EventDateSlot[] | unde
  */
 declare function updateRelationDatesToUnavailable(relationDates: SchemaRelationType["relationDates"], eventDateTime: DateTimeWithPriceType[] | undefined): SchemaRelationType["relationDates"];
 
-export { ACTIVE_NOT_DELETED_FILTER, type AwardAffiliateVendorSubscriptionRewardsResult, type NotificationPubSub, activeAffiliateCodeExists, awardAffiliateVendorSubscriptionRewards, connectToDatabase, convertObjectIdsToStrings, didRemoveAnyEventDates, findAffiliateByPromoCode, findEventOrImportedMarketById, getSubscriptionRewardPeriodBounds, isValidObjectId, mapVendorLicenceToSubscriptionRewardType, normalizeAffiliatePromoCodes, normalizePromoCode, notifyUsers, publishNotificationEvents, saveNotificationsInDb, sendPushNotifications, updateAdStatuses, updateAllEventDateTimeStatuses, updateRelationDatesToUnavailable, updateSingleDateTimeStatus, updateVendorBasedOnUserLicense };
+type PayingStripeSubscriptionPlanResult = {
+    hasSubscription: boolean;
+    plan: EnumUserLicence$1 | null;
+    validTypes: Set<EnumUserLicence$1>;
+};
+/**
+ * Returns the paying Stripe plan when `currentPlan` is any PRO plan
+ * (event or vendor) and the subscription is active/trialing.
+ */
+declare function getPayingStripeSubscriptionPlan(userId: ObjectId | string, now?: Date): Promise<PayingStripeSubscriptionPlanResult>;
+/**
+ * Like {@link getPayingStripeSubscriptionPlan} but only treats a vendor PRO
+ * plan (`PRO_VENDOR` / `PRO_PLUS_VENDOR`) as paying.
+ */
+declare function getPayingVendorStripeSubscriptionPlan(userId: ObjectId | string, now?: Date): Promise<PayingStripeSubscriptionPlanResult>;
+/**
+ * Like {@link getPayingStripeSubscriptionPlan} but only treats an event PRO
+ * plan (`PRO_EVENT` / `PRO_PLUS_EVENT`) as paying.
+ */
+declare function getPayingEventStripeSubscriptionPlan(userId: ObjectId | string, now?: Date): Promise<PayingStripeSubscriptionPlanResult>;
+
+export { ACTIVE_NOT_DELETED_FILTER, type AwardAffiliateVendorSubscriptionRewardsResult, type NotificationPubSub, activeAffiliateCodeExists, awardAffiliateVendorSubscriptionRewards, connectToDatabase, convertObjectIdsToStrings, didRemoveAnyEventDates, findAffiliateByPromoCode, findEventOrImportedMarketById, getPayingEventStripeSubscriptionPlan, getPayingStripeSubscriptionPlan, getPayingVendorStripeSubscriptionPlan, getSubscriptionRewardPeriodBounds, isValidObjectId, mapVendorLicenceToSubscriptionRewardType, normalizeAffiliatePromoCodes, normalizePromoCode, notifyUsers, publishNotificationEvents, saveNotificationsInDb, sendPushNotifications, updateAdStatuses, updateAllEventDateTimeStatuses, updateRelationDatesToUnavailable, updateSingleDateTimeStatus, updateVendorBasedOnUserLicense };

package/dist/service/index.d.ts

@@ -1,10 +1,11 @@
 import * as mongoose from 'mongoose';
 import * as _timardex_cluemart_shared from '@timardex/cluemart-shared';
-import { PromoCodeType, UserLicenceType, UserType, EnumAffiliateRewardType, EnumUserLicence, DateTimeType, EventListItemType, DateTimeWithPriceType } from '@timardex/cluemart-shared';
+import { PromoCodeType, EnumAffiliateRewardType, EnumUserLicence, DateTimeType, EventListItemType, DateTimeWithPriceType } from '@timardex/cluemart-shared';
 import { n as SchemaAffiliateResourceType, S as SchemaOwnerType, i as SchemaRelationType } from '../Affiliate-gqV1-654.js';
-import { G as GraphQLContext, O as ObjectId, f as SchemaCreateBulkNotificationInput } from '../Chat-Wn7yfc3v.js';
+import { O as ObjectId, G as GraphQLContext, f as SchemaCreateBulkNotificationInput } from '../Chat-Wn7yfc3v.js';
 import dayjs from 'dayjs';
 import { DateTimeType as DateTimeType$1 } from '@timardex/cluemart-shared/types';
+import { EnumUserLicence as EnumUserLicence$1 } from '@timardex/cluemart-shared/enums';
 import 'express';
 
 /**
@@ -82,7 +83,7 @@ declare function normalizeAffiliatePromoCodes(promoCodes: PromoCodeType[] | null
  * otherwise falls back to the Standard subscription reward.
  * Returns `null` when no non-expired vendor licence applies.
  */
-declare function mapVendorLicenceToSubscriptionRewardType(licences: UserLicenceType[] | null | undefined, now?: Date, stripe?: UserType["stripe"] | null): EnumAffiliateRewardType | null;
+declare function mapVendorLicenceToSubscriptionRewardType(userId: ObjectId | string, now?: Date): Promise<EnumAffiliateRewardType | null>;
 /** Inclusive start / exclusive end of the UTC calendar month containing `now`. */
 declare function getSubscriptionRewardPeriodBounds(now?: Date): {
     periodEnd: Date;
@@ -190,4 +191,25 @@ declare function didRemoveAnyEventDates(previousDateTime: EventDateSlot[] | unde
  */
 declare function updateRelationDatesToUnavailable(relationDates: SchemaRelationType["relationDates"], eventDateTime: DateTimeWithPriceType[] | undefined): SchemaRelationType["relationDates"];
 
-export { ACTIVE_NOT_DELETED_FILTER, type AwardAffiliateVendorSubscriptionRewardsResult, type NotificationPubSub, activeAffiliateCodeExists, awardAffiliateVendorSubscriptionRewards, connectToDatabase, convertObjectIdsToStrings, didRemoveAnyEventDates, findAffiliateByPromoCode, findEventOrImportedMarketById, getSubscriptionRewardPeriodBounds, isValidObjectId, mapVendorLicenceToSubscriptionRewardType, normalizeAffiliatePromoCodes, normalizePromoCode, notifyUsers, publishNotificationEvents, saveNotificationsInDb, sendPushNotifications, updateAdStatuses, updateAllEventDateTimeStatuses, updateRelationDatesToUnavailable, updateSingleDateTimeStatus, updateVendorBasedOnUserLicense };
+type PayingStripeSubscriptionPlanResult = {
+    hasSubscription: boolean;
+    plan: EnumUserLicence$1 | null;
+    validTypes: Set<EnumUserLicence$1>;
+};
+/**
+ * Returns the paying Stripe plan when `currentPlan` is any PRO plan
+ * (event or vendor) and the subscription is active/trialing.
+ */
+declare function getPayingStripeSubscriptionPlan(userId: ObjectId | string, now?: Date): Promise<PayingStripeSubscriptionPlanResult>;
+/**
+ * Like {@link getPayingStripeSubscriptionPlan} but only treats a vendor PRO
+ * plan (`PRO_VENDOR` / `PRO_PLUS_VENDOR`) as paying.
+ */
+declare function getPayingVendorStripeSubscriptionPlan(userId: ObjectId | string, now?: Date): Promise<PayingStripeSubscriptionPlanResult>;
+/**
+ * Like {@link getPayingStripeSubscriptionPlan} but only treats an event PRO
+ * plan (`PRO_EVENT` / `PRO_PLUS_EVENT`) as paying.
+ */
+declare function getPayingEventStripeSubscriptionPlan(userId: ObjectId | string, now?: Date): Promise<PayingStripeSubscriptionPlanResult>;
+
+export { ACTIVE_NOT_DELETED_FILTER, type AwardAffiliateVendorSubscriptionRewardsResult, type NotificationPubSub, activeAffiliateCodeExists, awardAffiliateVendorSubscriptionRewards, connectToDatabase, convertObjectIdsToStrings, didRemoveAnyEventDates, findAffiliateByPromoCode, findEventOrImportedMarketById, getPayingEventStripeSubscriptionPlan, getPayingStripeSubscriptionPlan, getPayingVendorStripeSubscriptionPlan, getSubscriptionRewardPeriodBounds, isValidObjectId, mapVendorLicenceToSubscriptionRewardType, normalizeAffiliatePromoCodes, normalizePromoCode, notifyUsers, publishNotificationEvents, saveNotificationsInDb, sendPushNotifications, updateAdStatuses, updateAllEventDateTimeStatuses, updateRelationDatesToUnavailable, updateSingleDateTimeStatus, updateVendorBasedOnUserLicense };

package/dist/service/index.mjs

@@ -14,6 +14,7 @@ import {
   EnumResourceType,
   EnumSubscriptionStatus,
   EnumUserLicence,
+  EnumUserLicence2,
   EventModel,
   GoogleImportedMarketModel,
   NotificationModel,
@@ -22,7 +23,7 @@ import {
   VendorModel,
   dateFormat,
   timeFormat
-} from "../chunk-3JRVRK2N.mjs";
+} from "../chunk-YILYRHDN.mjs";
 import "../chunk-6PNG5BI5.mjs";
 
 // src/service/promoCode/constants.ts
@@ -95,7 +96,7 @@ var SHARE_RESOURCE_LABEL = {
   school: "School"
 };
 
-// node_modules/@timardex/cluemart-shared/dist/chunk-Q3X2EHHF.mjs
+// node_modules/@timardex/cluemart-shared/dist/chunk-5D2JVHC2.mjs
 var PROMO_CODE_PREFIX = "CM-";
 var OBJECT_ID_PATH_SEGMENT = "[a-f0-9]{24}";
 var OBJECT_ID_PATH_SEGMENT_END = `${OBJECT_ID_PATH_SEGMENT}$`;
@@ -103,17 +104,17 @@ var gameScreenIdentifierList = [
   {
     clue: "Where your actions turn into a timeline.",
     id: "activities",
-    match: "/profile/activities"
+    match: "/profile/account/favourites"
   },
   {
     clue: "Where conversations happen without speaking.",
     id: "chat",
-    match: "/profile/chat"
+    match: "/chat"
   },
   {
     clue: "The place to redefine who you are.",
     id: "edit-profile",
-    match: "/profile/edit-profile"
+    match: "/profile/account"
   },
   {
     clue: "A single moment worth showing up for.",
@@ -197,7 +198,7 @@ var gameScreenIdentifierList = [
   }
 ];
 
-// node_modules/@timardex/cluemart-shared/dist/chunk-UGWEWOUM.mjs
+// node_modules/@timardex/cluemart-shared/dist/chunk-P4JLZCWZ.mjs
 import dayjs2 from "dayjs";
 var statusOptions = [
   ...Object.values(EnumInviteStatus2).map((status) => ({
@@ -1374,19 +1375,56 @@ async function sendPushNotifications({
   }
 }
 
-// src/service/affiliate/vendorSubscriptionRewards.ts
-function isPayingStripeSubscription(stripe) {
-  if (!stripe?.subscriptionId) return false;
-  return (stripe.status === EnumSubscriptionStatus.ACTIVE || stripe.status === EnumSubscriptionStatus.TRIALING) && (stripe.currentPlan === EnumUserLicence.PRO_VENDOR || stripe.currentPlan === EnumUserLicence.PRO_PLUS_VENDOR);
-}
-function mapVendorLicenceToSubscriptionRewardType(licences, now = /* @__PURE__ */ new Date(), stripe) {
+// src/service/license.ts
+var PRO_EVENT_PLANS = /* @__PURE__ */ new Set([
+  EnumUserLicence2.PRO_EVENT,
+  EnumUserLicence2.PRO_PLUS_EVENT
+]);
+var PRO_VENDOR_PLANS = /* @__PURE__ */ new Set([
+  EnumUserLicence2.PRO_VENDOR,
+  EnumUserLicence2.PRO_PLUS_VENDOR
+]);
+var PRO_PLANS = /* @__PURE__ */ new Set([
+  ...PRO_EVENT_PLANS,
+  ...PRO_VENDOR_PLANS
+]);
+async function getPayingStripePlanFor(userId, now, payingPlans) {
+  const user = await UserModel.findById(userId).select("licences stripe").lean().exec();
+  if (!user) {
+    return { hasSubscription: false, plan: null, validTypes: /* @__PURE__ */ new Set() };
+  }
+  const stripe = user.stripe;
+  const licences = user.licences ?? [];
   const validTypes = new Set(
-    (licences ?? []).filter(
+    licences.filter(
       (licence) => new Date(licence.expiryDate).getTime() > now.getTime()
     ).map((licence) => licence.licenceType)
   );
+  if (stripe == null || stripe.subscriptionId == null) {
+    return { hasSubscription: false, plan: null, validTypes };
+  }
+  const hasActiveStatus = stripe.status === EnumSubscriptionStatus.ACTIVE || stripe.status === EnumSubscriptionStatus.TRIALING;
+  if (!hasActiveStatus || stripe.currentPlan == null) {
+    return { hasSubscription: false, plan: null, validTypes };
+  }
+  const plan = payingPlans.has(stripe.currentPlan) ? stripe.currentPlan : null;
+  return { hasSubscription: plan != null, plan, validTypes };
+}
+async function getPayingStripeSubscriptionPlan(userId, now = /* @__PURE__ */ new Date()) {
+  return getPayingStripePlanFor(userId, now, PRO_PLANS);
+}
+async function getPayingVendorStripeSubscriptionPlan(userId, now = /* @__PURE__ */ new Date()) {
+  return getPayingStripePlanFor(userId, now, PRO_VENDOR_PLANS);
+}
+async function getPayingEventStripeSubscriptionPlan(userId, now = /* @__PURE__ */ new Date()) {
+  return getPayingStripePlanFor(userId, now, PRO_EVENT_PLANS);
+}
+
+// src/service/affiliate/vendorSubscriptionRewards.ts
+async function mapVendorLicenceToSubscriptionRewardType(userId, now = /* @__PURE__ */ new Date()) {
+  const { hasSubscription, validTypes } = await getPayingVendorStripeSubscriptionPlan(userId, now);
   if (validTypes.has(EnumUserLicence.PRO_VENDOR) || validTypes.has(EnumUserLicence.PRO_PLUS_VENDOR)) {
-    if (isPayingStripeSubscription(stripe)) {
+    if (hasSubscription) {
       return EnumAffiliateRewardType.ACTIVE_VENDOR_PRO_SUBSCRIPTION;
     }
     return EnumAffiliateRewardType.ACTIVE_VENDOR_STANDARD_SUBSCRIPTION;
@@ -1434,14 +1472,6 @@ async function isEligibleReferredVendor({
   }).exec();
   return Boolean(match);
 }
-async function resolveSubscriptionRewardTypeForVendorOwner(vendorOwnerUserId, now) {
-  const vendorOwner = await UserModel.findById(vendorOwnerUserId).select("licences stripe").lean().exec();
-  return mapVendorLicenceToSubscriptionRewardType(
-    vendorOwner?.licences,
-    now,
-    vendorOwner?.stripe
-  );
-}
 async function notifyAffiliateOwnerOfSubscriptionReward({
   affiliateId,
   affiliateOwnerUserId,
@@ -1531,7 +1561,7 @@ async function processAffiliateVendorReferral({
   if (!vendorEligible) {
     return "skipped";
   }
-  const rewardType = await resolveSubscriptionRewardTypeForVendorOwner(
+  const rewardType = await mapVendorLicenceToSubscriptionRewardType(
     resource.resourceOwner.userId,
     now
   );
@@ -1944,6 +1974,9 @@ export {
   didRemoveAnyEventDates,
   findAffiliateByPromoCode,
   findEventOrImportedMarketById,
+  getPayingEventStripeSubscriptionPlan,
+  getPayingStripeSubscriptionPlan,
+  getPayingVendorStripeSubscriptionPlan,
   getSubscriptionRewardPeriodBounds,
   isValidObjectId,
   mapVendorLicenceToSubscriptionRewardType,