chore: cleanup user actions

Author: Logannford

src/actions/questions/get-previous.ts

@@ -1,6 +1,6 @@
 'use server';
 import { prisma } from '@/utils/prisma';
-import { getUserFromDb } from '../user/get-user';
+import { getUserFromDb } from '../user/authed/get-user';
 import { Question, QuestionWithoutAnswers } from '@/types/Questions';
 import { Answer } from '@/types/Answers';
 
@@ -39,40 +39,40 @@ export const getPreviousQuestions = async (opts: {
     prisma.questions.count({
       where: {
         questionDate: {
-          lt: todayDate,
-        },
-      },
+          lt: todayDate
+        }
+      }
     }),
     prisma.questions.findMany({
       where: {
         questionDate: {
-          lt: todayDate,
+          lt: todayDate
         },
         AND: {
-          dailyQuestion: true,
-        },
+          dailyQuestion: true
+        }
       },
       orderBy: {
-        questionDate: orderBy,
+        questionDate: orderBy
       },
       skip,
       take: pageSize, // Calculate the correct number of items to take
       include: {
         answers: true, // Include the answers in the query
         tags: {
           include: {
-            tag: true,
-          },
-        },
-      },
+            tag: true
+          }
+        }
+      }
     }),
 
     // get the user's answers to the questions
     prisma.answers.findMany({
       where: {
-        userUid,
-      },
-    }),
+        userUid
+      }
+    })
   ]);
 
   return {
@@ -81,6 +81,6 @@ export const getPreviousQuestions = async (opts: {
     answers,
     page,
     pageSize,
-    totalPages: Math.ceil(total / pageSize),
+    totalPages: Math.ceil(total / pageSize)
   };
 };

src/actions/stripe/stripe-subscription.ts

@@ -1,7 +1,7 @@
 'use server';
 import Stripe from 'stripe';
 import { stripe } from '@/lib/stripe';
-import { getUserFromSession } from '../user/get-user';
+import { getUserFromSession } from '../user/authed/get-user';
 
 type SubscriptionResponse = {
   subscriptionId: string;
@@ -37,8 +37,8 @@ export const createSubscription = async (
       const customerParams: Stripe.CustomerCreateParams = {
         email,
         metadata: {
-          createdAt: new Date().toISOString(),
-        },
+          createdAt: new Date().toISOString()
+        }
       };
       customer = await createCustomer(customerParams, stripe);
       isNewCustomer = true;
@@ -64,10 +64,10 @@ export const createSubscription = async (
           items: [
             {
               id: existingSubscription.data[0].items.data[0].id,
-              price: priceId,
-            },
+              price: priceId
+            }
           ],
-          proration_behavior: 'create_prorations',
+          proration_behavior: 'create_prorations'
         }
       );
     } else {
@@ -79,12 +79,12 @@ export const createSubscription = async (
         payment_behavior: 'default_incomplete',
         payment_settings: {
           save_default_payment_method: 'on_subscription',
-          payment_method_types: ['card'],
+          payment_method_types: ['card']
         },
         expand: ['latest_invoice.payment_intent'],
         metadata: {
-          email: customer.email,
-        },
+          email: customer.email
+        }
       });
     }
 
