bug: fixed stripe payment

Author: mikita-kandratsyeu

actions/stripe/get-user-subscription.ts

@@ -2,6 +2,7 @@
 
 import { StripeSubscriptionPeriod } from '@prisma/client';
 import { compareAsc, fromUnixTime } from 'date-fns';
+import { StatusCodes } from 'http-status-codes';
 
 import { ONE_DAY_SEC } from '@/constants/common';
 import { fetchCachedData } from '@/lib/cache';
@@ -62,8 +63,10 @@ export const getUserSubscription = async (userId = '', noCache = false) => {
       : await fetchCachedData(`user-subscription-[${userId}]`, callback, ONE_DAY_SEC);
 
     return subscription;
-  } catch (error) {
-    console.error('[GET_USER_SUBSCRIPTION]', error);
+  } catch (error: any) {
+    if (error?.statusCode !== StatusCodes.NOT_FOUND) {
+      console.error('[GET_USER_SUBSCRIPTION]', error);
+    }
 
     return null;
   }

app/(dashboard)/(routes)/settings/general/_components/advanced-options/advanced-options.tsx

@@ -6,6 +6,7 @@ import { useTranslations } from 'next-intl';
 import { useAppConfigStore } from '@/hooks/store/use-app-config-store';
 
 import { ChristmasForm } from './christmas-form';
+import { NewTabCopilotForm } from './new-tab-copilot-form';
 import { OtpForm } from './otp-form';
 import { PublicProfileForm } from './public-profile-form';
 
@@ -23,6 +24,7 @@ export const AdvancedOptions = ({ initialData }: AdvancedOptionsProps) => {
       <p className="font-medium text-xl">{t('advancedOptions')}</p>
       <OtpForm initialData={initialData} />
       <PublicProfileForm initialData={initialData} />
+      <NewTabCopilotForm initialData={initialData} />
       {config?.features?.christmas && <ChristmasForm initialData={initialData} />}
     </div>
   );

app/(dashboard)/(routes)/settings/general/_components/advanced-options/christmas-form.tsx

@@ -17,6 +17,7 @@ import {
   FormLabel,
 } from '@/components/ui/form';
 import { useToast } from '@/components/ui/use-toast';
