Merged in fix/hide-cs-rewards-flag (pull request #1065)

fix: hide new cs rewards model behind feature flag

Approved-by: Michael Zetterberg
Approved-by: Chuma Mcphoy (We Ahead)

server/routers/contentstack/reward/output.ts

@@ -92,6 +92,30 @@ export const validateApiTierRewardsSchema = z.record(
 )
 
 export const validateCmsRewardsSchema = z
+  .object({
+    data: z.object({
+      all_reward: z.object({
+        items: z.array(
+          z.object({
+            taxonomies: z.array(
+              z.object({
+                term_uid: z.string().optional(),
+              })
+            ),
+            label: z.string().optional(),
+            reward_id: z.string(),
+            grouped_label: z.string().optional(),
+            description: z.string().optional(),
+            grouped_description: z.string().optional(),
+            value: z.string().optional(),
+          })
+        ),
+      }),
+    }),
+  })
+  .transform((data) => data.data.all_reward.items)
+
+export const validateCmsRewardsWithRedeemSchema = z
   .object({
     data: z.object({
       all_reward: z.object({
@@ -125,12 +149,24 @@ export type SurpriseReward = z.output<typeof SurpriseReward>
 
 export type CmsRewardsResponse = z.input<typeof validateCmsRewardsSchema>
 
+export type CmsRewardsWithRedeemResponse = z.input<
+  typeof validateCmsRewardsWithRedeemSchema
+>
+
 export type CMSReward = z.output<typeof validateCmsRewardsSchema>[0]
 
+export type CMSRewardWithRedeem = z.output<
+  typeof validateCmsRewardsWithRedeemSchema
+>[0]
+
 export type Reward = CMSReward & {
   id: string | undefined
 }
 
+export type RewardWithRedeem = CMSRewardWithRedeem & {
+  id: string | undefined
+}
+
 // New endpoint related types and schemas.
 
 const BenefitReward = z.object({

server/routers/contentstack/reward/utils.ts

@@ -2,8 +2,10 @@ 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"
 
@@ -11,9 +13,11 @@ import { generateLoyaltyConfigTag } from "@/utils/generateTag"
 
 import {
   CmsRewardsResponse,
+  CmsRewardsWithRedeemResponse,
   validateApiAllTiersSchema,
   validateApiTierRewardsSchema,
   validateCmsRewardsSchema,
+  validateCmsRewardsWithRedeemSchema,
 } from "./output"
 
 const meter = metrics.getMeter("trpc.reward")
@@ -196,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, {
@@ -225,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, {