@timardex/cluemart-server-shared 1.1.33 → 1.1.34

package/dist/index.d.mts

@@ -802,7 +802,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`
@@ -813,7 +813,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).
@@ -850,6 +851,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.
  *
@@ -859,7 +862,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;
@@ -987,4 +990,4 @@ declare function getPayingVendorStripeSubscriptionPlan(userId: ObjectId | string
  */
 declare function getPayingEventStripeSubscriptionPlan(userId: ObjectId | string, now?: Date): Promise<PayingStripeSubscriptionPlanResult>;
 
-export { ACTIVE_NOT_DELETED_FILTER, APP_SETTINGS_ID, AdModel, AffiliateModel, AppSettingModel, type AuthUser, type AwardAffiliateVendorSubscriptionRewardsResult, CategorySchema, ChatModel, ChatReportModel, ContactDetailsSchema, type CouponDocument, CouponModel, EnumPubSubEvents, EventInfoModel, EventModel, GameModel, GoogleImportedMarketModel, type GraphQLContext, NotificationModel, type NotificationPubSub, type ObjectId, OwnerTypeSchema, PartnerModel, PostModel, PushTokenModel, RelationModel, RelationTypeSchema, ResourceActivityModel, ResourceImageTypeSchema, type SchemaAffiliateResourceType, type SchemaAffiliateReward, type SchemaChatMessageReactionType, type SchemaChatMessageReplyPreviewType, type SchemaChatMessageSeenType, type SchemaChatMessageType, type SchemaChatReportType, type SchemaChatType, type SchemaCreateBulkNotificationInput, type SchemaEventInfoType, type SchemaEventType, type SchemaGameType, type SchemaGoogleImportedMarket, type SchemaNotificationType, type SchemaOwnerType, type SchemaParticipantType, type SchemaPartnerType, type SchemaPostType, type SchemaPushTokenType, type SchemaRelatedPostType, type SchemaRelationType, type SchemaUnregisteredVendorInvitationType, type SchemaUnregisteredVendorType, type SchemaUserActivityEvent, type SchemaUserType, type SchemaVendorInfoType, type SchemaVendorType, SchoolModel, SocialMediaTypeSchema, StallTypeSchema, type SubscriptionPayload, UnregisteredVendorModel, UserModel, VendorInfoModel, VendorModel, VerificationTokenModel, type VerificationTokenType, activeAffiliateCodeExists, awardAffiliateVendorSubscriptionRewards, baseResourceFields, connectToDatabase, convertObjectIdsToStrings, dateTimeSchema, didRemoveAnyEventDates, findAffiliateByPromoCode, findEventOrImportedMarketById, getPayingEventStripeSubscriptionPlan, getPayingStripeSubscriptionPlan, getPayingVendorStripeSubscriptionPlan, getSubscriptionRewardPeriodBounds, isValidObjectId, locationGeoSchema, locationsSchema, mapVendorLicenceToSubscriptionRewardType, normalizeAffiliatePromoCodes, normalizePromoCode, notifyUsers, publishNotificationEvents, refundPolicySchema, relatedPostSchema, relationDatesSchema, resourceRelationsSchema, saveNotificationsInDb, sendPushNotifications, socialShareResourceSchema, termsAgreementSchema, updateAdStatuses, updateAllEventDateTimeStatuses, updateRelationDatesToUnavailable, updateSingleDateTimeStatus, updateVendorBasedOnUserLicense, userLicenseSchema, vendorProductTypeSchema };
+export { ACTIVE_NOT_DELETED_FILTER, APP_SETTINGS_ID, AdModel, AffiliateModel, AppSettingModel, type AuthUser, type AwardAffiliateVendorSubscriptionRewardsResult, CategorySchema, ChatModel, ChatReportModel, ContactDetailsSchema, type CouponDocument, CouponModel, EnumPubSubEvents, EventInfoModel, EventModel, GameModel, GoogleImportedMarketModel, type GraphQLContext, NotificationModel, type NotificationPubSub, type ObjectId, OwnerTypeSchema, PartnerModel, PostModel, PushTokenModel, RelationModel, RelationTypeSchema, ResourceActivityModel, ResourceImageTypeSchema, SUBSCRIPTION_REWARD_TIMEZONE, type SchemaAffiliateResourceType, type SchemaAffiliateReward, type SchemaChatMessageReactionType, type SchemaChatMessageReplyPreviewType, type SchemaChatMessageSeenType, type SchemaChatMessageType, type SchemaChatReportType, type SchemaChatType, type SchemaCreateBulkNotificationInput, type SchemaEventInfoType, type SchemaEventType, type SchemaGameType, type SchemaGoogleImportedMarket, type SchemaNotificationType, type SchemaOwnerType, type SchemaParticipantType, type SchemaPartnerType, type SchemaPostType, type SchemaPushTokenType, type SchemaRelatedPostType, type SchemaRelationType, type SchemaUnregisteredVendorInvitationType, type SchemaUnregisteredVendorType, type SchemaUserActivityEvent, type SchemaUserType, type SchemaVendorInfoType, type SchemaVendorType, SchoolModel, SocialMediaTypeSchema, StallTypeSchema, type SubscriptionPayload, UnregisteredVendorModel, UserModel, VendorInfoModel, VendorModel, VerificationTokenModel, type VerificationTokenType, activeAffiliateCodeExists, awardAffiliateVendorSubscriptionRewards, baseResourceFields, connectToDatabase, convertObjectIdsToStrings, dateTimeSchema, didRemoveAnyEventDates, findAffiliateByPromoCode, findEventOrImportedMarketById, getPayingEventStripeSubscriptionPlan, getPayingStripeSubscriptionPlan, getPayingVendorStripeSubscriptionPlan, getSubscriptionRewardPeriodBounds, isValidObjectId, locationGeoSchema, locationsSchema, mapVendorLicenceToSubscriptionRewardType, normalizeAffiliatePromoCodes, normalizePromoCode, notifyUsers, publishNotificationEvents, refundPolicySchema, relatedPostSchema, relationDatesSchema, resourceRelationsSchema, saveNotificationsInDb, sendPushNotifications, socialShareResourceSchema, termsAgreementSchema, updateAdStatuses, updateAllEventDateTimeStatuses, updateRelationDatesToUnavailable, updateSingleDateTimeStatus, updateVendorBasedOnUserLicense, userLicenseSchema, vendorProductTypeSchema };

package/dist/index.d.ts

@@ -802,7 +802,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`
@@ -813,7 +813,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).
@@ -850,6 +851,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.
  *
