Update members api

pbteja1998 · pbteja1998 · commit d515ba3df6ed · 2021-02-28T10:44:49.000+05:30
diff --git a/src/pages/api/fauna/members.ts b/src/pages/api/fauna/members.ts
@@ -1,3 +1,4 @@
+import { getUserFromUserRef } from 'src/utils/fauna'
 import { NextApiHandler, NextApiRequest, NextApiResponse } from 'next'
 
 import faunadb from 'faunadb'
@@ -21,34 +22,7 @@ const FaunaCreateHandler: NextApiHandler = async (
   try {
     const response: any = await client.query(
       q.Map(q.Paginate(q.Documents(q.Collection('users'))), (userRef) => {
-        const user = q.Get(userRef)
-        const userId = q.Select(['ref', 'id'], user)
-        let isFollowing = false
-
-        if (session) {
-          const followerId = (session.user as User).id
-          const ref = q.Match(q.Index('unique_user_and_follower'), [
-            q.Ref(q.Collection('users'), userId),
-            q.Ref(q.Collection('users'), followerId),
-          ])
-          isFollowing = q.If(
-            q.Exists(ref),
-            q.Select(['data', 'isFollowing'], q.Get(ref)),
-            false
-          ) as boolean
-        }
-        return {
-          id: userId,
-          name: q.Select(['data', 'name'], user, null),
-          username: q.Select(['data', 'username'], user, null),
-          image: q.Select(['data', 'image'], user, null),
-          account: {
-            firstName: q.Select(['data', 'account', 'firstName'], user, null),
-            bio: q.Select(['data', 'account', 'bio'], user, null),
-          },
-          socials: q.Select(['data', 'socials'], user, null),
-          isFollowing,
-        }
+        return getUserFromUserRef({ ref: userRef, session })
       })
     )
     const users: User[] = response.data
diff --git a/src/utils/fauna.ts b/src/utils/fauna.ts
@@ -33,7 +33,9 @@ export function getUserFromUserRef({
     username: q.Select(['data', 'username'], userDoc, null),
     account: {
       firstName: q.Select(['data', 'account', 'firstName'], userDoc, null),
+      bio: q.Select(['data', 'account', 'bio'], userDoc, null),
     },
+    socials: q.Select(['data', 'socials'], userDoc, null),
     isFollowing,
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,9 @@ export function getUserFromUserRef({`
`33`	`33`	`username: q.Select(['data', 'username'], userDoc, null),`
`34`	`34`	`account: {`
`35`	`35`	`firstName: q.Select(['data', 'account', 'firstName'], userDoc, null),`
	`36`	`+ bio: q.Select(['data', 'account', 'bio'], userDoc, null),`
`36`	`37`	`},`
	`38`	`+ socials: q.Select(['data', 'socials'], userDoc, null),`
`37`	`39`	`isFollowing,`
`38`	`40`	`}`
`39`	`41`	`}`