@timardex/cluemart-server-shared 1.0.304 → 1.0.306

package/dist/mongoose/index.d.mts

@@ -3,8 +3,8 @@ import { AdType, ReportChatUser, GoogleImportedMarket, PushTokenType, ResourceAc
 import mongoose__default from 'mongoose';
 import { O as ObjectId } from '../Chat-Wn7yfc3v.mjs';
 export { C as ChatModel, N as NotificationModel, a as SchemaChatMessageReactionType, S as SchemaChatMessageReplyPreviewType, b as SchemaChatMessageSeenType, c as SchemaChatMessageType, e as SchemaChatType, f as SchemaCreateBulkNotificationInput, g as SchemaNotificationType, d as SchemaParticipantType } from '../Chat-Wn7yfc3v.mjs';
-import { S as SchemaOwnerType } from '../Affiliate-BxNv9k41.mjs';
-export { A as AffiliateModel, C as CategorySchema, c as ContactDetailsSchema, O as OwnerTypeSchema, k as RelationModel, j as RelationTypeSchema, R as ResourceImageTypeSchema, n as SchemaAffiliateResourceType, m as SchemaAffiliateReward, a as SchemaRelatedPostType, i as SchemaRelationType, b as SocialMediaTypeSchema, g as baseResourceFields, d as dateTimeSchema, l as locationGeoSchema, e as locationsSchema, f as relatedPostSchema, h as relationDatesSchema, r as resourceRelationsSchema, s as socialShareResourceSchema, t as termsAgreementSchema, u as userLicenseSchema } from '../Affiliate-BxNv9k41.mjs';
+import { S as SchemaOwnerType } from '../Affiliate-B76iZ3fE.mjs';
+export { A as AffiliateModel, C as CategorySchema, c as ContactDetailsSchema, O as OwnerTypeSchema, k as RelationModel, j as RelationTypeSchema, R as ResourceImageTypeSchema, n as SchemaAffiliateResourceType, m as SchemaAffiliateReward, a as SchemaRelatedPostType, i as SchemaRelationType, b as SocialMediaTypeSchema, g as baseResourceFields, d as dateTimeSchema, l as locationGeoSchema, e as locationsSchema, f as relatedPostSchema, h as relationDatesSchema, r as resourceRelationsSchema, s as socialShareResourceSchema, t as termsAgreementSchema, u as userLicenseSchema } from '../Affiliate-B76iZ3fE.mjs';
 import '@timardex/cluemart-shared/types';
 import 'express';
 

package/dist/mongoose/index.d.ts

@@ -3,8 +3,8 @@ import { AdType, ReportChatUser, GoogleImportedMarket, PushTokenType, ResourceAc
 import mongoose__default from 'mongoose';
 import { O as ObjectId } from '../Chat-Wn7yfc3v.js';
 export { C as ChatModel, N as NotificationModel, a as SchemaChatMessageReactionType, S as SchemaChatMessageReplyPreviewType, b as SchemaChatMessageSeenType, c as SchemaChatMessageType, e as SchemaChatType, f as SchemaCreateBulkNotificationInput, g as SchemaNotificationType, d as SchemaParticipantType } from '../Chat-Wn7yfc3v.js';
-import { S as SchemaOwnerType } from '../Affiliate-DRuifOv4.js';
-export { A as AffiliateModel, C as CategorySchema, c as ContactDetailsSchema, O as OwnerTypeSchema, k as RelationModel, j as RelationTypeSchema, R as ResourceImageTypeSchema, n as SchemaAffiliateResourceType, m as SchemaAffiliateReward, a as SchemaRelatedPostType, i as SchemaRelationType, b as SocialMediaTypeSchema, g as baseResourceFields, d as dateTimeSchema, l as locationGeoSchema, e as locationsSchema, f as relatedPostSchema, h as relationDatesSchema, r as resourceRelationsSchema, s as socialShareResourceSchema, t as termsAgreementSchema, u as userLicenseSchema } from '../Affiliate-DRuifOv4.js';
+import { S as SchemaOwnerType } from '../Affiliate-gqV1-654.js';
+export { A as AffiliateModel, C as CategorySchema, c as ContactDetailsSchema, O as OwnerTypeSchema, k as RelationModel, j as RelationTypeSchema, R as ResourceImageTypeSchema, n as SchemaAffiliateResourceType, m as SchemaAffiliateReward, a as SchemaRelatedPostType, i as SchemaRelationType, b as SocialMediaTypeSchema, g as baseResourceFields, d as dateTimeSchema, l as locationGeoSchema, e as locationsSchema, f as relatedPostSchema, h as relationDatesSchema, r as resourceRelationsSchema, s as socialShareResourceSchema, t as termsAgreementSchema, u as userLicenseSchema } from '../Affiliate-gqV1-654.js';
 import '@timardex/cluemart-shared/types';
 import 'express';
 

package/dist/mongoose/index.mjs

@@ -39,7 +39,7 @@ import {
   socialShareResourceSchema,
   termsAgreementSchema,
   userLicenseSchema
-} from "../chunk-GQWLGM2W.mjs";
+} from "../chunk-SY7T26IW.mjs";
 export {
   APP_SETTINGS_ID,
   AdModel,

package/dist/service/index.cjs

@@ -7339,12 +7339,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 {
@@ -7399,6 +7403,7 @@ var AFFILIATE_FIELDS_FRAGMENT = gql`
     createdAt
     deletedAt
     redeemHistory {
+      paidAt
       redeemedAt
       rewardValue
     }
@@ -9205,6 +9210,10 @@ var affiliateResourceSchema = new MongooseSchema25(
       type: import_mongoose25.default.Schema.Types.ObjectId
     },
     resourceName: { required: true, type: String },
+    resourceOwner: {
+      required: true,
+      type: OwnerTypeSchema
+    },
     resourceType: {
       enum: Object.values(EnumResourceType),
       required: true,
@@ -9256,6 +9265,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 }
   },
@@ -9370,7 +9380,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}$`;
@@ -9472,7 +9482,7 @@ var gameScreenIdentifierList2 = [
   }
 ];
 
-// node_modules/@timardex/cluemart-shared/dist/chunk-MLNJAQVM.mjs
+// node_modules/@timardex/cluemart-shared/dist/chunk-QBU7N4P2.mjs
 var import_dayjs4 = __toESM(require("dayjs"), 1);
 var statusOptions2 = [
   ...Object.values(EnumInviteStatus2).map((status) => ({
@@ -10703,13 +10713,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();
@@ -10751,8 +10767,7 @@ async function tryAwardSubscriptionReward({
   createdAt,
   period,
   resource,
-  rewardType,
-  vendor
+  rewardType
 }) {
   const reward = createAffiliateReward(rewardType, createdAt);
   const updateResult = await AffiliateModel.updateOne(
@@ -10762,7 +10777,7 @@ async function tryAwardSubscriptionReward({
         $elemMatch: {
           resourceActive: true,
           resourceDeletedAt: null,
-          resourceId: vendor._id,
+          resourceId: resource.resourceId,
           resourceType: EnumResourceType.VENDOR,
           rewards: {
             $not: {
@@ -10787,15 +10802,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({
@@ -10806,15 +10818,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) {
@@ -10825,8 +10838,7 @@ async function processAffiliateVendorReferral({
     createdAt,
     period,
     resource,
-    rewardType,
-    vendor
+    rewardType
   });
 }
 async function awardAffiliateVendorSubscriptionRewards(now = /* @__PURE__ */ new Date()) {