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

server/routers/contentstack/reward/utils.ts

@@ -1,20 +1,24 @@
 import { metrics } from "@opentelemetry/api"
 import { unstable_cache } from "next/cache"
 
-import { Lang } from "@/constants/languages"
+import { env } from "@/env/server"
 import * as api from "@/lib/api"
 import { GetRewards } from "@/lib/graphql/Query/Rewards.graphql"
+import { GetRewards as GetRewardsWithReedem } from "@/lib/graphql/Query/RewardsWithRedeem.graphql"
 import { request } from "@/lib/graphql/request"
 import { notFound } from "@/server/errors/trpc"
 
 import { generateLoyaltyConfigTag } from "@/utils/generateTag"
 
 import {
-  CmsRewardsResponse,
-  validateApiAllTiersSchema,
+type 
+  CmsRewardsResponse,type 
+  CmsRewardsWithRedeemResponse,  validateApiAllTiersSchema,
   validateApiTierRewardsSchema,
   validateCmsRewardsSchema,
-} from "./output"
+  validateCmsRewardsWithRedeemSchema} from "./output"
+
+import type { Lang } from "@/constants/languages"
 
 const meter = metrics.getMeter("trpc.reward")
 export const getAllRewardCounter = meter.createCounter(
@@ -53,6 +57,15 @@ export const getUnwrapSurpriseFailCounter = meter.createCounter(
 export const getUnwrapSurpriseSuccessCounter = meter.createCounter(
   "trpc.contentstack.reward.unwrap-success"
 )
+export const getRedeemCounter = meter.createCounter(
+  "trpc.contentstack.reward.redeem"
+)
+export const getRedeemFailCounter = meter.createCounter(
+  "trpc.contentstack.reward.redeem-fail"
+)
+export const getRedeemSuccessCounter = meter.createCounter(
+  "trpc.contentstack.reward.redeem-success"
+)
 
 const ONE_HOUR = 60 * 60
 
@@ -187,14 +200,24 @@ export async function getCmsRewards(locale: Lang, rewardIds: string[]) {
   const tags = rewardIds.map((id) =>
     generateLoyaltyConfigTag(locale, "reward", id)
   )
-  const cmsRewardsResponse = await request<CmsRewardsResponse>(
-    GetRewards,
-    {
-      locale: locale,
-      rewardIds,
-    },
-    { next: { tags }, cache: "force-cache" }
-  )
+
+  const cmsRewardsResponse = env.USE_NEW_REWARD_MODEL
+    ? await request<CmsRewardsWithRedeemResponse>(
+        GetRewardsWithReedem,
+        {
+          locale: locale,
+          rewardIds,
+        },
+        { next: { tags }, cache: "force-cache" }
+      )
+    : await request<CmsRewardsResponse>(
+        GetRewards,
+        {
+          locale: locale,
+          rewardIds,
+        },
+        { next: { tags }, cache: "force-cache" }
+      )
 
   if (!cmsRewardsResponse.data) {
     getAllRewardFailCounter.add(1, {
@@ -216,8 +239,9 @@ export async function getCmsRewards(locale: Lang, rewardIds: string[]) {
     throw notFoundError
   }
 
-  const validatedCmsRewards =
-    validateCmsRewardsSchema.safeParse(cmsRewardsResponse)
+  const validatedCmsRewards = env.USE_NEW_REWARD_MODEL
+    ? validateCmsRewardsWithRedeemSchema.safeParse(cmsRewardsResponse)
+    : validateCmsRewardsSchema.safeParse(cmsRewardsResponse)
 
   if (!validatedCmsRewards.success) {
     getAllRewardFailCounter.add(1, {