+import { useUserSettingsStore } from '@/hooks/store/use-user-settings.store';
 import { fetcher } from '@/lib/fetcher';
 
 type ChristmasFormFormProps = {
@@ -33,6 +34,10 @@ export const ChristmasForm = ({ initialData }: ChristmasFormFormProps) => {
   const { toast } = useToast();
   const router = useRouter();
 
+  const { setIsChristmasMode } = useUserSettingsStore((state) => ({
+    setIsChristmasMode: state.setIsChristmasMode,
+  }));
+
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
     defaultValues: {
@@ -46,6 +51,8 @@ export const ChristmasForm = ({ initialData }: ChristmasFormFormProps) => {
     try {
       await fetcher.patch(`/api/users/${initialData.id}`, { body: { settings: values } });
 
+      setIsChristmasMode(values.isChristmasMode);
+
       router.refresh();
     } catch (error) {
       console.error('[CHRISTMAS_FORM]', error);

app/(dashboard)/(routes)/settings/general/_components/advanced-options/new-tab-copilot-form.tsx

@@ -0,0 +1,91 @@
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { User, UserSettings } from '@prisma/client';
+import { useRouter } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+import { useForm } from 'react-hook-form';
+import * as z from 'zod';
+
+import { Switch } from '@/components/ui';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+} from '@/components/ui/form';
+import { useToast } from '@/components/ui/use-toast';
+import { useUserSettingsStore } from '@/hooks/store/use-user-settings.store';
+import { fetcher } from '@/lib/fetcher';
+
+type NewTabCopilotFormProps = {
+  initialData: User & { settings: UserSettings | null };
+};
+
+const formSchema = z.object({
+  isCopilotInNewTab: z.boolean().default(false),
+});
+
+export const NewTabCopilotForm = ({ initialData }: NewTabCopilotFormProps) => {
+  const t = useTranslations('settings.new-tab-copilot');
+
+  const { toast } = useToast();
+  const router = useRouter();
+
+  const { setIsCopilotInNewTab } = useUserSettingsStore((state) => ({
+    setIsCopilotInNewTab: state.setIsCopilotInNewTab,
+  }));
+
+  const form = useForm<z.infer<typeof formSchema>>({
+    resolver: zodResolver(formSchema),
+    defaultValues: {
+      isCopilotInNewTab: Boolean(initialData?.settings?.isCopilotInNewTab),
+    },
+  });
+
+  const { isSubmitting, isValid } = form.formState;
+
+  const handleSubmit = async (values: z.infer<typeof formSchema>) => {
+    try {
+      await fetcher.patch(`/api/users/${initialData.id}`, { body: { settings: values } });
+
+      setIsCopilotInNewTab(values.isCopilotInNewTab);
+
+      router.refresh();
+    } catch (error) {
+      console.error('[NEW_TAB_COPILOT_FORM]', error);
+
+      toast({ isError: true });
+    }
+  };
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(handleSubmit)}>
+        <FormField
+          control={form.control}
+          name="isCopilotInNewTab"
+          render={({ field }) => (
+            <FormItem className="flex flex-row items-center justify-between space-x-3 space-y-0 rounded-md border p-4">
+              <div className="space-y-0.5">
+                <FormLabel>{t('title')}</FormLabel>
+                <FormDescription className="text-xs">{t('body')}</FormDescription>
+              </div>
+              <FormControl>
+                <Switch
+                  aria-readonly
+                  checked={field.value}
+                  disabled={!isValid || isSubmitting}
+                  onCheckedChange={field.onChange}
+                  type="submit"
+                />
+              </FormControl>
+            </FormItem>
+          )}
+        />
+      </form>
+    </Form>
+  );
+};

app/(dashboard)/(routes)/settings/general/_components/advanced-options/public-profile-form.tsx

@@ -17,6 +17,7 @@ import {
   FormLabel,
 } from '@/components/ui/form';
 import { useToast } from '@/components/ui/use-toast';
+import { useUserSettingsStore } from '@/hooks/store/use-user-settings.store';
 import { fetcher } from '@/lib/fetcher';
 
 type PublicProfileFormProps = {
@@ -33,6 +34,10 @@ export const PublicProfileForm = ({ initialData }: PublicProfileFormProps) => {
   const { toast } = useToast();
   const router = useRouter();
 
+  const { setIsPublicProfile } = useUserSettingsStore((state) => ({
+    setIsPublicProfile: state.setIsPublicProfile,
+  }));
+
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
     defaultValues: {
@@ -45,7 +50,9 @@ export const PublicProfileForm = ({ initialData }: PublicProfileFormProps) => {
   const handleSubmit = async (values: z.infer<typeof formSchema>) => {
     try {
       await fetcher.patch(`/api/users/${initialData.id}`, { body: { settings: values } });
-      toast({ title: t('visibilityUpdated') });
+
+      setIsPublicProfile(values.isPublicProfile);
+
       router.refresh();
     } catch (error) {
       console.error('[PUBLIC_PROFILE_FORM]', error);

app/api/webhook/stripe/route.ts

@@ -79,7 +79,7 @@ export const POST = async (req: NextRequest) => {
           return null;
         })();
 
-        const transaction = await db.purchaseDetails.create({
+        const transaction = await prisma.purchaseDetails.create({
           data: {
             city: session?.metadata?.city,
             country: session?.metadata?.country,

app/layout.tsx

@@ -34,10 +34,11 @@ const notoSans = Noto_Sans({ subsets: ['latin'] });
 
 const RootLayout = async ({ children }: RootLayoutProps) => {
   const appConfig = await getAppConfig();
-  const locale = await getLocale();
+  const userSettings = await getUserSettings();
   const messages = await getMessages();
+
+  const locale = await getLocale();
   const timeZone = await getTimeZone();
-  const userSettings = appConfig?.features?.christmas ? await getUserSettings() : null;
 
   return (
     <html lang={locale} suppressHydrationWarning>

app/providers.tsx

@@ -11,8 +11,10 @@ import Snowfall from 'react-snowfall';
 import { GetAppConfig } from '@/actions/configs/get-app-config';
 import { Toaster as ToastProvider } from '@/components/ui/toaster';
 import { useConfettiStore } from '@/hooks/store/use-confetti-store';
+import { useUserSettingsStore } from '@/hooks/store/use-user-settings.store';
 import { useAppConfig } from '@/hooks/use-app-config';
 import { useUserLocation } from '@/hooks/use-user-location';
+import { useUserSettings } from '@/hooks/use-user-settings';
 import { switchLanguage } from '@/lib/locale';
 
 const AuthProvider = ({ children }: Readonly<{ children: React.ReactNode }>) => {
@@ -39,10 +41,12 @@ const ConfettiProvider = () => {
   );
 };
 
-const ChristmasProvider = ({ userSettings }: { userSettings: UserSettings | null }) => {
-  const isEnabled = userSettings?.isChristmasMode;
+const ChristmasProvider = () => {
+  const { isChristmasMode } = useUserSettingsStore((state) => ({
+    isChristmasMode: state.isChristmasMode,
+  }));
 
-  if (!isEnabled) {
+  if (!isChristmasMode) {
     return null;
   }
 
@@ -82,6 +86,7 @@ export const Providers = ({
   const { config } = useAppConfig(appConfig);
 
   useUserLocation();
+  useUserSettings(userSettings);
 
   useEffect(() => {
     switchLanguage(locale);
@@ -92,7 +97,7 @@ export const Providers = ({
     <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
       <NextIntlClientProvider messages={messages} locale={locale} timeZone={timeZone}>
         <AuthProvider>
-          {config?.features?.christmas && <ChristmasProvider userSettings={userSettings} />}
+          {config?.features?.christmas && <ChristmasProvider />}
           <ConfettiProvider />
           <ToastProvider />
           {children}

components/chat/chat.tsx

@@ -5,6 +5,7 @@ import Image from 'next/image';
 import { useState } from 'react';
 
 import { useChatStore } from '@/hooks/store/use-chat-store';
+import { useUserSettingsStore } from '@/hooks/store/use-user-settings.store';
 import { absoluteUrl, cn } from '@/lib/utils';
 
 import { PrettyLoader } from '../loaders/pretty-loader';
@@ -19,8 +20,16 @@ export const Chat = () => {
     currentModelLabel: state.currentModelLabel,
   }));
 
+  const { isCopilotInNewTab } = useUserSettingsStore((state) => ({
+    isCopilotInNewTab: state.isCopilotInNewTab,
+  }));
+
+  const handleOpenChange = isCopilotInNewTab
+    ? () => window.open(absoluteUrl('/chat'), '_blank')
+    : setOpen;
+
   return (
-    <Sheet open={open} onOpenChange={setOpen}>
+    <Sheet open={open} onOpenChange={handleOpenChange}>
       <SheetTrigger className="hover:opacity-75 transition duration-300">
         <button
           className={cn(

components/common/course-enroll-button.tsx

@@ -49,8 +49,11 @@ export const CourseEnrollButton = ({
       });
 
       toast({ title: t('redirect') });
+
       window.location.assign(response.url);
     } catch (error) {
+      console.error('[COURSE_ENROLL_BUTTON]', error);
+
       toast({ isError: true });
     } finally {
       setIsFetching(false);
@@ -79,13 +82,17 @@ export const CourseEnrollButton = ({
       variant={variant}
     >
       {isLoading && <MoreHorizontal className="w-6 h-6 animate-pulse" />}
-      {!isLoading && (amount ?? 0) > 0 && <ShoppingCart className="w-4 h-4 mr-2" />}
-      {!isLoading && <span>{t('enrollFor')}</span>}
-      {!isLoading && (amount ?? 0) > 0 && formattedPrice}
-      {!isLoading && amount === 0 && (
+      {!isLoading && (
         <>
-          {t('free')}
-          <ArrowRight className="w-4 h-4 ml-2" />
+          {(amount ?? 0) > 0 && <ShoppingCart className="hidden md:block w-4 h-4 mr-2" />}
+          <span>{t('enrollFor')}</span>
+          {(amount ?? 0) > 0 && formattedPrice}
+          {amount === 0 && (
+            <>
+              {t('free')}
+              <ArrowRight className="w-4 h-4 ml-2" />
+            </>
+          )}
         </>
       )}
     </Button>

hooks/store/use-user-settings.store.ts

@@ -0,0 +1,19 @@
+import { create } from 'zustand';
+
+type UserSettingsStore = {
+  isChristmasMode: boolean;
+  isCopilotInNewTab: boolean;
+  isPublicProfile: boolean;
+  setIsChristmasMode: (value: boolean) => void;
+  setIsCopilotInNewTab: (value: boolean) => void;
+  setIsPublicProfile: (value: boolean) => void;
+};
+
+export const useUserSettingsStore = create<UserSettingsStore>((set) => ({
+  isChristmasMode: false,
+  isCopilotInNewTab: false,
+  isPublicProfile: false,
+  setIsChristmasMode: (value) => set({ isChristmasMode: value }),
+  setIsCopilotInNewTab: (value) => set({ isCopilotInNewTab: value }),
+  setIsPublicProfile: (value) => set({ isPublicProfile: value }),
+}));

hooks/use-user-settings.ts

@@ -0,0 +1,18 @@
+'use client';
+
+import { UserSettings } from '@prisma/client';
+import { useEffect } from 'react';
+
+import { useUserSettingsStore } from './store/use-user-settings.store';
+
+export const useUserSettings = (userSettings: UserSettings | null) => {
+  const { setIsChristmasMode, setIsCopilotInNewTab, setIsPublicProfile } = useUserSettingsStore();
+
+  useEffect(() => {
+    setIsChristmasMode(Boolean(userSettings?.isChristmasMode));
+    setIsCopilotInNewTab(Boolean(userSettings?.isCopilotInNewTab));
+    setIsPublicProfile(Boolean(userSettings?.isPublicProfile));
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+};

messages/be.json

@@ -472,6 +472,10 @@
     "christmas": {
       "title": "Уключыць калядны настрой 🎄🎁",
       "body": "Калядная тэма дадае трохі магіі"
+    },
+    "new-tab-copilot": {
+      "title": "Nova Copilot ў новай ўкладцы",
+      "body": "Адкрываць чат заўсёды ў новай ўкладцы."
     }
   },
   "file-upload": {

messages/en.json

@@ -472,6 +472,10 @@
     "christmas": {
       "title": "Turn on the Christmas mood 🎄🎁",
       "body": "The Christmas theme adds a little magic."
+    },
+    "new-tab-copilot": {
+      "title": "Nova Copilot in a new tab",
+      "body": "Open the chat always in a new tab."
     }
   },
   "file-upload": {

messages/ru.json

@@ -471,6 +471,10 @@
     "christmas": {
       "title": "Включить рождественское настроение 🎄🎁",
       "body": "Рождественская тема добавляет немного магии"
+    },
+    "new-tab-copilot": {
+      "title": "Nova Copilot в новой вкладке",
+      "body": "Открывать чат всегда в новой вкладке."
     }
   },
   "file-upload": {