Update neo4j-driver

[Tirokk]

Authored by roschaefer
Dec 17, 2019
Merged Jan 7, 2020

---

Fix API changes. Also close the session in resolver only and refactor
userMiddleware to become a part of the resolver.

The fix for the test was to move session.close into the finally block at the end of the resolver. It was complaining about using a session in userMiddleware.js which was already closed.

[Tirokk]

Authored by cypress[bot]
Dec 17, 2019

---

---

Test summary

50 • 0 • 0 • 0

---

Run details

Project	Human-Connection
Status	Passed
Commit	a568c96c5e
Started	Jan 7, 2020 11:07 AM
Ended	Jan 7, 2020 11:18 AM
Duration	11:37 💡
OS	Linux Ubuntu Linux - 16.04
Browser	Chromium 79

View run in Cypress Dashboard ➡️

---

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

[Tirokk]

Authored by mattwr18
Dec 19, 2019

---

Outdated (history rewrite) - original diff

---

@@ -1,16 +0,0 @@
-import createOrUpdateLocations from '../nodes/locations'
-
-export default {
-  Mutation: {
-    SignupVerification: async (resolve, root, args, context, info) => {
-      const result = await resolve(root, args, context, info)
-      await createOrUpdateLocations(result.id, args.locationName, context.driver)
-      return result
-    },
-    UpdateUser: async (resolve, root, args, context, info) => {
-      const result = await resolve(root, args, context, info)
-      await createOrUpdateLocations(args.id, args.locationName, context.driver)
-      return result
-    },
-  },
-}

why are these changes in this PR @roschaefer
code creep?

[Tirokk]

Authored by mattwr18
Dec 19, 2019

---

Outdated (history rewrite) - original diff

---

@@ -51,11 +54,14 @@ export default {
           emailAddress.relateTo(user, 'belongsTo'),
           emailAddress.update({ verifiedAt: new Date().toISOString() }),
         ])
+        await createOrUpdateLocations(args.id, args.locationName, session)
         return user.toJson()
       } catch (e) {
         if (e.code === 'Neo.ClientError.Schema.ConstraintValidationFailed')
           throw new UserInputError('User with this slug already exists!')
         throw new UserInputError(e.message)
+      } finally {
+        session.close()

maybe these make sense here, if so, please explain...
if not, please open an issue to refactor, then add them there where our future selves can find them more easily

[Tirokk]

Authored by roschaefer
Dec 19, 2019

---

The signature of createOrUpdateLocations has changed. It is now expecting session and not driver. When I updated I got complaints that a session was already closed. So I re-use the same session and close it at the end.

[Tirokk]

Authored by mattwr18
Dec 19, 2019

---

Outdated (history rewrite) - original diff

---

@@ -110,44 +105,36 @@ const createOrUpdateLocations = async (userId, locationName, driver) => {
   if (data.context) {
     await asyncForEach(data.context, async ctx => {
       await createLocation(session, ctx)
-      try {
-        await session.writeTransaction(transaction => {
-          return transaction.run(
-            `
+      await session.writeTransaction(transaction => {
+        return transaction.run(
+          `
               MATCH (parent:Location {id: $parentId}), (child:Location {id: $childId})
               MERGE (child)<-[:IS_IN]-(parent)
               RETURN child.id, parent.id
             `,
-            {
-              parentId: parent.id,
-              childId: ctx.id,
-            },
-          )
-        })
-        parent = ctx
-      } finally {
-        session.close()
-      }
+          {
+            parentId: parent.id,
+            childId: ctx.id,
+          },
+        )
+      })
+      parent = ctx
     })
   }
   // delete all current locations from user and add new location
-  try {
-    await session.writeTransaction(transaction => {
-      return transaction.run(
-        `
+  await session.writeTransaction(transaction => {
+    return transaction.run(
+      `
           MATCH (user:User {id: $userId})-[relationship:IS_IN]->(location:Location)
           DETACH DELETE relationship
           WITH user
-          MATCH (location:Location {id: $locationId}) 
-          MERGE (user)-[:IS_IN]->(location) 
+          MATCH (location:Location {id: $locationId})
+          MERGE (user)-[:IS_IN]->(location)
           RETURN location.id, user.id
         `,
-        { userId: userId, locationId: data.id },
-      )
-    })
-  } finally {
-    session.close()
-  }

why are you no longer closing the session here in this function?
is it closed later?

[Tirokk]

Authored by roschaefer
Dec 19, 2019

---

See above ☝️

[Mogge]

It makes it harder to review when there are unrelated changes @roschaefer
please split them 😸