fix: solve redirect on iphone and fix offer display when user affected

SocialGouv · Mar 13, 2024 · cb660a2 · cb660a2
1 parent 8364db8
commit cb660a2
Show file tree

Hide file tree

Showing 2 changed files with 105 additions and 96 deletions.
diff --git a/webapp/src/pages/dashboard/offer/[id].tsx b/webapp/src/pages/dashboard/offer/[id].tsx
@@ -136,7 +136,9 @@ export default function OfferPage() {
   } = useDisclosure({
     onOpen: () => {
       const timeoutId = setTimeout(() => {
-        window.open(offer?.url as string, "_blank");
+        setTimeout(() => {
+          window.open(offer?.url as string, "_blank");
+        });
         onCloseExternalLink();
       }, 2000);
       setTimeoutIdExternalLink(timeoutId);

diff --git a/webapp/src/server/api/routers/offer.ts b/webapp/src/server/api/routers/offer.ts
@@ -6,102 +6,109 @@ import { ZGetListParams } from "~/server/types";
 import { payloadWhereOfferIsValid } from "~/utils/tools";
 
 export interface OfferIncluded extends Offer {
-	partner: Partner & { icon: Media };
-	category: Category & { icon: Media };
-	imageOfEligibleStores: Media;
+  partner: Partner & { icon: Media };
+  category: Category & { icon: Media };
+  imageOfEligibleStores: Media;
 }
 
 export const offerRouter = createTRPCRouter({
-	getListOfAvailables: userProtectedProcedure
-		.input(
-			ZGetListParams.merge(
-				z.object({
-					offerId: z.number().optional(),
-					categoryId: z.number().optional(),
-					isCurrentUser: z.boolean().optional(),
-				})
-			)
-		)
-		.query(async ({ ctx, input }) => {
-			const { perPage, page, sort, categoryId, offerId, isCurrentUser } = input;
-
-			let where = {
-				...payloadWhereOfferIsValid(),
-			} as Where;
-
-			if (categoryId) {
-				where.category = {
-					equals: categoryId,
-				};
-			}
-
-			if (offerId) {
-				where.id = {
-					equals: offerId,
-				};
-			}
-
-			const offers = await ctx.payload.find({
-				collection: "offers",
-				limit: perPage,
-				page: page,
-				where: where as Where,
-				sort,
-			});
-
-			const myUnusedCoupons = await ctx.payload.find({
-				collection: "coupons",
-				depth: 0,
-				limit: 1000,
-				where: {
-					used: { equals: false },
-					user: { equals: ctx.session.id }
-				},
-			});
-
-			const couponCountOfOffersPromises = offers.docs.map((offer) => ctx.payload.find({
-				collection: "coupons",
-				limit: 1,
-				where: {
-					offer: {
-						equals: offer.id,
-					},
-					used: { equals: false },
-					user: { exists: false }
-				},
-			}));
-
-			const couponCountOfOffers = await Promise.all(couponCountOfOffersPromises)
-
-			const offersFiltered = offers.docs.filter((offer, index) => {
-				const myUnusedOfferCoupons = myUnusedCoupons.docs.find((coupon) => coupon.offer === offer.id)
-
-				if (!isCurrentUser && (offer.kind === "voucher_pass" || offer.kind === "code_space"))
-					return true;
-				else if (isCurrentUser)
-					return !!myUnusedOfferCoupons
-
-
-				const coupons = couponCountOfOffers[index]
-				return !!coupons && !!coupons.docs.length;
-			});
-
-			return {
-				data: offersFiltered as OfferIncluded[],
-				metadata: { page, count: offers.docs.length },
-			};
-		}),
-
-	getById: userProtectedProcedure
-		.input(z.object({ id: z.number() }))
-		.query(async ({ ctx, input }) => {
-			const { id } = input;
-
-			const offer = await ctx.payload.findByID({
-				collection: "offers",
-				id,
-			});
-
-			return { data: offer as OfferIncluded };
-		}),
+  getListOfAvailables: userProtectedProcedure
+    .input(
+      ZGetListParams.merge(
+        z.object({
+          offerId: z.number().optional(),
+          categoryId: z.number().optional(),
+          isCurrentUser: z.boolean().optional(),
+        })
+      )
+    )
+    .query(async ({ ctx, input }) => {
+      const { perPage, page, sort, categoryId, offerId, isCurrentUser } = input;
+
+      let where = {
+        ...payloadWhereOfferIsValid(),
+      } as Where;
+
+      if (categoryId) {
+        where.category = {
+          equals: categoryId,
+        };
+      }
+
+      if (offerId) {
+        where.id = {
+          equals: offerId,
+        };
+      }
+
+      const offers = await ctx.payload.find({
+        collection: "offers",
+        limit: perPage,
+        page: page,
+        where: where as Where,
+        sort,
+      });
+
+      const myUnusedCoupons = await ctx.payload.find({
+        collection: "coupons",
+        depth: 0,
+        limit: 1000,
+        where: {
+          used: { equals: false },
+          user: { equals: ctx.session.id },
+        },
+      });
+
+      const couponCountOfOffersPromises = offers.docs.map((offer) =>
+        ctx.payload.find({
+          collection: "coupons",
+          limit: 1,
+          where: {
+            offer: {
+              equals: offer.id,
+            },
+            used: { equals: false },
+            user: { exists: false },
+          },
+        })
+      );
+
+      const couponCountOfOffers = await Promise.all(
+        couponCountOfOffersPromises
+      );
+
+      const offersFiltered = offers.docs.filter((offer, index) => {
+        const myUnusedOfferCoupons = myUnusedCoupons.docs.find(
+          (coupon) => coupon.offer === offer.id
+        );
+
+        if (
+          !isCurrentUser &&
+          (offer.kind === "voucher_pass" || offer.kind === "code_space")
+        )
+          return true;
+        else if (myUnusedOfferCoupons) return true;
+
+        const coupons = couponCountOfOffers[index];
+        return !!coupons && !!coupons.docs.length;
+      });
+
+      return {
+        data: offersFiltered as OfferIncluded[],
+        metadata: { page, count: offers.docs.length },
+      };
+    }),
+
+  getById: userProtectedProcedure
+    .input(z.object({ id: z.number() }))
+    .query(async ({ ctx, input }) => {
+      const { id } = input;
+
+      const offer = await ctx.payload.findByID({
+        collection: "offers",
+        id,
+      });
+
+      return { data: offer as OfferIncluded };
+    }),
 });