@timardex/cluemart-server-shared 1.1.18 → 1.1.20

package/dist/index.d.mts

@@ -817,8 +817,8 @@ 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, has the affiliate promo code, and
- *   `owner.userId` matches `affiliateResources.resourceOwner.userId`
+ * - Vendor is active, not deleted, 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:

package/dist/index.d.ts

@@ -817,8 +817,8 @@ 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, has the affiliate promo code, and
- *   `owner.userId` matches `affiliateResources.resourceOwner.userId`
+ * - Vendor is active, not deleted, 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:

package/dist/index.mjs

@@ -4924,6 +4924,12 @@ var OWNER_FIELDS_FRAGMENT = gql`
     userId
   }
 `;
+var PRODUCT_COUPON_FIELDS_FRAGMENT = gql`
+  fragment ProductCouponFields on ProductCouponType {
+    couponDocumentId
+    couponId
+  }
+`;
 var CATEGORY_FIELDS_FRAGMENT = gql`
   fragment CategoryFields on CategoryType {
     id
@@ -5397,109 +5403,6 @@ var GET_EVENT_INFO = gql`
   }
   ${EVENT_INFO}
 `;
-var PRODUCT_COUPON_FIELDS_FRAGMENT = gql`
-  fragment ProductCouponFields on ProductCouponType {
-    couponDocumentId
-    couponId
-  }
-`;
-var COUPON_CODE_FIELDS_FRAGMENT = gql`
-  fragment CouponCodeFields on CouponCodeType {
-    code
-    qrCode {
-      ...ResourceImageFields
-    }
-  }
-  ${RESOURCE_IMAGE_FIELDS_FRAGMENT}
-`;
-var COUPON_PARTICIPANT_USER_FIELDS_FRAGMENT = gql`
-  fragment CouponParticipantUserFields on CouponParticipantUserType {
-    couponCollectedCount
-    couponRedeemedAt
-    createdAt
-    updatedAt
-    userId
-  }
-`;
-var COUPON_OPTION_FIELDS_FRAGMENT = gql`
-  fragment CouponOptionFields on CouponOptionType {
-    type
-    buy
-    get
-    unit
-    visits
-  }
-`;
-var COUPON_REWARD_FIELDS_FRAGMENT = gql`
-  fragment CouponRewardFields on CouponRewardType {
-    vendorId
-    productId
-    quantity
-    unit
-  }
-`;
-var COUPON_DATA_FIELDS_FRAGMENT = gql`
-  fragment CouponDataFields on CouponDataType {
-    _id
-    active
-    couponCode {
-      ...CouponCodeFields
-    }
-    couponDescription
-    couponOption {
-      ...CouponOptionFields
-    }
-    couponRewards {
-      ...CouponRewardFields
-    }
-    createdAt
-    endDate
-    participantUsers {
-      ...CouponParticipantUserFields
-    }
-    resourceId
-    resourceType
-    startDate
-    updatedAt
-  }
-  ${COUPON_CODE_FIELDS_FRAGMENT}
-  ${COUPON_OPTION_FIELDS_FRAGMENT}
-  ${COUPON_PARTICIPANT_USER_FIELDS_FRAGMENT}
-  ${COUPON_REWARD_FIELDS_FRAGMENT}
-`;
-var COUPON = gql`
-  fragment CouponFields on CouponType {
-    _id
-    active
-    couponData {
-      ...CouponDataFields
-    }
-    createdAt
-    deletedAt
-    owner {
-      ...OwnerFields
-    }
-    updatedAt
-  }
-  ${OWNER_FIELDS_FRAGMENT}
-  ${COUPON_DATA_FIELDS_FRAGMENT}
-`;
-var GET_COUPONS = gql`
-  query getCoupons {
-    coupons {
-      ...CouponFields
-    }
-  }
-  ${COUPON}
-`;
-var GET_COUPON = gql`
-  query getCoupon($_id: ID!) {
-    coupon(_id: $_id) {
-      ...CouponFields
-    }
-  }
-  ${COUPON}
-`;
 var VENDOR_DATETIME_FIELDS_FRAGMENT = gql`
   fragment VendorDateTimeFields on VendorDateTimeType {
     dateStatus
@@ -5526,6 +5429,15 @@ var VENDOR_PRODUCT_LIST_FIELDS_FRAGMENT = gql`
   }
   ${PRODUCT_COUPON_FIELDS_FRAGMENT}
 `;
+var VENDOR_PRODUCTS_FIELDS_FRAGMENT = gql`
+  fragment VendorProductsFields on VendorProductsType {
+    active
+    productsList {
+      ...VendorProductListFields
+    }
+  }
+  ${VENDOR_PRODUCT_LIST_FIELDS_FRAGMENT}
+`;
 var VENDOR = gql`
   fragment VendorFields on VendorType {
     _id
@@ -5575,10 +5487,7 @@ var VENDOR = gql`
       ...OwnerFields
     }
     products {
-      active
-      productsList {
-        ...VendorProductListFields
-      }
+      ...VendorProductsFields
     }
     promoCodes
     posterUsage {
@@ -5620,7 +5529,7 @@ var VENDOR = gql`
   ${RESOURCE_IMAGE_FIELDS_FRAGMENT}
   ${SOCIAL_MEDIA_FIELDS_FRAGMENT}
   ${POSTER_USAGE_FIELDS_FRAGMENT}
-  ${VENDOR_PRODUCT_LIST_FIELDS_FRAGMENT}
+  ${VENDOR_PRODUCTS_FIELDS_FRAGMENT}
   ${CONTACT_DETAILS_FIELDS_FRAGMENT}
   ${TERMS_AGREEMENT_FIELDS_FRAGMENT}
   ${RELATION_DATES_FRAGMENT}
@@ -7826,6 +7735,146 @@ var ASSIGN_AFFILIATE_BONUS_REWARD_MUTATION = gql`
   }
   ${AFFILIATE_FIELDS_FRAGMENT}
 `;
+var COUPON_CODE_FIELDS_FRAGMENT = gql`
+  fragment CouponCodeFields on CouponCodeType {
+    code
+    qrCode {
+      ...ResourceImageFields
+    }
+  }
+  ${RESOURCE_IMAGE_FIELDS_FRAGMENT}
+`;
+var COUPON_PARTICIPANT_USER_FIELDS_FRAGMENT = gql`
+  fragment CouponParticipantUserFields on CouponParticipantUserType {
+    couponCollectedCount
+    couponRedeemedAt
+    createdAt
+    updatedAt
+    userId
+  }
+`;
+var COUPON_OPTION_FIELDS_FRAGMENT = gql`
+  fragment CouponOptionFields on CouponOptionType {
+    type
+    buy
+    get
+    unit
+    visits
+  }
+`;
+var COUPON_REWARD_FIELDS_FRAGMENT = gql`
+  fragment CouponRewardFields on CouponRewardType {
+    vendorId
+    productId
+    quantity
+    unit
+  }
+`;
+var COUPON_DATA_PRODUCTS_FIELDS_FRAGMENT = gql`
+  fragment CouponDataProductsFields on CouponDataProductsType {
+    active
+    productsList {
+      ...VendorProductListFields
+    }
+    vendorLogo {
+      ...ResourceImageFields
+    }
+    vendorName
+  }
+  ${VENDOR_PRODUCT_LIST_FIELDS_FRAGMENT}
+  ${RESOURCE_IMAGE_FIELDS_FRAGMENT}
+`;
+var COUPON_DATA_FIELDS_FRAGMENT = gql`
+  fragment CouponDataFields on CouponDataType {
+    _id
+    active
+    couponCode {
+      ...CouponCodeFields
+    }
+    couponDescription
+    couponOption {
+      ...CouponOptionFields
+    }
+    couponRewards {
+      ...CouponRewardFields
+    }
+    createdAt
+    endDate
+    participantUsers {
+      ...CouponParticipantUserFields
+    }
+    products {
+      ...CouponDataProductsFields
+    }
+    resourceId
+    resourceType
+    startDate
+    updatedAt
+  }
+  ${COUPON_CODE_FIELDS_FRAGMENT}
+  ${COUPON_OPTION_FIELDS_FRAGMENT}
+  ${COUPON_PARTICIPANT_USER_FIELDS_FRAGMENT}
+  ${COUPON_REWARD_FIELDS_FRAGMENT}
+  ${COUPON_DATA_PRODUCTS_FIELDS_FRAGMENT}
+`;
+var COUPON = gql`
+  fragment CouponFields on CouponType {
+    _id
+    active
+    couponData {
+      ...CouponDataFields
+    }
+    createdAt
+    deletedAt
+    owner {
+      ...OwnerFields
+    }
+    updatedAt
+  }
+  ${OWNER_FIELDS_FRAGMENT}
+  ${COUPON_DATA_FIELDS_FRAGMENT}
+`;
+var GET_COUPONS = gql`
+  query getCoupons {
+    coupons {
+      active {
+        listName
+        data {
+          ...CouponFields
+        }
+      }
+      owned {
+        listName
+        data {
+          ...CouponFields
+        }
+      }
+      scanned {
+        listName
+        data {
+          ...CouponFields
+        }
+      }
+    }
+  }
+  ${COUPON}
+`;
+var GET_COUPON = gql`
+  query getCoupon($_id: ID!) {
+    coupon(_id: $_id) {
+      ...CouponFields
+    }
+  }
+  ${COUPON}
+`;
+var GET_RESOURCE_COUPONS = gql`
+  query getResourceCoupons($resourceId: ID!, $resourceType: ResourceTypeEnum!) {
+    resourceCoupons(resourceId: $resourceId, resourceType: $resourceType) {
+      ...CouponFields
+    }
+  }
+  ${COUPON}
+`;
 var CREATE_COUPON_MUTATION = gql`
   mutation createCoupon($input: CouponInputType!) {
     createCoupon(input: $input) {
@@ -7838,8 +7887,16 @@ var CREATE_COUPON_MUTATION = gql`
   ${COUPON}
 `;
 var UPDATE_COUPON_MUTATION = gql`
-  mutation updateCoupon($_id: ID!, $input: CouponInputType!) {
-    updateCoupon(_id: $_id, input: $input) {
+  mutation updateCoupon(
+    $couponDocumentId: ID!
+    $couponId: ID!
+    $input: CouponInputType!
+  ) {
+    updateCoupon(
+      couponDocumentId: $couponDocumentId
+      couponId: $couponId
+      input: $input
+    ) {
       data {
         ...CouponFields
       }
@@ -7849,8 +7906,8 @@ var UPDATE_COUPON_MUTATION = gql`
   ${COUPON}
 `;
 var DELETE_COUPON_MUTATION = gql`
-  mutation deleteCoupon($_id: ID!) {
-    deleteCoupon(_id: $_id) {
+  mutation deleteCoupon($couponDocumentId: ID!, $couponId: ID!) {
+    deleteCoupon(couponDocumentId: $couponDocumentId, couponId: $couponId) {
       data
       message
     }
@@ -9116,7 +9173,7 @@ var vendorProductTypeSchema = new MongooseSchema14(
 );
 var productWrapperSchema = new MongooseSchema14(
   {
-    active: { default: false, required: true, type: Boolean },
+    active: { default: false, required: false, type: Boolean },
     productsList: { required: false, type: [vendorProductTypeSchema] }
   },
   { _id: false }
@@ -9866,7 +9923,7 @@ var SHARE_RESOURCE_LABEL2 = {
   school: "School"
 };
 
-// node_modules/@timardex/cluemart-shared/dist/chunk-UV5GH6NI.mjs
+// node_modules/@timardex/cluemart-shared/dist/chunk-3HRC67D3.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}$`;
@@ -9968,7 +10025,7 @@ var gameScreenIdentifierList2 = [
   }
 ];
 
-// node_modules/@timardex/cluemart-shared/dist/chunk-3UYXNSNB.mjs
+// node_modules/@timardex/cluemart-shared/dist/chunk-E7KKXQDI.mjs
 import dayjs4 from "dayjs";
 var statusOptions2 = [
   ...Object.values(EnumInviteStatus2).map((status) => ({
@@ -11012,12 +11069,6 @@ function createAffiliateReward(rewardType, createdAt) {
   };
 }
 
-// src/service/promoCode/normalizePromoCode.ts
-function normalizePromoCode(decoratedPromoCode) {
-  const normalized = decoratedPromoCode?.trim().toUpperCase();
-  return normalized || null;
-}
-
 // src/service/saveNotificationsInDb.ts
 async function saveNotificationsInDb(payload) {
   const { data, message, title, type, userIds } = payload;
@@ -11197,10 +11248,9 @@ async function findAffiliatesWithActiveVendorReferrals() {
       }
     },
     deletedAt: null
-  }).select("_id affiliateCode affiliateResources owner").lean().exec();
+  }).select("_id affiliateResources owner").lean().exec();
 }
 async function isEligibleReferredVendor({
-  affiliateCode,
   resourceId,
   resourceOwnerUserId
 }) {
@@ -11208,8 +11258,7 @@ async function isEligibleReferredVendor({
     _id: resourceId,
     active: true,
     deletedAt: null,
-    "owner.userId": resourceOwnerUserId,
-    promoCodes: affiliateCode
+    "owner.userId": resourceOwnerUserId
   }).exec();
   return Boolean(match);
 }
@@ -11298,14 +11347,12 @@ async function tryAwardSubscriptionReward({
 }
 async function processAffiliateVendorReferral({
   affiliate,
-  affiliateCode,
   createdAt,
   now,
   period,
   resource
 }) {
   const vendorEligible = await isEligibleReferredVendor({
-    affiliateCode,
     resourceId: resource.resourceId,
     resourceOwnerUserId: resource.resourceOwner.userId
   });
@@ -11335,10 +11382,6 @@ async function awardAffiliateVendorSubscriptionRewards(now = /* @__PURE__ */ new
   let skipped = 0;
   const seenPairs = /* @__PURE__ */ new Set();
   for (const affiliate of affiliates) {
-    const affiliateCode = normalizePromoCode(affiliate.affiliateCode);
-    if (!affiliateCode) {
-      continue;
-    }
     for (const resource of affiliate.affiliateResources) {
       if (!isEligibleVendorResource(resource)) {
         continue;
@@ -11350,7 +11393,6 @@ async function awardAffiliateVendorSubscriptionRewards(now = /* @__PURE__ */ new
       seenPairs.add(pairKey);
       const outcome = await processAffiliateVendorReferral({
         affiliate,
-        affiliateCode,
         createdAt,
         now,
         period,
@@ -11374,6 +11416,12 @@ async function findAffiliateByPromoCode(promoCode) {
   }).exec();
 }
 
+// src/service/promoCode/normalizePromoCode.ts
+function normalizePromoCode(decoratedPromoCode) {
+  const normalized = decoratedPromoCode?.trim().toUpperCase();
+  return normalized || null;
+}
+
 // src/service/affiliate/normalizeAffiliatePromoCodes.ts
 function normalizeAffiliatePromoCodes(promoCodes) {
   const normalized = (promoCodes ?? []).map((code) => normalizePromoCode(code)).filter((code) => code !== null);