@timardex/cluemart-server-shared 1.0.304 → 1.0.306

package/dist/index.d.mts

@@ -724,8 +724,9 @@ declare const SchoolModel: mongoose__default.Model<SchoolDocument, {}, {}, {}, m
 }, any>;
 
 type SchemaAffiliateReward = AffiliateRewardType;
-type SchemaAffiliateResourceType = Omit<AffiliateResourceType, "resourceId"> & {
+type SchemaAffiliateResourceType = Omit<AffiliateResourceType, "resourceId" | "resourceOwner"> & {
     resourceId: ObjectId;
+    resourceOwner: SchemaOwnerType;
 };
 type AffiliateDocument = Omit<AffiliateType, "_id" | "owner" | "affiliateResources"> & {
     affiliateResources: SchemaAffiliateResourceType[];
@@ -761,8 +762,9 @@ type AwardAffiliateVendorSubscriptionRewardsResult = {
  * Eligibility per affiliate resource:
  * - Affiliate is not soft-deleted
  * - Linked `affiliateResources` entry is vendor, `resourceActive`, and not deleted
- * - Vendor is active, not deleted, and `promoCodes` includes the affiliate code
- * - Vendor owner has a non-expired Standard / Pro / Pro+ vendor licence
+ * - Vendor is active, not deleted, has the affiliate promo code, and
+ *   `owner.userId` matches `affiliateResources.resourceOwner.userId`
+ * - `affiliateResources.resourceOwner` has a non-expired Standard / Pro / Pro+ vendor licence
  *
  * Reward type follows the owner's highest valid licence + Stripe paying status:
  * - Pro / Pro+ with paying Stripe (ACTIVE/TRIALING) → `ACTIVE_VENDOR_PRO_SUBSCRIPTION` (3 pts)

package/dist/index.d.ts

@@ -724,8 +724,9 @@ declare const SchoolModel: mongoose__default.Model<SchoolDocument, {}, {}, {}, m
 }, any>;
 
 type SchemaAffiliateReward = AffiliateRewardType;
-type SchemaAffiliateResourceType = Omit<AffiliateResourceType, "resourceId"> & {
+type SchemaAffiliateResourceType = Omit<AffiliateResourceType, "resourceId" | "resourceOwner"> & {
     resourceId: ObjectId;
+    resourceOwner: SchemaOwnerType;
 };
 type AffiliateDocument = Omit<AffiliateType, "_id" | "owner" | "affiliateResources"> & {
     affiliateResources: SchemaAffiliateResourceType[];
@@ -761,8 +762,9 @@ type AwardAffiliateVendorSubscriptionRewardsResult = {
  * Eligibility per affiliate resource:
  * - Affiliate is not soft-deleted
  * - Linked `affiliateResources` entry is vendor, `resourceActive`, and not deleted
- * - Vendor is active, not deleted, and `promoCodes` includes the affiliate code
- * - Vendor owner has a non-expired Standard / Pro / Pro+ vendor licence
+ * - Vendor is active, not deleted, has the affiliate promo code, and
+ *   `owner.userId` matches `affiliateResources.resourceOwner.userId`
+ * - `affiliateResources.resourceOwner` has a non-expired Standard / Pro / Pro+ vendor licence
  *
  * Reward type follows the owner's highest valid licence + Stripe paying status:
  * - Pro / Pro+ with paying Stripe (ACTIVE/TRIALING) → `ACTIVE_VENDOR_PRO_SUBSCRIPTION` (3 pts)

package/dist/index.mjs

@@ -7282,12 +7282,16 @@ var AFFILIATE_RESOURCE_FIELDS_FRAGMENT = gql`
     resourceDeletedAt
     resourceId
     resourceName
+    resourceOwner {
+      ...OwnerFields
+    }
     resourceType
     rewards {
       ...AffiliateRewardFields
     }
   }
   ${AFFILIATE_REWARD_FIELDS_FRAGMENT}
+  ${OWNER_FIELDS_FRAGMENT}
 `;
 var AFFILIATE_BANK_ACCOUNT_DETAILS_FIELDS_FRAGMENT = gql`
   fragment AffiliateBankAccountDetailsFields on AffiliateBankAccountDetailsType {
@@ -7342,6 +7346,7 @@ var AFFILIATE_FIELDS_FRAGMENT = gql`
     createdAt
     deletedAt
     redeemHistory {
+      paidAt
       redeemedAt
       rewardValue
     }
@@ -9148,6 +9153,10 @@ var affiliateResourceSchema = new MongooseSchema25(
       type: mongoose25.Schema.Types.ObjectId
     },
     resourceName: { required: true, type: String },
+    resourceOwner: {
+      required: true,
+      type: OwnerTypeSchema
+    },
     resourceType: {
       enum: Object.values(EnumResourceType),
       required: true,
@@ -9199,6 +9208,7 @@ var affiliateDetailsSchema = new MongooseSchema25(
 );
 var redeemHistorySchema = new MongooseSchema25(
   {
+    paidAt: { default: null, required: false, type: Date },
     redeemedAt: { required: true, type: Date },
     rewardValue: { required: true, type: Number }
   },
@@ -9313,7 +9323,7 @@ var SHARE_RESOURCE_LABEL2 = {
   school: "School"
 };
 
-// node_modules/@timardex/cluemart-shared/dist/chunk-43SLZVBF.mjs
+// node_modules/@timardex/cluemart-shared/dist/chunk-OBZTGPBJ.mjs
 var PROMO_CODE_PREFIX2 = "CM-";
 var OBJECT_ID_PATH_SEGMENT2 = "[a-f0-9]{24}";
 var OBJECT_ID_PATH_SEGMENT_END2 = `${OBJECT_ID_PATH_SEGMENT2}$`;
@@ -9415,7 +9425,7 @@ var gameScreenIdentifierList2 = [
   }
 ];
 
-// node_modules/@timardex/cluemart-shared/dist/chunk-MLNJAQVM.mjs
+// node_modules/@timardex/cluemart-shared/dist/chunk-QBU7N4P2.mjs
 import dayjs4 from "dayjs";
 var statusOptions2 = [
   ...Object.values(EnumInviteStatus2).map((status) => ({
@@ -10646,13 +10656,19 @@ async function findAffiliatesWithActiveVendorReferrals() {
     deletedAt: null
   }).select("_id affiliateCode affiliateResources owner").lean().exec();
 }
-async function findEligibleReferredVendor(resourceId, affiliateCode) {
-  return await VendorModel.findOne({
+async function isEligibleReferredVendor({
+  affiliateCode,
+  resourceId,
+  resourceOwnerUserId
+}) {
+  const match = await VendorModel.exists({
     _id: resourceId,
     active: true,
     deletedAt: null,
+    "owner.userId": resourceOwnerUserId,
     promoCodes: affiliateCode
-  }).select("_id name owner.userId").lean().exec();
+  }).exec();
+  return Boolean(match);
 }
 async function resolveSubscriptionRewardTypeForVendorOwner(vendorOwnerUserId, now) {
   const vendorOwner = await UserModel.findById(vendorOwnerUserId).select("licences stripe").lean().exec();
@@ -10694,8 +10710,7 @@ async function tryAwardSubscriptionReward({
   createdAt,
   period,
   resource,
-  rewardType,
-  vendor
+  rewardType
 }) {
   const reward = createAffiliateReward(rewardType, createdAt);
   const updateResult = await AffiliateModel.updateOne(
@@ -10705,7 +10720,7 @@ async function tryAwardSubscriptionReward({
         $elemMatch: {
           resourceActive: true,
           resourceDeletedAt: null,
-          resourceId: vendor._id,
+          resourceId: resource.resourceId,
           resourceType: EnumResourceType.VENDOR,
           rewards: {
             $not: {
@@ -10730,15 +10745,12 @@ async function tryAwardSubscriptionReward({
   if (updateResult.modifiedCount === 0) {
     return "skipped";
   }
-  const affiliateOwnerUserId = affiliate.owner?.userId;
-  if (affiliateOwnerUserId) {
-    await notifyAffiliateOwnerOfSubscriptionReward({
-      affiliateId: affiliate._id,
-      affiliateOwnerUserId,
-      resourceName: resource.resourceName || vendor.name || "vendor",
-      rewardValue: reward.rewardValue
-    });
-  }
+  await notifyAffiliateOwnerOfSubscriptionReward({
+    affiliateId: affiliate._id,
+    affiliateOwnerUserId: affiliate.owner.userId,
+    resourceName: resource.resourceName,
+    rewardValue: reward.rewardValue
+  });
   return "awarded";
 }
 async function processAffiliateVendorReferral({
@@ -10749,15 +10761,16 @@ async function processAffiliateVendorReferral({
   period,
   resource
 }) {
-  const vendor = await findEligibleReferredVendor(
-    resource.resourceId,
-    affiliateCode
-  );
-  if (!vendor?.owner?.userId) {
+  const vendorEligible = await isEligibleReferredVendor({
+    affiliateCode,
+    resourceId: resource.resourceId,
+    resourceOwnerUserId: resource.resourceOwner.userId
+  });
+  if (!vendorEligible) {
     return "skipped";
   }
   const rewardType = await resolveSubscriptionRewardTypeForVendorOwner(
-    vendor.owner.userId,
+    resource.resourceOwner.userId,
     now
   );
   if (!rewardType) {
@@ -10768,8 +10781,7 @@ async function processAffiliateVendorReferral({
     createdAt,
     period,
     resource,
-    rewardType,
-    vendor
+    rewardType
   });
 }
 async function awardAffiliateVendorSubscriptionRewards(now = /* @__PURE__ */ new Date()) {