fix: duplicate profiles (#4089)

ONEARMY · Jan 19, 2025 · b3bee1d · b3bee1d
1 parent 68a3890
commit b3bee1d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/functions/src/supabaseSync/index.ts b/functions/src/supabaseSync/index.ts
@@ -65,9 +65,9 @@ async function insertOrUpdateProfile(
     .from('profiles')
     .select()
     .eq('firebase_auth_id', user._authID)
-    .single()
+    .limit(1)
 
-  if (profileRequest.data) {
+  if (profileRequest.data?.at(0)) {
     // Update
     const { error } = await client
       .from('profiles')

diff --git a/src/routes/api.discussions.$sourceId.comments.$id.ts b/src/routes/api.discussions.$sourceId.comments.$id.ts
@@ -126,13 +126,13 @@ async function getProfileByFirebaseAuthId(
     .from('profiles')
     .select()
     .eq('firebase_auth_id', firebaseAuthId)
-    .single()
+    .limit(1)
 
-  if (error || !data) {
+  if (error || !data?.at(0)) {
     return null
   }
 
-  return data as DBProfile
+  return data[0] as DBProfile
 }
 
 function isUserAdmin(user: DBProfile) {

diff --git a/src/routes/api.discussions.$sourceId.comments.ts b/src/routes/api.discussions.$sourceId.comments.ts
@@ -111,9 +111,9 @@ export async function action({ params, request }: LoaderFunctionArgs) {
     .from('profiles')
     .select()
     .eq('firebase_auth_id', userId)
-    .single()
+    .limit(1)
 
-  if (currentUser.error || !currentUser.data) {
+  if (currentUser.error || !currentUser.data?.at(0)) {
     return Response.json(
       {},
       { status: 400, statusText: 'profile not found ' + userId },
@@ -125,7 +125,7 @@ export async function action({ params, request }: LoaderFunctionArgs) {
     source_id_legacy: isNaN(+params.sourceId!) ? params.sourceId : null,
     source_id: isNaN(+params.sourceId!) ? null : +params.sourceId!,
     source_type: data.sourceType,
-    created_by: currentUser.data.id,
+    created_by: currentUser.data[0].id,
     parent_id: data.parentId ?? null,
     tenant_id: process.env.TENANT_ID,
   } as Partial<DBComment>
@@ -155,7 +155,7 @@ export async function action({ params, request }: LoaderFunctionArgs) {
     notificationsService.sendCommentNotification(
       client,
       commentResult.data as DBComment,
-      currentUser.data as DBProfile,
+      currentUser.data[0] as DBProfile,
     )
   }
 

diff --git a/src/routes/api.questions.$id.ts b/src/routes/api.questions.$id.ts
@@ -229,13 +229,13 @@ async function validateRequest(
     .from('profiles')
     .select()
     .eq('firebase_auth_id', userId)
-    .single()
+    .limit(1)
 
-  if (userRequest.error || !userRequest.data) {
+  if (userRequest.error || !userRequest.data?.at(0)) {
     return { status: 400, statusText: 'User not found' }
   }
 
-  const user = userRequest.data as DBProfile
+  const user = userRequest.data[0] as DBProfile
 
   if (
     existingQuestion.created_by !== user.id &&

diff --git a/src/routes/api.questions.ts b/src/routes/api.questions.ts
@@ -145,14 +145,14 @@ export const action = async ({ request }: LoaderFunctionArgs) => {
       .from('profiles')
       .select()
       .eq('firebase_auth_id', tokenValidation.user_id)
-      .single()
+      .limit(1)
 
-    if (userRequest.error || !userRequest.data) {
+    if (userRequest.error || !userRequest.data?.at(0)) {
       console.log(userRequest.error)
       return Response.json({}, { status: 400, statusText: 'User not found' })
     }
 
-    const user = userRequest.data
+    const user = userRequest.data[0]
 
     const questionResult = await client
       .from('questions')

diff --git a/src/routes/api.subscribers.$contentType.$contentId.ts b/src/routes/api.subscribers.$contentType.$contentId.ts
@@ -23,9 +23,9 @@ export async function action({ request, params }: LoaderFunctionArgs) {
     .from('profiles')
     .select()
     .eq('firebase_auth_id', user_id)
-    .single()
+    .limit(1)
 
-  if (!profileResult.data || profileResult.error) {
+  if (!profileResult.data?.at(0) || profileResult.error) {
     console.error(profileResult.error + ' user:' + user_id)
     return Response.json({}, { status: 400, statusText: 'user not found' })
   }
@@ -35,7 +35,7 @@ export async function action({ request, params }: LoaderFunctionArgs) {
     result = await client.from('subscribers').insert({
       content_type: params.contentType,
       content_id: Number(params.contentId),
-      user_id: profileResult.data.id,
+      user_id: profileResult.data[0].id,
       tenant_id: process.env.TENANT_ID!,
     })
   } else {
@@ -44,7 +44,7 @@ export async function action({ request, params }: LoaderFunctionArgs) {
       .delete()
       .eq('content_type', params.contentType)
       .eq('content_id', Number(params.contentId))
-      .eq('user_id', profileResult.data.id)
+      .eq('user_id', profileResult.data[0].id)
       .eq('tenant_id', process.env.TENANT_ID!)
   }
 

diff --git a/src/routes/api.useful.$contentType.$contentId.ts b/src/routes/api.useful.$contentType.$contentId.ts
@@ -23,9 +23,9 @@ export async function action({ request, params }: LoaderFunctionArgs) {
     .from('profiles')
     .select()
     .eq('firebase_auth_id', user_id)
-    .single()
+    .limit(1)
 
-  if (!profileResult.data || profileResult.error) {
+  if (!profileResult.data?.at(0) || profileResult.error) {
     console.error(profileResult.error + ' user:' + user_id)
     return Response.json({}, { status: 400, statusText: 'user not found' })
   }
@@ -35,7 +35,7 @@ export async function action({ request, params }: LoaderFunctionArgs) {
     result = await client.from('useful_votes').insert({
       content_type: params.contentType,
       content_id: Number(params.contentId),
-      user_id: profileResult.data.id,
+      user_id: profileResult.data[0].id,
       tenant_id: process.env.TENANT_ID!,
     })
   } else {
@@ -44,7 +44,7 @@ export async function action({ request, params }: LoaderFunctionArgs) {
       .delete()
       .eq('content_type', params.contentType)
       .eq('content_id', Number(params.contentId))
-      .eq('user_id', profileResult.data.id)
+      .eq('user_id', profileResult.data[0].id)
       .eq('tenant_id', process.env.TENANT_ID!)
   }