@@ -859,7 +862,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;
@@ -987,4 +990,4 @@ declare function getPayingVendorStripeSubscriptionPlan(userId: ObjectId | string
  */
 declare function getPayingEventStripeSubscriptionPlan(userId: ObjectId | string, now?: Date): Promise<PayingStripeSubscriptionPlanResult>;
 
-export { ACTIVE_NOT_DELETED_FILTER, APP_SETTINGS_ID, AdModel, AffiliateModel, AppSettingModel, type AuthUser, type AwardAffiliateVendorSubscriptionRewardsResult, CategorySchema, ChatModel, ChatReportModel, ContactDetailsSchema, type CouponDocument, CouponModel, EnumPubSubEvents, EventInfoModel, EventModel, GameModel, GoogleImportedMarketModel, type GraphQLContext, NotificationModel, type NotificationPubSub, type ObjectId, OwnerTypeSchema, PartnerModel, PostModel, PushTokenModel, RelationModel, RelationTypeSchema, ResourceActivityModel, ResourceImageTypeSchema, type SchemaAffiliateResourceType, type SchemaAffiliateReward, type SchemaChatMessageReactionType, type SchemaChatMessageReplyPreviewType, type SchemaChatMessageSeenType, type SchemaChatMessageType, type SchemaChatReportType, type SchemaChatType, type SchemaCreateBulkNotificationInput, type SchemaEventInfoType, type SchemaEventType, type SchemaGameType, type SchemaGoogleImportedMarket, type SchemaNotificationType, type SchemaOwnerType, type SchemaParticipantType, type SchemaPartnerType, type SchemaPostType, type SchemaPushTokenType, type SchemaRelatedPostType, type SchemaRelationType, type SchemaUnregisteredVendorInvitationType, type SchemaUnregisteredVendorType, type SchemaUserActivityEvent, type SchemaUserType, type SchemaVendorInfoType, type SchemaVendorType, SchoolModel, SocialMediaTypeSchema, StallTypeSchema, type SubscriptionPayload, UnregisteredVendorModel, UserModel, VendorInfoModel, VendorModel, VerificationTokenModel, type VerificationTokenType, activeAffiliateCodeExists, awardAffiliateVendorSubscriptionRewards, baseResourceFields, connectToDatabase, convertObjectIdsToStrings, dateTimeSchema, didRemoveAnyEventDates, findAffiliateByPromoCode, findEventOrImportedMarketById, getPayingEventStripeSubscriptionPlan, getPayingStripeSubscriptionPlan, getPayingVendorStripeSubscriptionPlan, getSubscriptionRewardPeriodBounds, isValidObjectId, locationGeoSchema, locationsSchema, mapVendorLicenceToSubscriptionRewardType, normalizeAffiliatePromoCodes, normalizePromoCode, notifyUsers, publishNotificationEvents, refundPolicySchema, relatedPostSchema, relationDatesSchema, resourceRelationsSchema, saveNotificationsInDb, sendPushNotifications, socialShareResourceSchema, termsAgreementSchema, updateAdStatuses, updateAllEventDateTimeStatuses, updateRelationDatesToUnavailable, updateSingleDateTimeStatus, updateVendorBasedOnUserLicense, userLicenseSchema, vendorProductTypeSchema };
+export { ACTIVE_NOT_DELETED_FILTER, APP_SETTINGS_ID, AdModel, AffiliateModel, AppSettingModel, type AuthUser, type AwardAffiliateVendorSubscriptionRewardsResult, CategorySchema, ChatModel, ChatReportModel, ContactDetailsSchema, type CouponDocument, CouponModel, EnumPubSubEvents, EventInfoModel, EventModel, GameModel, GoogleImportedMarketModel, type GraphQLContext, NotificationModel, type NotificationPubSub, type ObjectId, OwnerTypeSchema, PartnerModel, PostModel, PushTokenModel, RelationModel, RelationTypeSchema, ResourceActivityModel, ResourceImageTypeSchema, SUBSCRIPTION_REWARD_TIMEZONE, type SchemaAffiliateResourceType, type SchemaAffiliateReward, type SchemaChatMessageReactionType, type SchemaChatMessageReplyPreviewType, type SchemaChatMessageSeenType, type SchemaChatMessageType, type SchemaChatReportType, type SchemaChatType, type SchemaCreateBulkNotificationInput, type SchemaEventInfoType, type SchemaEventType, type SchemaGameType, type SchemaGoogleImportedMarket, type SchemaNotificationType, type SchemaOwnerType, type SchemaParticipantType, type SchemaPartnerType, type SchemaPostType, type SchemaPushTokenType, type SchemaRelatedPostType, type SchemaRelationType, type SchemaUnregisteredVendorInvitationType, type SchemaUnregisteredVendorType, type SchemaUserActivityEvent, type SchemaUserType, type SchemaVendorInfoType, type SchemaVendorType, SchoolModel, SocialMediaTypeSchema, StallTypeSchema, type SubscriptionPayload, UnregisteredVendorModel, UserModel, VendorInfoModel, VendorModel, VerificationTokenModel, type VerificationTokenType, activeAffiliateCodeExists, awardAffiliateVendorSubscriptionRewards, baseResourceFields, connectToDatabase, convertObjectIdsToStrings, dateTimeSchema, didRemoveAnyEventDates, findAffiliateByPromoCode, findEventOrImportedMarketById, getPayingEventStripeSubscriptionPlan, getPayingStripeSubscriptionPlan, getPayingVendorStripeSubscriptionPlan, getSubscriptionRewardPeriodBounds, isValidObjectId, locationGeoSchema, locationsSchema, mapVendorLicenceToSubscriptionRewardType, normalizeAffiliatePromoCodes, normalizePromoCode, notifyUsers, publishNotificationEvents, refundPolicySchema, relatedPostSchema, relationDatesSchema, resourceRelationsSchema, saveNotificationsInDb, sendPushNotifications, socialShareResourceSchema, termsAgreementSchema, updateAdStatuses, updateAllEventDateTimeStatuses, updateRelationDatesToUnavailable, updateSingleDateTimeStatus, updateVendorBasedOnUserLicense, userLicenseSchema, vendorProductTypeSchema };

package/dist/index.mjs

@@ -4775,7 +4775,7 @@ var registerFields = [
     required: true
   },
   {
-    helperText: "Enter Nickname",
+    helperText: "Enter Nickname (optional)",
     keyboardType: "default",
     name: "nickName",
     placeholder: "Nickname",
@@ -4832,16 +4832,18 @@ var profileFields = [
     helperText: "Enter first name",
     keyboardType: "default",
     name: "firstName",
-    placeholder: "First Name"
+    placeholder: "First Name",
+    required: true
   },
   {
     helperText: "Enter last name",
     keyboardType: "default",
     name: "lastName",
-    placeholder: "Last Name"
+    placeholder: "Last Name",
+    required: true
   },
   {
-    helperText: "Enter Nickname",
+    helperText: "Enter Nickname (optional)",
     keyboardType: "default",
     name: "nickName",
     placeholder: "Nickname",
@@ -4852,6 +4854,7 @@ var profileFields = [
     keyboardType: "default",
     name: "password",
     placeholder: "Password",
+    required: true,
     secureTextEntry: true
   },
   {
@@ -4859,6 +4862,7 @@ var profileFields = [
     keyboardType: "default",
     name: "confirmPassword",
     placeholder: "Confirm Password",
+    required: true,
     secureTextEntry: true
   }
 ];
@@ -11315,6 +11319,11 @@ async function sendPushNotifications({
   }
 }
 
+// src/service/affiliate/vendorSubscriptionRewards.ts
+import dayjs5 from "dayjs";
+import timezone3 from "dayjs/plugin/timezone";
+import utc3 from "dayjs/plugin/utc";
+
 // src/service/license.ts
 var PRO_EVENT_PLANS = /* @__PURE__ */ new Set([
   EnumUserLicence2.PRO_EVENT,
@@ -11361,6 +11370,9 @@ async function getPayingEventStripeSubscriptionPlan(userId, now = /* @__PURE__ *
 }
 
 // src/service/affiliate/vendorSubscriptionRewards.ts
+dayjs5.extend(utc3);
+dayjs5.extend(timezone3);
+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)) {
@@ -11375,12 +11387,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 = dayjs5(now).tz(SUBSCRIPTION_REWARD_TIMEZONE).startOf("month").toDate();
+  const periodEnd = dayjs5(now).tz(SUBSCRIPTION_REWARD_TIMEZONE).startOf("month").add(1, "month").toDate();
   return { periodEnd, periodStart };
 }
 
@@ -11390,6 +11398,7 @@ function isEligibleVendorResource(resource) {
 }
 async function findAffiliatesWithActiveVendorReferrals() {
   return await AffiliateModel.find({
+    active: true,
     affiliateResources: {
       $elemMatch: {
         resourceActive: true,
@@ -11462,8 +11471,7 @@ async function tryAwardSubscriptionReward({
                 createdAt: {
                   $gte: period.periodStart,
                   $lt: period.periodEnd
-                },
-                rewardType
+                }
               }
             }
           }
@@ -11755,11 +11763,11 @@ function convertObjectIdsToStrings(obj) {
 }
 
 // src/service/event/updateAllEventDateTimeStatuses.ts
-import dayjs5 from "dayjs";
+import dayjs6 from "dayjs";
 import customParseFormat3 from "dayjs/plugin/customParseFormat";
 import isoWeek from "dayjs/plugin/isoWeek";
-dayjs5.extend(customParseFormat3);
-dayjs5.extend(isoWeek);
+dayjs6.extend(customParseFormat3);
+dayjs6.extend(isoWeek);
 function getFutureEventStatus(startDateTime, now) {
   const hoursUntilStart = startDateTime.diff(now, "hour", true);
   if (hoursUntilStart > 0 && hoursUntilStart <= 4) {
@@ -11779,14 +11787,14 @@ function getFutureEventStatus(startDateTime, now) {
   }
   return EnumEventDateStatus.UPCOMING;
 }
-function updateSingleDateTimeStatus(dateTime, now = dayjs5()) {
+function updateSingleDateTimeStatus(dateTime, now = dayjs6()) {
   const dateTimeFormat = `${dateFormat} ${timeFormat}`;
-  const startDateTime = dayjs5(
+  const startDateTime = dayjs6(
     `${dateTime.startDate} ${dateTime.startTime}`,
     dateTimeFormat,
     true
   );
-  const endDateTime = dayjs5(
+  const endDateTime = dayjs6(
     `${dateTime.endDate} ${dateTime.endTime}`,
     dateTimeFormat,
     true
@@ -11868,7 +11876,7 @@ async function updateModelDateTimeStatuses(model, now) {
   return updated;
 }
 async function updateAllEventDateTimeStatuses() {
-  const now = dayjs5();
+  const now = dayjs6();
   const [eventCount, marketCount] = await Promise.all([
     updateModelDateTimeStatuses(EventModel, now),
     updateModelDateTimeStatuses(
@@ -11941,6 +11949,7 @@ export {
   RelationTypeSchema,
   ResourceActivityModel,
   ResourceImageTypeSchema,
+  SUBSCRIPTION_REWARD_TIMEZONE,
   SchoolModel,
   SocialMediaTypeSchema,
   StallTypeSchema,