♻️ refactor create / delete flag functions (#345)

Move add / delete certified flag prisma mutation directly inside the functions that add / remove the flag in the history and in Algolia

Author: thibaudbrault

server/src/helpers/certified.js

@@ -13,12 +13,7 @@ const deleteCertifedFlagIfNoLongerApplicable = async (history, node, tags, ctx)
       specialties && Boolean(specialties.find(specialty => tags.includes(specialty.id)))
 
     if (!isUserSpecialist) {
-      await ctx.prisma.mutation.deleteFlag({
-        where: {
-          id: certifiedFlag.id
-        }
-      })
-      await deleteFlagAndUpdateHistoryAndAlgolia(history, type, ctx, certifiedFlag.id)
+      await deleteFlagAndUpdateHistoryAndAlgolia(history, type, ctx, node.id, certifiedFlag.id)
     }
   }
 }
@@ -30,19 +25,9 @@ const refreshCertifiedFlag = async (history, answer, user, ctx) => {
   const isUserSpecialist = Boolean(specialties.find(specialty => tags.includes(specialty.id)))
 
   if (isUserSpecialist && !certifiedFlag) {
-    await ctx.prisma.mutation.createFlag({
-      data: {
-        type: type,
-        node: { connect: { id: answer.node.id } },
-        user: { connect: { id: user.id } }
-      }
-    })
-    await createFlagAndUpdateHistoryAndAlgolia(history, type, ctx, answer.node.id)
+    await createFlagAndUpdateHistoryAndAlgolia(history, type, ctx, answer.node.id, user.id)
   } else if (!isUserSpecialist && certifiedFlag) {
-    await ctx.prisma.mutation.deleteFlag({
-      where: { id: certifiedFlag.id }
-    })
-    await deleteFlagAndUpdateHistoryAndAlgolia(history, type, ctx, answer.node.id)
+    await deleteFlagAndUpdateHistoryAndAlgolia(history, type, ctx, answer.node.id, certifiedFlag.id)
   }
 }
 

server/src/helpers/updateHistoryAndAlgolia.js

@@ -1,6 +1,13 @@
 const { algolia } = require('../integrations')
 
-const createFlagAndUpdateHistoryAndAlgolia = async (history, type, ctx, nodeId) => {
+const createFlagAndUpdateHistoryAndAlgolia = async (history, type, ctx, nodeId, userId) => {
+  await ctx.prisma.mutation.createFlag({
+    data: {
+      type: type,
+      node: { connect: { id: nodeId } },
+      user: { connect: { id: userId } }
+    }
+  })
   await history.push(ctx, {
     action: 'CREATED',
     model: 'Flag',
@@ -13,7 +20,12 @@ const createFlagAndUpdateHistoryAndAlgolia = async (history, type, ctx, nodeId)
   algolia.updateNode(ctx, nodeId)
 }
 
-const deleteFlagAndUpdateHistoryAndAlgolia = async (history, type, ctx, nodeId) => {
+const deleteFlagAndUpdateHistoryAndAlgolia = async (history, type, ctx, nodeId, flagId) => {
+  await ctx.prisma.mutation.deleteFlag({
+    where: {
+      id: flagId
+    }
+  })
   await history.push(ctx, {
     action: 'DELETED',
     model: 'Flag',

server/src/resolvers/flag.js

@@ -11,15 +11,7 @@ module.exports = {
       const flag = await ctx.prisma.exists.Flag({ node: { id: nodeId }, type })
 
       if (!flag) {
-        await ctx.prisma.mutation.createFlag({
-          data: {
-            type,
-            node: { connect: { id: nodeId } },
-            user: { connect: { id: ctxUser(ctx).id } }
-          }
-        })
-
-        await createFlagAndUpdateHistoryAndAlgolia(history, type, ctx, nodeId)
+        await createFlagAndUpdateHistoryAndAlgolia(history, type, ctx, nodeId, ctxUser(ctx).id)
       }
 
       return ctx.prisma.query.zNode({ where: { id: nodeId } }, info)
@@ -33,11 +25,7 @@ module.exports = {
       )
 
       if (flags) {
-        await ctx.prisma.mutation.deleteFlag({
-          where: { id: flags[0].id }
-        })
-
-        await deleteFlagAndUpdateHistoryAndAlgolia(history, type, ctx, nodeId)
+        await deleteFlagAndUpdateHistoryAndAlgolia(history, type, ctx, nodeId, flags[0].id)
       }
 
       return ctx.prisma.query.zNode({ where: { id: nodeId } }, info)