refactor: update nullable stuff (#88)

experiment-station · Dec 16, 2023 · f2f0a50 · f2f0a50
1 parent b03af35
commit f2f0a50
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/components/layout/app-layout.tsx b/components/layout/app-layout.tsx
@@ -17,9 +17,9 @@ export async function AppLayout({ children }: PropsWithChildren) {
     appHeader = (
       <AppHeader
         user={{
-          avatarURL: account.avatar_url || '',
-          credits: account.ai_credit || 0,
-          username: account.display_name || '',
+          avatarURL: account.avatar_url ?? '',
+          credits: account.ai_credit,
+          username: account.display_name ?? '',
         }}
         variant="authenticated"
       />

diff --git a/lib/services/account.ts b/lib/services/account.ts
@@ -52,7 +52,7 @@ export const fetchAccountAICredits = async () => {
     throw new DatabaseError(accountQuery.error);
   }
 
-  return accountQuery.data.ai_credit || 0;
+  return accountQuery.data.ai_credit;
 };
 
 export const validateAccountAICredits = async () => {
@@ -82,5 +82,5 @@ export const updateAccountAICredits = async (amount: number) => {
     throw new DatabaseError(accountQuery.error);
   }
 
-  return accountQuery.data.ai_credit || 0;
+  return accountQuery.data.ai_credit;
 };
diff --git a/lib/services/spotify/save-user-info.ts b/lib/services/spotify/save-user-info.ts
@@ -15,8 +15,8 @@ type UserMetadata = {
 };
 
 const spotifyUserInfoResponseSchema = z.object({
-  avatar_url: z.string().min(1),
-  full_name: z.string().min(1),
+  avatar_url: z.string().default(''),
+  full_name: z.string().default(''),
   provider_id: z.string().min(1),
   provider_token: z.string().min(1),
 });

diff --git a/lib/services/stripe/orders.ts b/lib/services/stripe/orders.ts
@@ -73,8 +73,7 @@ export async function fulfillOrder(session: Stripe.Checkout.Session) {
   const updateAccountQuery = await supabase
     .from('account')
     .update({
-      ai_credit:
-        (currentAccountCreditsQuery.data.ai_credit ?? 0) + purchasedCredits,
+      ai_credit: currentAccountCreditsQuery.data.ai_credit + purchasedCredits,
     })
     .eq('id', validatedSession.data.metadata.accountId);
 

diff --git a/types/supabase/database.ts b/types/supabase/database.ts
@@ -11,7 +11,7 @@ export interface Database {
     Tables: {
       account: {
         Row: {
-          ai_credit: number | null;
+          ai_credit: number;
           avatar_url: string | null;
           created_at: string;
           display_name: string | null;
@@ -22,7 +22,7 @@ export interface Database {
           user_id: string;
         };
         Insert: {
-          ai_credit?: number | null;
+          ai_credit?: number;
           avatar_url?: string | null;
           created_at?: string;
           display_name?: string | null;
@@ -33,7 +33,7 @@ export interface Database {
           user_id: string;
         };
         Update: {
-          ai_credit?: number | null;
+          ai_credit?: number;
           avatar_url?: string | null;
           created_at?: string;
           display_name?: string | null;