@timardex/cluemart-server-shared 1.1.32 → 1.1.34

package/dist/service/index.d.mts

@@ -27,7 +27,7 @@ type AwardAffiliateVendorSubscriptionRewardsResult = {
  * Awards monthly vendor subscription rewards to affiliates with active referred vendors.
  *
  * Eligibility per affiliate resource:
- * - Affiliate is not soft-deleted
+ * - Affiliate is active and not soft-deleted
  * - Linked `affiliateResources` entry is vendor, `resourceActive`, and not deleted
  * - Vendor is active, not deleted, and `owner.userId` matches
  *   `affiliateResources.resourceOwner.userId`
@@ -38,7 +38,8 @@ type AwardAffiliateVendorSubscriptionRewardsResult = {
  * - Pro / Pro+ without paying Stripe → `ACTIVE_VENDOR_STANDARD_SUBSCRIPTION` (1 pt)
  * - Standard → `ACTIVE_VENDOR_STANDARD_SUBSCRIPTION` (1 pt)
  *
- * Idempotent per affiliate + vendor + reward type + calendar month.
+ * Idempotent per affiliate + vendor + calendar month — a mid-month licence
+ * upgrade (Standard → paying Pro) takes effect from the following month.
  * On successful award, notifies the affiliate owner (best-effort).
  *
  * @param now - Reference time for month bounds and licence expiry (defaults to now).
@@ -75,6 +76,8 @@ declare function findAffiliateByPromoCode(promoCode: PromoCodeType): Promise<(mo
  */
 declare function normalizeAffiliatePromoCodes(promoCodes: PromoCodeType[] | null | undefined): PromoCodeType[];
 
+/** Timezone the monthly reward window aligns to (matches the cron scheduler's `tz`). */
+declare const SUBSCRIPTION_REWARD_TIMEZONE = "Pacific/Auckland";
 /**
  * Maps a vendor owner's highest valid vendor licence to a monthly subscription reward.
  *
@@ -84,7 +87,7 @@ declare function normalizeAffiliatePromoCodes(promoCodes: PromoCodeType[] | null
  * Returns `null` when no non-expired vendor licence applies.
  */
 declare function mapVendorLicenceToSubscriptionRewardType(userId: ObjectId | string, now?: Date): Promise<EnumAffiliateRewardType | null>;
-/** Inclusive start / exclusive end of the UTC calendar month containing `now`. */
+/** Inclusive start / exclusive end of the {@link SUBSCRIPTION_REWARD_TIMEZONE} calendar month containing `now`. */
 declare function getSubscriptionRewardPeriodBounds(now?: Date): {
     periodEnd: Date;
     periodStart: Date;
@@ -212,4 +215,4 @@ declare function getPayingVendorStripeSubscriptionPlan(userId: ObjectId | string
  */
 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 };
+export { ACTIVE_NOT_DELETED_FILTER, type AwardAffiliateVendorSubscriptionRewardsResult, type NotificationPubSub, SUBSCRIPTION_REWARD_TIMEZONE, 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

@@ -27,7 +27,7 @@ type AwardAffiliateVendorSubscriptionRewardsResult = {
  * Awards monthly vendor subscription rewards to affiliates with active referred vendors.
  *
  * Eligibility per affiliate resource:
- * - Affiliate is not soft-deleted
+ * - Affiliate is active and not soft-deleted
  * - Linked `affiliateResources` entry is vendor, `resourceActive`, and not deleted
  * - Vendor is active, not deleted, and `owner.userId` matches
  *   `affiliateResources.resourceOwner.userId`
@@ -38,7 +38,8 @@ type AwardAffiliateVendorSubscriptionRewardsResult = {
  * - Pro / Pro+ without paying Stripe → `ACTIVE_VENDOR_STANDARD_SUBSCRIPTION` (1 pt)
  * - Standard → `ACTIVE_VENDOR_STANDARD_SUBSCRIPTION` (1 pt)
  *
- * Idempotent per affiliate + vendor + reward type + calendar month.
+ * Idempotent per affiliate + vendor + calendar month — a mid-month licence
+ * upgrade (Standard → paying Pro) takes effect from the following month.
  * On successful award, notifies the affiliate owner (best-effort).
  *
  * @param now - Reference time for month bounds and licence expiry (defaults to now).
@@ -75,6 +76,8 @@ declare function findAffiliateByPromoCode(promoCode: PromoCodeType): Promise<(mo
  */
 declare function normalizeAffiliatePromoCodes(promoCodes: PromoCodeType[] | null | undefined): PromoCodeType[];
 
+/** Timezone the monthly reward window aligns to (matches the cron scheduler's `tz`). */
+declare const SUBSCRIPTION_REWARD_TIMEZONE = "Pacific/Auckland";
 /**
  * Maps a vendor owner's highest valid vendor licence to a monthly subscription reward.
  *
@@ -84,7 +87,7 @@ declare function normalizeAffiliatePromoCodes(promoCodes: PromoCodeType[] | null
  * Returns `null` when no non-expired vendor licence applies.
  */
 declare function mapVendorLicenceToSubscriptionRewardType(userId: ObjectId | string, now?: Date): Promise<EnumAffiliateRewardType | null>;
-/** Inclusive start / exclusive end of the UTC calendar month containing `now`. */
+/** Inclusive start / exclusive end of the {@link SUBSCRIPTION_REWARD_TIMEZONE} calendar month containing `now`. */
 declare function getSubscriptionRewardPeriodBounds(now?: Date): {
     periodEnd: Date;
     periodStart: Date;
@@ -212,4 +215,4 @@ declare function getPayingVendorStripeSubscriptionPlan(userId: ObjectId | string
  */
 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 };
+export { ACTIVE_NOT_DELETED_FILTER, type AwardAffiliateVendorSubscriptionRewardsResult, type NotificationPubSub, SUBSCRIPTION_REWARD_TIMEZONE, 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

@@ -23,7 +23,7 @@ import {
   VendorModel,
   dateFormat,
   timeFormat
-} from "../chunk-VUTQY6KS.mjs";
+} from "../chunk-UGGLUJIR.mjs";
 import "../chunk-6PNG5BI5.mjs";
 
 // src/service/promoCode/constants.ts
@@ -96,7 +96,7 @@ var SHARE_RESOURCE_LABEL = {
   school: "School"
 };
 
-// node_modules/@timardex/cluemart-shared/dist/chunk-2CIW3WKR.mjs
+// node_modules/@timardex/cluemart-shared/dist/chunk-FGVNX6EN.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}$`;
@@ -208,7 +208,7 @@ var gameScreenIdentifierList = [
   }
 ];
 
-// node_modules/@timardex/cluemart-shared/dist/chunk-A3RIEOQ7.mjs
+// node_modules/@timardex/cluemart-shared/dist/chunk-UPFNTXDX.mjs
 import dayjs2 from "dayjs";
 var statusOptions = [
   ...Object.values(EnumInviteStatus2).map((status) => ({
@@ -1385,6 +1385,11 @@ async function sendPushNotifications({
   }
 }
 
+// src/service/affiliate/vendorSubscriptionRewards.ts
+import dayjs3 from "dayjs";
+import timezone2 from "dayjs/plugin/timezone";
+import utc2 from "dayjs/plugin/utc";
+
 // src/service/license.ts
 var PRO_EVENT_PLANS = /* @__PURE__ */ new Set([
   EnumUserLicence2.PRO_EVENT,
@@ -1431,6 +1436,9 @@ async function getPayingEventStripeSubscriptionPlan(userId, now = /* @__PURE__ *
 }
 
 // src/service/affiliate/vendorSubscriptionRewards.ts
+dayjs3.extend(utc2);
+dayjs3.extend(timezone2);
+var SUBSCRIPTION_REWARD_TIMEZONE = "Pacific/Auckland";
 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)) {
@@ -1445,12 +1453,8 @@ async function mapVendorLicenceToSubscriptionRewardType(userId, now = /* @__PURE
   return null;
 }
 function getSubscriptionRewardPeriodBounds(now = /* @__PURE__ */ new Date()) {
-  const periodStart = new Date(
-    Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1)
-  );
-  const periodEnd = new Date(
-    Date.UTC(now.getUTCFullYear(), now.getUTCMonth() + 1, 1)
-  );
+  const periodStart = dayjs3(now).tz(SUBSCRIPTION_REWARD_TIMEZONE).startOf("month").toDate();
+  const periodEnd = dayjs3(now).tz(SUBSCRIPTION_REWARD_TIMEZONE).startOf("month").add(1, "month").toDate();
   return { periodEnd, periodStart };
 }
 
@@ -1460,6 +1464,7 @@ function isEligibleVendorResource(resource) {
 }
 async function findAffiliatesWithActiveVendorReferrals() {
   return await AffiliateModel.find({
+    active: true,
     affiliateResources: {
       $elemMatch: {
         resourceActive: true,
@@ -1532,8 +1537,7 @@ async function tryAwardSubscriptionReward({
                 createdAt: {
                   $gte: period.periodStart,
                   $lt: period.periodEnd
-                },
-                rewardType
+                }
               }
             }
           }
@@ -1814,11 +1818,11 @@ function convertObjectIdsToStrings(obj) {
 }
 
 // src/service/event/updateAllEventDateTimeStatuses.ts
-import dayjs3 from "dayjs";
+import dayjs4 from "dayjs";
 import customParseFormat2 from "dayjs/plugin/customParseFormat";
 import isoWeek from "dayjs/plugin/isoWeek";
-dayjs3.extend(customParseFormat2);
-dayjs3.extend(isoWeek);
+dayjs4.extend(customParseFormat2);
+dayjs4.extend(isoWeek);
 function getFutureEventStatus(startDateTime, now) {
   const hoursUntilStart = startDateTime.diff(now, "hour", true);
   if (hoursUntilStart > 0 && hoursUntilStart <= 4) {
@@ -1838,14 +1842,14 @@ function getFutureEventStatus(startDateTime, now) {
   }
   return EnumEventDateStatus.UPCOMING;
 }
-function updateSingleDateTimeStatus(dateTime, now = dayjs3()) {
+function updateSingleDateTimeStatus(dateTime, now = dayjs4()) {
   const dateTimeFormat = `${dateFormat} ${timeFormat}`;
-  const startDateTime = dayjs3(
+  const startDateTime = dayjs4(
     `${dateTime.startDate} ${dateTime.startTime}`,
     dateTimeFormat,
     true
   );
-  const endDateTime = dayjs3(
+  const endDateTime = dayjs4(
     `${dateTime.endDate} ${dateTime.endTime}`,
     dateTimeFormat,
     true
@@ -1927,7 +1931,7 @@ async function updateModelDateTimeStatuses(model, now) {
   return updated;
 }
 async function updateAllEventDateTimeStatuses() {
-  const now = dayjs3();
+  const now = dayjs4();
   const [eventCount, marketCount] = await Promise.all([
     updateModelDateTimeStatuses(EventModel, now),
     updateModelDateTimeStatuses(
@@ -1977,6 +1981,7 @@ function updateRelationDatesToUnavailable(relationDates, eventDateTime) {
 }
 export {
   ACTIVE_NOT_DELETED_FILTER,
+  SUBSCRIPTION_REWARD_TIMEZONE,
   activeAffiliateCodeExists,
   awardAffiliateVendorSubscriptionRewards,
   connectToDatabase,