Update Super Admin Service Dependencies (canada-ca#1941)

* update dependencies

* update files to work with dependency updates

Author: nsdeschenes

services/super-admin/package-lock.json

@@ -13,7 +13,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "arango-tools": "0.2.3",
+    "arango-tools": "0.3.0",
     "bcryptjs": "^2.4.3",
     "dotenv-safe": "^8.2.0"
   },

services/super-admin/package.json

@@ -56,10 +56,10 @@ describe('given the createSuperAdminAccount function', () => {
     })
   })
   describe('given an unsuccessful creation', () => {
-    describe('transaction run error occurs', () => {
+    describe('transaction step error occurs', () => {
       it('throws an error', async () => {
         const mockedTransaction = jest.fn().mockReturnValueOnce({
-          run() {
+          step() {
             throw new Error('Database error occurred.')
           },
           commit() {
@@ -76,7 +76,7 @@ describe('given the createSuperAdminAccount function', () => {
         } catch (err) {
           expect(err).toEqual(
             new Error(
-              'Transaction run error occurred while creating new super admin account: Error: Database error occurred.',
+              'Transaction step error occurred while creating new super admin account: Error: Database error occurred.',
             ),
           )
         }
@@ -85,7 +85,7 @@ describe('given the createSuperAdminAccount function', () => {
     describe('transaction commit error occurs', () => {
       it('throws an error', async () => {
         const mockedTransaction = jest.fn().mockReturnValueOnce({
-          run() {
+          step() {
             return 'string'
           },
           commit() {

services/super-admin/src/__tests__/create-super-admin-account.test.js

@@ -61,10 +61,10 @@ describe('given the createSuperAdminAffiliation function', () => {
     })
   })
   describe('given an unsuccessful creation', () => {
-    describe('transaction run error occurs', () => {
+    describe('transaction step error occurs', () => {
       it('throws an error', async () => {
         const mockedTransaction = jest.fn().mockReturnValueOnce({
-          run() {
+          step() {
             throw new Error('Database error occurred.')
           },
           commit() {
@@ -89,7 +89,7 @@ describe('given the createSuperAdminAffiliation function', () => {
         } catch (err) {
           expect(err).toEqual(
             new Error(
-              'Transaction run error occurred while creating new super admin affiliation: Error: Database error occurred.',
+              'Transaction step error occurred while creating new super admin affiliation: Error: Database error occurred.',
             ),
           )
         }
@@ -98,7 +98,7 @@ describe('given the createSuperAdminAffiliation function', () => {
     describe('transaction commit error occurs', () => {
       it('throws an error', async () => {
         const mockedTransaction = jest.fn().mockReturnValueOnce({
-          run() {
+          step() {
             return 'string'
           },
           commit() {

services/super-admin/src/__tests__/create-super-admin-affiliation.test.js

@@ -54,10 +54,10 @@ describe('given the createSuperAdminOrg function', () => {
     })
   })
   describe('given an unsuccessful creation', () => {
-    describe('transaction run error occurs', () => {
+    describe('transaction step error occurs', () => {
       it('throws an error', async () => {
         const mockedTransaction = jest.fn().mockReturnValueOnce({
-          run() {
+          step() {
             throw new Error('Database error occurred.')
           },
           commit() {
@@ -73,7 +73,7 @@ describe('given the createSuperAdminOrg function', () => {
         } catch (err) {
           expect(err).toEqual(
             new Error(
-              'Transaction run error occurred while creating new super admin org: Error: Database error occurred.',
+              'Transaction step error occurred while creating new super admin org: Error: Database error occurred.',
             ),
           )
         }
@@ -82,7 +82,7 @@ describe('given the createSuperAdminOrg function', () => {
     describe('transaction commit error occurs', () => {
       it('throws an error', async () => {
         const mockedTransaction = jest.fn().mockReturnValueOnce({
-          run() {
+          step() {
             return 'string'
           },
           commit() {

services/super-admin/src/__tests__/create-super-admin-org.test.js

@@ -62,7 +62,7 @@ describe('given the removeSuperAdminAffiliation function', () => {
     describe('database error occurs', () => {
       it('throws an error', async () => {
         const mockedTransaction = jest.fn().mockReturnValueOnce({
-          run() {
+          step() {
             throw new Error('Database error occurred.')
           },
           commit() {
@@ -79,7 +79,7 @@ describe('given the removeSuperAdminAffiliation function', () => {
         } catch (err) {
           expect(err).toEqual(
             new Error(
-              'Transaction run error occurred well removing super admin affiliation: Error: Database error occurred.',
+              'Transaction step error occurred well removing super admin affiliation: Error: Database error occurred.',
             ),
           )
         }
@@ -88,7 +88,7 @@ describe('given the removeSuperAdminAffiliation function', () => {
     describe('cursor error occurs', () => {
       it('throws an error', async () => {
         const mockedTransaction = jest.fn().mockReturnValueOnce({
-          run() {
+          step() {
             return 'string'
           },
           commit() {

services/super-admin/src/__tests__/remove-super-admin-affiliation.test.js

@@ -21,7 +21,7 @@ const createSuperAdminAccount = async ({
 
   let user
   try {
-    await trx.run(async () => {
+    await trx.step(async () => {
       user = await collections.users.save({
         displayName: SA_USER_DISPLAY_NAME,
         userName: SA_USER_USERNAME,
@@ -35,7 +35,7 @@ const createSuperAdminAccount = async ({
     })
   } catch (err) {
     throw new Error(
-      `Transaction run error occurred while creating new super admin account: ${err}`,
+      `Transaction step error occurred while creating new super admin account: ${err}`,
     )
   }
 

services/super-admin/src/database/create-super-admin-account.js

@@ -15,7 +15,7 @@ const createSuperAdminAffiliation = async ({
 
   let affiliation
   try {
-    await trx.run(async () => {
+    await trx.step(async () => {
       affiliation = await collections.affiliations.save({
         _from: org._id,
         _to: admin._id,
@@ -25,7 +25,7 @@ const createSuperAdminAffiliation = async ({
     })
   } catch (err) {
     throw new Error(
-      `Transaction run error occurred while creating new super admin affiliation: ${err}`,
+      `Transaction step error occurred while creating new super admin affiliation: ${err}`,
     )
   }
 

services/super-admin/src/database/create-super-admin-affiliation.js

@@ -29,7 +29,7 @@ const createSuperAdminOrg = async ({ collections, transaction }) => {
 
   let org
   try {
-    await trx.run(async () => {
+    await trx.step(async () => {
       org = await collections.organizations.save({
         verified: false,
         orgDetails: {
@@ -58,7 +58,7 @@ const createSuperAdminOrg = async ({ collections, transaction }) => {
     })
   } catch (err) {
     throw new Error(
-      `Transaction run error occurred while creating new super admin org: ${err}`,
+      `Transaction step error occurred while creating new super admin org: ${err}`,
     )
   }
 

services/super-admin/src/database/create-super-admin-org.js

@@ -13,7 +13,7 @@ const removeSuperAdminAffiliation = async ({
   const trx = await transaction(collectionStrings)
 
   try {
-    await trx.run(async () => {
+    await trx.step(async () => {
       await query`
         FOR affiliation IN affiliations
           FILTER affiliation.defaultSA == true
@@ -23,7 +23,7 @@ const removeSuperAdminAffiliation = async ({
     })
   } catch (err) {
     throw new Error(
-      `Transaction run error occurred well removing super admin affiliation: ${err}`,
+      `Transaction step error occurred well removing super admin affiliation: ${err}`,
     )
   }