@@ -103,7 +103,7 @@ export const createSubscription = async (
       clientSecret: paymentIntent.client_secret,
       customerId: customer.id,
       isNewCustomer,
-      stripeSubscriptionItemId: subscription.items.data[0].id,
+      stripeSubscriptionItemId: subscription.items.data[0].id
     };
   } catch (error) {
     console.error('Error in createSubscription:', error);
@@ -120,7 +120,7 @@ export const lookupCustomer = async (
 ): Promise<Stripe.Customer | null> => {
   const existingCustomer = await stripe.customers.list({
     email: email,
-    limit: 1,
+    limit: 1
   });
 
   return existingCustomer.data.length ? existingCustomer.data[0] : null;
@@ -153,7 +153,7 @@ export const hasActiveSubscription = async (
     return await stripe.subscriptions.list({
       customer: customerId,
       status: 'active',
-      expand: ['data.items.data.price'],
+      expand: ['data.items.data.price']
     });
   } catch (error) {
     console.error('Error checking active subscription:', error);

src/actions/user/delete-user.ts renamed to src/actions/user/account/delete-user.ts

@@ -1,7 +1,7 @@
 'use server';
 import type {
   CreateSubscriptionInput,
-  Subscription,
+  Subscription
 } from '@/types/Subscription';
 import { getUserFromSession } from './get-user';
 import { prisma } from '@/utils/prisma';
@@ -26,27 +26,27 @@ export const updateUserSubscription = async (opts: {
   if (!userUid) {
     return {
       success: false,
-      error: 'User not found',
+      error: 'User not found'
     };
   }
 
   // Check if user already has a subscription
   const existingSubscription = await prisma.subscriptions.findUnique({
     where: {
-      userUid,
-    },
+      userUid
+    }
   });
 
   if (existingSubscription) {
     // get the subscription and customer id from the db
     const {
       stripeCustomerId: oldStripeCustomerId,
-      stripeSubscriptionId: oldStripeSubscriptionId,
+      stripeSubscriptionId: oldStripeSubscriptionId
     } = existingSubscription;
     if (!oldStripeCustomerId || !oldStripeSubscriptionId) {
       return {
         success: false,
-        error: 'Stripe customer or subscription ID not found',
+        error: 'Stripe customer or subscription ID not found'
       };
     }
 
@@ -65,12 +65,12 @@ export const updateUserSubscription = async (opts: {
     // Update existing subscription
     const updatedSubscription = await prisma.subscriptions.update({
       where: {
-        userUid,
+        userUid
       },
       data: {
         ...subscription,
-        updatedAt: new Date(),
-      },
+        updatedAt: new Date()
+      }
     });
 
     // update the user object based on which plan was chosen
@@ -81,23 +81,23 @@ export const updateUserSubscription = async (opts: {
     if (!plan) {
       return {
         success: false,
-        error: 'Plan not found',
+        error: 'Plan not found'
       };
     }
 
     // update the user level
     await prisma.users.update({
       where: {
-        uid: userUid,
+        uid: userUid
       },
       data: {
-        userLevel: plan.value,
-      },
+        userLevel: plan.value
+      }
     });
 
     return {
       success: true,
-      subscription: updatedSubscription,
+      subscription: updatedSubscription
     };
   } else {
     // Create new subscription
@@ -108,8 +108,8 @@ export const updateUserSubscription = async (opts: {
         createdAt: new Date(),
         updatedAt: new Date(),
         stripeCustomerId: subscription.stripeCustomerId,
-        stripeSubscriptionId: subscription.stripeSubscriptionId,
-      },
+        stripeSubscriptionId: subscription.stripeSubscriptionId
+      }
     });
 
     // find the user's plan name
@@ -118,23 +118,23 @@ export const updateUserSubscription = async (opts: {
     if (!plan) {
       return {
         success: false,
-        error: 'Plan not found',
+        error: 'Plan not found'
       };
     }
 
     // update the user level
     await prisma.users.update({
       where: {
-        uid: userUid,
+        uid: userUid
       },
       data: {
-        userLevel: plan.value,
-      },
+        userLevel: plan.value
+      }
     });
 
     return {
       success: true,
-      subscription: newSubscription,
+      subscription: newSubscription
     };
   }
 };

src/actions/user/login.ts renamed to src/actions/user/account/login.ts

@@ -9,7 +9,7 @@ import {
 } from '@/components/ui/tooltip';
 
 import { listQuestions } from '@/actions/questions/list';
-import { getUserDailyStats } from '@/actions/user/get-daily-streak';
+import { getUserDailyStats } from '@/actions/user/authed/get-daily-streak';
 import { useUserServer } from '@/hooks/useUserServer';
 import { getSuggestions } from '@/actions/questions/get-suggestions';
 import { QuestionMarkCircledIcon } from '@radix-ui/react-icons';

src/actions/user/logout.ts renamed to src/actions/user/account/logout.ts

@@ -1,4 +1,7 @@
-import { getUserFromDb, getUserFromSession } from '@/actions/user/get-user';
+import {
+  getUserFromDb,
+  getUserFromSession
+} from '@/actions/user/authed/get-user';
 import DashboardBentoGrid from '@/components/dashboard/dashboard-bento-grid';
 import CurrentStreak from '@/components/global/current-streak';
 import LanguageSwitcher from '@/components/global/language-dropdown';

src/actions/user/reset-password.ts renamed to src/actions/user/account/reset-password.ts

@@ -5,7 +5,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import * as z from 'zod';
 import { useMutation } from '@tanstack/react-query';
 import { useUser } from '@/hooks/useUser';
-import { updateUserAuth } from '@/actions/user/update-user-auth';
+import { updateUserAuth } from '@/actions/user/authed/update-user-auth';
 import { updateUserSchema } from '@/lib/zod/schemas/update-user';
 
 import { Button } from '@/components/ui/button';
@@ -16,7 +16,7 @@ import {
   FormField,
   FormItem,
   FormLabel,
-  FormMessage,
+  FormMessage
 } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
 import { toast } from 'sonner';
@@ -39,15 +39,15 @@ export default function SettingsProfilePage() {
     },
     onError: (error) => {
       toast.error(`Failed to update user auth: ${error}`);
-    },
+    }
   });
 
   const form = useForm<SchemaProps>({
     resolver: zodResolver(updateUserSchema),
     defaultValues: {
       email: user?.email || '',
-      password: '',
-    },
+      password: ''
+    }
   });
 
   const onSubmit = async (values: SchemaProps) => {
@@ -81,7 +81,10 @@ export default function SettingsProfilePage() {
               <FormItem>
                 <FormLabel>Email Address</FormLabel>
                 <FormControl>
-                  <Input placeholder={user?.email} {...field} />
+                  <Input
+                    placeholder={user?.email}
+                    {...field}
+                  />
                 </FormControl>
                 <FormMessage />
               </FormItem>
@@ -94,7 +97,11 @@ export default function SettingsProfilePage() {
               <FormItem>
                 <FormLabel>Password</FormLabel>
                 <FormControl>
-                  <Input type="password" placeholder="********" {...field} />
+                  <Input
+                    type="password"
+                    placeholder="********"
+                    {...field}
+                  />
                 </FormControl>
                 <FormDescription>
                   Leave blank to keep your current password