Refactor to use transaction functions/logging

backend/src/schema/resolvers/users.js

@@ -3,6 +3,7 @@ import fileUpload from './fileUpload'
 import { getNeode } from '../../bootstrap/neo4j'
 import { UserInputError, ForbiddenError } from 'apollo-server'
 import Resolver from './helpers/Resolver'
+import log from './helpers/databaseLogger'
 
 const neode = getNeode()
 
@@ -122,50 +123,53 @@ export default {
     DeleteUser: async (object, params, context, resolveInfo) => {
       const { resource } = params
       const session = context.driver.session()
-
-      let user
       try {
         if (resource && resource.length) {
-          await Promise.all(
-            resource.map(async node => {
-              await session.run(
+          await session.writeTransaction(transaction => {
+            resource.map(node => {
+              return transaction.run(
                 `
-            MATCH (resource:${node})<-[:WROTE]-(author:User {id: $userId})
-            OPTIONAL MATCH (resource)<-[:COMMENTS]-(comment:Comment)
-            SET resource.deleted = true
-            SET resource.content = 'UNAVAILABLE'
-            SET resource.contentExcerpt = 'UNAVAILABLE'
-            SET comment.deleted = true
-            RETURN author`,
+                    MATCH (resource:${node})<-[:WROTE]-(author:User {id: $userId})
+                    OPTIONAL MATCH (resource)<-[:COMMENTS]-(comment:Comment)
+                    SET resource.deleted = true
+                    SET resource.content = 'UNAVAILABLE'
+                    SET resource.contentExcerpt = 'UNAVAILABLE'
+                    SET comment.deleted = true
+                    RETURN author
+                  `,
                 {
                   userId: context.user.id,
                 },
               )
-            }),
-          )
+            })
+          })
         }
 
-        // we cannot set slug to 'UNAVAILABE' because of unique constraints
-        const transactionResult = await session.run(
-          `
-          MATCH (user:User {id: $userId})
-          SET user.deleted = true
-          SET user.name = 'UNAVAILABLE'
-          SET user.about = 'UNAVAILABLE'
-          WITH user
-          OPTIONAL MATCH (user)<-[:BELONGS_TO]-(email:EmailAddress)
-          DETACH DELETE email
-          WITH user
-          OPTIONAL MATCH (user)<-[:OWNED_BY]-(socialMedia:SocialMedia)
-          DETACH DELETE socialMedia
-          RETURN user`,
-          { userId: context.user.id },
-        )
-        user = transactionResult.records.map(r => r.get('user').properties)[0]
+        const deleteUserTxResultPromise = session.writeTransaction(async transaction => {
+          const deleteUserTransactionResponse = await transaction.run(
+            `
+              MATCH (user:User {id: $userId})
+              SET user.deleted = true
+              SET user.name = 'UNAVAILABLE'
+              SET user.about = 'UNAVAILABLE'
+              WITH user
+              OPTIONAL MATCH (user)<-[:BELONGS_TO]-(email:EmailAddress)
+              DETACH DELETE email
+              WITH user
+              OPTIONAL MATCH (user)<-[:OWNED_BY]-(socialMedia:SocialMedia)
+              DETACH DELETE socialMedia
+              RETURN user
+            `,
+            { userId: context.user.id },
+          )
+          log(deleteUserTransactionResponse)
+          return deleteUserTransactionResponse.records.map(record => record.get('user').properties)
+        })
+        const [user] = await deleteUserTxResultPromise
+        return user
       } finally {
         session.close()
       }
-      return user
     },
   },
   User: {

backend/src/schema/resolvers/users.spec.js

@@ -372,6 +372,7 @@ describe('DeleteUser', () => {
                 ],
               },
             },
+            errors: undefined,
           }
           await expect(mutate({ mutation: deleteUserMutation, variables })).resolves.toMatchObject(
             expectedResponse,
@@ -418,6 +419,7 @@ describe('DeleteUser', () => {
                     ],
                   },
                 },
+                errors: undefined,
               }
               await expect(
                 mutate({ mutation: deleteUserMutation, variables }),
@@ -465,6 +467,7 @@ describe('DeleteUser', () => {
                   ],
                 },
               },
+              errors: undefined,
             }
             await expect(
               mutate({ mutation: deleteUserMutation, variables }),
@@ -511,6 +514,7 @@ describe('DeleteUser', () => {
                   ],
                 },
               },
+              errors: undefined,
             }
             await expect(
               mutate({ mutation: deleteUserMutation, variables }),