Bug fix

pbteja1998 · pbteja1998 · commit 357b6a35e132 · 2021-02-18T14:05:50.000+05:30
diff --git a/src/adapters/fauna/setup.mjs b/src/adapters/fauna/setup.mjs
@@ -111,19 +111,6 @@ async function main() {
     })
   )
 
-  await client.query(
-    q.CreateIndex({
-      name: 'followers_by_user',
-      source: q.Collection('user_followers'),
-      unique: false,
-      terms: [
-        {
-          field: ['data', 'user'],
-        },
-      ],
-    })
-  )
-
   await client.query(
     q.CreateIndex({
       name: 'unique_user_and_follower',
diff --git a/src/pages/api/fauna/goals/get-current-goal.ts b/src/pages/api/fauna/goals/get-current-goal.ts
@@ -35,20 +35,34 @@ const FaunaCreateHandler: NextApiHandler = async (
                 q.Index('all_goals_by_participant'),
                 q.Ref(q.Collection('users'), userId)
               )
-            )
+            ),
+            null
+          ),
+          goalParticipantDoc: q.If(
+            q.Not(q.IsNull(q.Var('goalParticipantRef'))),
+            q.Get(q.Var('goalParticipantRef')),
+            null
+          ),
+          goalRef: q.If(
+            q.Not(q.IsNull(q.Var('goalParticipantDoc'))),
+            q.Select(['data', 'goal'], q.Var('goalParticipantDoc')),
+            null
           ),
-          goalParticipantDoc: q.Get(q.Var('goalParticipantRef')),
-          goalRef: q.Select(['data', 'goal'], q.Var('goalParticipantDoc')),
         },
-        {
-          id: q.Select(['id'], q.Var('goalRef')),
-          title: q.Select(['data', 'title'], q.Get(q.Var('goalRef'))),
-        }
+        q.If(
+          q.Not(q.IsNull(q.Var('goalRef'))),
+          {
+            id: q.Select(['id'], q.Var('goalRef')),
+            title: q.Select(['data', 'title'], q.Get(q.Var('goalRef'))),
+          },
+          null
+        )
       )
     )
 
     res.status(200).json({ goal: response })
   } catch (error) {
+    console.error(error)
     console.error({ msg: error.message })
     res.status(500).json({ message: error.message })
   }
diff --git a/src/pages/api/fauna/who-to-follow.ts b/src/pages/api/fauna/who-to-follow.ts
@@ -26,39 +26,22 @@ const FaunaCreateHandler: NextApiHandler = async (
 
   try {
     const response: any = await client.query(
-      q.Map(
-        q.Paginate(
-          q.Difference(
-            q.Documents(q.Collection('users')),
-            q.Union(
-              q.Match(
-                q.Index('followers_by_user'),
-                q.Ref(q.Collection('users'), userId)
-              ),
-              q.Match(
-                q.Index('user_by_username'),
-                (session.user as User).username
-              )
-            )
-          )
-        ),
-        (userRef) => {
-          const userDoc = q.Get(userRef)
-          return {
-            id: q.Select(['ref', 'id'], userDoc),
-            name: q.Select(['data', 'name'], userDoc, null),
-            image: q.Select(['data', 'image'], userDoc, null),
-            username: q.Select(['data', 'username'], userDoc, null),
-            account: {
-              firstName: q.Select(
-                ['data', 'account', 'firstName'],
-                userDoc,
-                null
-              ),
-            },
-          }
+      q.Map(q.Paginate(q.Documents(q.Collection('users'))), (userRef) => {
+        const userDoc = q.Get(userRef)
+        return {
+          id: q.Select(['ref', 'id'], userDoc),
+          name: q.Select(['data', 'name'], userDoc, null),
+          image: q.Select(['data', 'image'], userDoc, null),
+          username: q.Select(['data', 'username'], userDoc, null),
+          account: {
+            firstName: q.Select(
+              ['data', 'account', 'firstName'],
+              userDoc,
+              null
+            ),
+          },
         }
-      )
+      })
     )
 
     res.status(200).json({ users: response.data })
