bug: fixed leaderboard view

Author: mikita-kandratsyeu

actions/analytics/get-stripe-data.ts

@@ -3,37 +3,19 @@
 import { Course, Purchase, PurchaseDetails } from '@prisma/client';
 
 import { TEN_MINUTE_SEC } from '@/constants/common';
+import { DELAY_MS } from '@/constants/paginations';
 import { fetchCachedData } from '@/lib/cache';
 import { db } from '@/lib/db';
-import { sleep } from '@/lib/utils';
+import { getBatchedItems, sleep } from '@/lib/utils';
 import { stripe } from '@/server/stripe';
 
-const BATCH_SIZE = 10;
-const DELAY_MS = 500;
-
 type PurchaseType = Purchase & { course: Course | null; details: PurchaseDetails | null };
 
 type GetStripeData = {
   purchases: PurchaseType[];
   userId: string;
 };
 
-const getBatchedItems = <T>(items: T[]) =>
-  items.reduce(
-    (batches, item, index) => {
-      const batchIndex = Math.floor(index / BATCH_SIZE);
-
-      batches[batchIndex] ??= [];
-
-      if (item) {
-        batches[batchIndex].push(item);
-      }
-
-      return batches;
-    },
-    [] as (typeof items)[],
-  );
-
 export const getStripeData = async ({ purchases, userId }: GetStripeData) => {
   const accountId = await db.stripeConnectAccount.findUnique({ where: { userId } });
   const account = accountId?.stripeAccountId

actions/courses/get-leaders.ts

@@ -3,8 +3,10 @@
 import groupBy from 'lodash.groupby';
 
 import { CHAPTER_XP } from '@/constants/courses';
+import { DELAY_MS } from '@/constants/paginations';
 import { db } from '@/lib/db';
 import { isOwner as isOwnerFunc } from '@/lib/owner';
+import { getBatchedItems, sleep } from '@/lib/utils';
 
 import { getUserSubscription } from '../stripe/get-user-subscription';
 
@@ -42,17 +44,32 @@ export const getLeaders = async () => {
     })
   ).filter((user) => user?.settings?.isPublicProfile);
 
