Merge remote-tracking branch 'origin' into feature/tracking

server/routers/contentstack/reward/query.ts

@@ -16,9 +16,10 @@ import {
   rewardsUpdateInput,
 } from "./input"
 import {
-type 
-  Reward,  validateApiRewardSchema,
-  validateCategorizedRewardsSchema} from "./output"
+  type Reward,
+  validateApiRewardSchema,
+  validateCategorizedRewardsSchema,
+} from "./output"
 import {
   getAllCachedApiRewards,
   getAllRewardCounter,
@@ -41,7 +42,6 @@ import {
   getUnwrapSurpriseSuccessCounter,
 } from "./utils"
 
-
 const ONE_HOUR = 60 * 60
 
 export const rewardQueryRouter = router({
@@ -245,13 +245,17 @@ export const rewardQueryRouter = router({
       .map(({ rewardId }) => rewardId)
 
     const rewards = cmsRewards
-      .filter((reward) => !wrappedSurprisesIds.includes(reward.reward_id))
-      .map((reward) => {
+      .filter((cmsReward) => !wrappedSurprisesIds.includes(cmsReward.reward_id))
+      .map((cmsReward) => {
+        const apiReward = validatedApiRewards.data.find(
+          ({ rewardId }) => rewardId === cmsReward.reward_id
+        )
+
         return {
-          ...reward,
-          id: validatedApiRewards.data.find(
-            ({ rewardId }) => rewardId === reward.reward_id
-          )?.id,
+          ...cmsReward,
+          id: apiReward?.id,
+          rewardType: apiReward?.rewardType,
+          redeemLocation: apiReward?.redeemLocation,
         }
       })
 
@@ -364,6 +368,8 @@ export const rewardQueryRouter = router({
         return {
           ...reward,
           id: surprise.id,
+          rewardType: surprise.rewardType,
+          redeemLocation: surprise.redeemLocation,
           coupons: "coupon" in surprise ? surprise.coupon || [] : [],
         }
       })