-  const userSubscriptions = await Promise.all(
-    users.map(async (user) => {
-      const userSubscription = await getUserSubscription(user.id);
-      const isOwner = isOwnerFunc(user.id);
-
-      return {
-        hasSubscription: isOwner ?? Boolean(userSubscription),
-        isOwner,
-        userId: user.id,
-      };
-    }),
+  const batchedUsers = getBatchedItems(users);
+
+  const userSubscriptions = await batchedUsers.reduce(
+    async (previousUserSubscriptionsPromise: Promise<any[]>, batch: any[], batchIndex: number) => {
+      const previousUserSubscriptions = await previousUserSubscriptionsPromise;
+
+      if (batchIndex > 0) {
+        await sleep(DELAY_MS);
+      }
+
+      const currentBatchUserSubscription = await Promise.all(
+        batch.map(async (user) => {
+          const userSubscription = await getUserSubscription(user.id);
+          const isOwner = isOwnerFunc(user.id);
+
+          return {
+            hasSubscription: isOwner || Boolean(userSubscription),
+            isOwner,
+            userId: user.id,
+          };
+        }),
+      );
+
+      return previousUserSubscriptions.concat(currentBatchUserSubscription);
+    },
+    Promise.resolve([] as any[]),
   );
 
   return Object.entries(groupedByUser)

actions/stripe/get-stripe-promo.ts

@@ -4,10 +4,11 @@ import Stripe from 'stripe';
 
 import { ONE_MINUTE_SEC } from '@/constants/common';
 import { DEFAULT_LOCALE } from '@/constants/locale';
-import { PAGE_SIZES } from '@/constants/paginations';
+import { DELAY_MS, PAGE_SIZES } from '@/constants/paginations';
 import { fetchCachedData } from '@/lib/cache';
 import { db } from '@/lib/db';
 import { formatPrice, getConvertedPrice } from '@/lib/format';
+import { getBatchedItems, sleep } from '@/lib/utils';
 import { stripe } from '@/server/stripe';
 
 type StripePromotionCodes = Stripe.Response<Stripe.ApiList<Stripe.PromotionCode>>['data'];
@@ -110,36 +111,65 @@ export const getStripePromo = async ({
 
     const coupons = await stripe.coupons.list({ limit: 10 });
 
-    const stripePromos = await Promise.all(
-      promos.map(async (code) => {
-        const data = await fetchCachedData(
-          `${code.id}-${code.stripePromoId}`,
-          async () => {
-            const res = await stripe.promotionCodes.retrieve(code.stripePromoId);
+    const batchedStripePromos = getBatchedItems(promos);
+    const batchedStripeCustomers = getBatchedItems(customers);
 
-            return res;
-          },
-          ONE_MINUTE_SEC,
+    const stripePromos = await batchedStripePromos.reduce(
+      async (previousStripePromosPromise: Promise<any[]>, batch: any[], batchIndex: number) => {
+        const previousStripePromos = await previousStripePromosPromise;
+
+        if (batchIndex > 0) {
+          await sleep(DELAY_MS);
+        }
+
+        const currentBatchStripePromos = await Promise.all(
+          batch.map(async (code) => {
+            const data = await fetchCachedData(
+              `${code.id}-${code.stripePromoId}`,
+              async () => {
+                const res = await stripe.promotionCodes.retrieve(code.stripePromoId);
+
+                return res;
+              },
+              ONE_MINUTE_SEC,
+            );
+
+            return data;
+          }),
         );
 
-        return data;
-      }),
+        return previousStripePromos.concat(currentBatchStripePromos);
+      },
+      Promise.resolve([] as any[]),
     );
 
-    const stripeCustomers = await Promise.all(
-      customers.map(async (cs) => {
-        const data = await fetchCachedData(
-          `${cs.stripeCustomerId}`,
-          async () => {
-            const res = await stripe.customers.retrieve(cs.stripeCustomerId);
+    const stripeCustomers = await batchedStripeCustomers.reduce(
+      async (previousStripeCustomersPromise: Promise<any[]>, batch: any[], batchIndex: number) => {
+        const previousStripeCustomers = await previousStripeCustomersPromise;
+
+        if (batchIndex > 0) {
+          await sleep(DELAY_MS);
+        }
+
+        const currentBatchStripeCustomers = await Promise.all(
+          batch.map(async (cs) => {
+            const data = await fetchCachedData(
+              `${cs.stripeCustomerId}`,
+              async () => {
+                const res = await stripe.customers.retrieve(cs.stripeCustomerId);
+
+                return res;
+              },
+              ONE_MINUTE_SEC,
+            );
 
-            return res;
-          },
-          ONE_MINUTE_SEC,
+            return data;
+          }),
         );
 
-        return data;
-      }),
+        return previousStripeCustomers.concat(currentBatchStripeCustomers);
+      },
+      Promise.resolve([] as any[]),
     );
 
     return {

components/auth/user-profile-button.tsx

@@ -46,14 +46,13 @@ export const UserProfileButton = ({ globalProgress }: UserProfileButtonProps) =>
   const handleSettings = () => router.push('/settings/general');
 
   const isAdmin = user?.role === UserRole.ADMIN;
-  const isStudent = user?.role === UserRole.STUDENT;
   const isTeacher = user?.role === UserRole.TEACHER;
 
   return user ? (
     <DropdownMenu>
       <DropdownMenuTrigger asChild className="relative block hover:cursor-pointer">
         <Avatar className="w-[40px] h-[40px] border dark:border-muted-foreground">
-          <AvatarImage src={user.image || ''} />
+          <AvatarImage src={user.image ?? ''} />
           <AvatarFallback>{getFallbackName(user.name as string)}</AvatarFallback>
         </Avatar>
       </DropdownMenuTrigger>
@@ -66,11 +65,7 @@ export const UserProfileButton = ({ globalProgress }: UserProfileButtonProps) =>
                 {user.hasSubscription && <TextBadge label={t('premium')} variant="lime" />}
               </div>
             </div>
-            <p className="text-xs leading-none text-muted-foreground">
-              {(isOwner(user.userId) || isAdmin) && t('admin')}
-              {isTeacher && t('teacher')}
-              {isStudent && t('student')}
-            </p>
+            <p className="text-xs leading-none text-muted-foreground">{t(user.role)}</p>
             <p className="text-xs leading-none text-muted-foreground">{user.email}</p>
           </div>
         </DropdownMenuLabel>

constants/paginations.ts

@@ -1 +1,4 @@
 export const PAGE_SIZES = [5, 10, 25, 50];
+
+export const BATCH_SIZE = 10;
+export const DELAY_MS = 500;

lib/utils.ts

@@ -2,6 +2,8 @@ import { type ClassValue, clsx } from 'clsx';
 import { AES, enc } from 'crypto-js';
 import { twMerge } from 'tailwind-merge';
 
+import { BATCH_SIZE } from '@/constants/paginations';
+
 export const cn = (...inputs: ClassValue[]) => {
   return twMerge(clsx(inputs));
 };
@@ -84,3 +86,19 @@ export const base64ToBlob = (base64: string, contentType: string = '') => {
 };
 
 export const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
+export const getBatchedItems = <T>(items: T[]) =>
+  items.reduce(
+    (batches, item, index) => {
+      const batchIndex = Math.floor(index / BATCH_SIZE);
+
+      batches[batchIndex] ??= [];
+
+      if (item) {
+        batches[batchIndex].push(item);
+      }
+
+      return batches;
+    },
+    [] as (typeof items)[],
+  );