refactor: Make db:setup init stage of migrate

.travis.yml

@@ -19,7 +19,7 @@ before_script:
   - docker-compose -f docker-compose.yml -f docker-compose.build-and-test.yml build # just tagging, just be quite fast
   - docker-compose -f docker-compose.yml -f docker-compose.build-and-test.yml up -d
   - wait-on http://localhost:7474
-  - docker-compose  -f docker-compose.yml -f docker-compose.build-and-test.yml exec neo4j db_setup
+  - docker-compose  -f docker-compose.yml -f docker-compose.build-and-test.yml exec backend yarn run db:migrate init
 
 script:
   - export CYPRESS_RETRIES=1

backend/README.md

@@ -61,7 +61,7 @@ backend is running:
 {% tabs %}
 {% tab title="Docker" %}
 ```bash
-docker-compose exec backend yarn run db:setup
+docker-compose exec backend yarn run db:migrate init
 ```
 {% endtab %}
 
@@ -69,7 +69,7 @@ docker-compose exec backend yarn run db:setup
 ```bash
 # in folder backend/
 # make sure your database is running on http://localhost:7474/browser/
-yarn run db:setup
+yarn run db:migrate init
 ```
 {% endtab %}
 {% endtabs %}
@@ -94,7 +94,7 @@ $ docker-compose exec backend yarn run db:reset
 # you could also wipe out your neo4j database and delete all volumes with:
 $ docker-compose down -v
 # if container is not running, run this command to set up your database indeces and contstraints
-$ docker-compose run neo4j db_setup
+$ docker-compose run backend yarn run db:migrate init
 ```
 {% endtab %}
 

backend/package.json

@@ -10,9 +10,9 @@
     "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql",
     "lint": "eslint src --config .eslintrc.js",
     "test": "jest --forceExit --detectOpenHandles --runInBand",
-    "db:reset": "babel-node src/seed/reset-db.js",
+    "db:clean": "babel-node src/db/clean.js",
-    "db:seed": "babel-node src/seed/seed-db.js",
+    "db:reset": "yarn run db:clean",
-    "db:setup": "babel-node src/db/setup.js",
+    "db:seed": "babel-node src/db/seed.js",
     "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations",
     "db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js",
     "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js create",

backend/src/activitypub/routes/webfinger.spec.js

@@ -1,6 +1,6 @@
 import { handler } from './webfinger'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
-import { getDriver } from '../../bootstrap/neo4j'
+import { getDriver } from '../../db/neo4j'
 
 let resource, res, json, status, contentType
 

backend/src/db/clean.js

@@ -1,4 +1,4 @@
-import { cleanDatabase } from './factories'
+import { cleanDatabase } from '../factories'
 
 if (process.env.NODE_ENV === 'production') {
   throw new Error(`You cannot clean the database in production environment!`)

backend/src/db/migrate/store.js

@@ -1,6 +1,14 @@
-import { getDriver } from '../../bootstrap/neo4j'
+import { getDriver, getNeode } from '../../db/neo4j'
 
 class Store {
+  async init(fn) {
+    const neode = getNeode()
+    await getNeode().schema.install()
+    // eslint-disable-next-line no-console
+    console.log('Successfully created database indices and constraints!')
+    neode.driver.close()
+  }
+
   async load(fn) {
     const driver = getDriver()
     const session = driver.session()

backend/src/db/migrations/1579387929122-merge_duplicate_user_accounts.js

@@ -1,8 +1,7 @@
-import { throwError, of, concat } from 'rxjs'
+import { throwError, concat } from 'rxjs'
-import { tap, flatMap, mergeMap, map, catchError, filter } from 'rxjs/operators'
+import { flatMap, mergeMap, map, catchError, filter } from 'rxjs/operators'
-import CONFIG from '../../src/config'
+import { getDriver } from '../neo4j'
-import { getNeode, getDriver } from '../../src/bootstrap/neo4j'
+import normalizeEmail from '../../schema/resolvers//helpers/normalizeEmail'
-import normalizeEmail from '../../src/schema/resolvers//helpers/normalizeEmail'
 
 export const description = `
   This migration merges duplicate :User and :EmailAddress nodes. It became
@@ -13,7 +12,7 @@ export const description = `
 
   This led to about 40 duplicate user and email address nodes in our database.
 `
-export function up (next) {
+export function up(next) {
   const driver = getDriver()
   const rxSession = driver.rxSession()
   rxSession
@@ -22,18 +21,19 @@ export function up (next) {
       flatMap(txc =>
         concat(
           txc
-          .run("MATCH (email:EmailAddress) RETURN email {.email}")
+            .run('MATCH (email:EmailAddress) RETURN email {.email}')
-          .records()
+            .records()
-          .pipe(
+            .pipe(
-            map(record => {
+              map(record => {
-              const { email } = record.get('email')
+                const { email } = record.get('email')
-              const normalizedEmail = normalizeEmail(email)
+                const normalizedEmail = normalizeEmail(email)
-              return { email, normalizedEmail }
+                return { email, normalizedEmail }
-            }),
+              }),
-            filter(({email, normalizedEmail}) => email !== normalizedEmail),
+              filter(({ email, normalizedEmail }) => email !== normalizedEmail),
-            mergeMap(({email, normalizedEmail})=> {
+              mergeMap(({ email, normalizedEmail }) => {
-              return txc
+                return txc
-                .run(`
+                  .run(
+                    `
                   MATCH (oldUser:User)-[:PRIMARY_EMAIL]->(oldEmail:EmailAddress {email: $email}), (oldUser)-[previousRelationship]-(oldEmail)
                   MATCH (user:User)-[:PRIMARY_EMAIL]->(email:EmailAddress {email: $normalizedEmail})
                   DELETE previousRelationship
@@ -41,37 +41,44 @@ export function up (next) {
                   CALL apoc.refactor.mergeNodes([user, oldUser], { properties: 'discard', mergeRels: true }) YIELD node as mergedUser
                   CALL apoc.refactor.mergeNodes([email, oldEmail], { properties: 'discard', mergeRels: true }) YIELD node as mergedEmail
                   RETURN user {.*}, email {.*}
-              `, { email, normalizedEmail })
+              `,
-                .records()
+                    { email, normalizedEmail },
-                .pipe(
+                  )
-                  map(r => ({
+                  .records()
-                    oldEmail: email,
+                  .pipe(
-                    email: r.get('email'),
+                    map(r => ({
-                    user: r.get('user'),
+                      oldEmail: email,
-                  }))
+                      email: r.get('email'),
-                )
+                      user: r.get('user'),
-            }),
+                    })),
-          ),
+                  )
+              }),
+            ),
           txc.commit(),
-        ).pipe(catchError(err => txc.rollback().pipe(throwError(err))))
+        ).pipe(catchError(err => txc.rollback().pipe(throwError(err)))),
-      )
+      ),
     )
     .subscribe({
-      next: ({ user, email, oldUser, oldEmail }) => console.log(`
+      next: ({ user, email, oldUser, oldEmail }) =>
-    Merged:
+        // eslint-disable-next-line no-console
-    =============================
+        console.log(`
-    userId: ${user.id}
+          Merged:
-    email: ${oldEmail} => ${email.email}
+          =============================
-    =============================
+          userId: ${user.id}
-    `),
+          email: ${oldEmail} => ${email.email}
+          =============================
+        `),
       complete: () => {
+        // eslint-disable-next-line no-console
         console.log('Merging of duplicate users completed')
         next()
       },
-      error: error => throw new Error(error)
+      error: error => {
+        throw new Error(error)
+      },
     })
 }
 
-export function down () {
+export function down() {
-  throw new Error("Irreversible migration")
+  throw new Error('Irreversible migration')
 }

backend/src/db/seed.js

@@ -2,8 +2,8 @@ import faker from 'faker'
 import sample from 'lodash/sample'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../server'
-import Factory from './factories'
+import Factory from '../factories'
-import { getNeode, getDriver } from '../bootstrap/neo4j'
+import { getNeode, getDriver } from '../db/neo4j'
 import { gql } from '../helpers/jest'
 
 const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']

backend/src/db/setup.js

@@ -1,7 +0,0 @@
-import { getNeode } from '../bootstrap/neo4j'
-
-(async() => {
-  await getNeode().schema.install()
-  console.log('Schema installed!')
-  process.exit(0)
-})()

backend/src/factories/index.js

@@ -1,4 +1,4 @@
-import { getDriver, getNeode } from '../../bootstrap/neo4j'
+import { getDriver, getNeode } from '../db/neo4j'
 
 const factories = {
   Badge: require('./badges.js').default,

backend/src/factories/users.js

@@ -1,6 +1,6 @@
 import faker from 'faker'
 import uuid from 'uuid/v4'
-import encryptPassword from '../../helpers/encryptPassword'
+import encryptPassword from '../helpers/encryptPassword'
 import slugify from 'slug'
 
 export default function create() {

backend/src/jest/helpers.js

@@ -1,5 +0,0 @@
-//* This is a fake ES2015 template string, just to benefit of syntax
-// highlighting of `gql` template strings in certain editors.
-export function gql(strings) {
-  return strings.join('')
-}

backend/src/jwt/decode.spec.js

@@ -1,5 +1,5 @@
-import Factory from '../seed/factories/index'
+import Factory from '../factories/index'
-import { getDriver, getNeode } from '../bootstrap/neo4j'
+import { getDriver, getNeode } from '../db/neo4j'
 import decode from './decode'
 
 const factory = Factory()

backend/src/middleware/hashtags/hashtagsMiddleware.spec.js

@@ -1,7 +1,7 @@
 import { gql } from '../../helpers/jest'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { createTestClient } from 'apollo-server-testing'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 let server

backend/src/middleware/notifications/notificationsMiddleware.spec.js

@@ -1,7 +1,7 @@
 import { gql } from '../../helpers/jest'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { createTestClient } from 'apollo-server-testing'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 let server, query, mutate, notifiedUser, authenticatedUser

backend/src/middleware/orderByMiddleware.spec.js

@@ -1,6 +1,6 @@
 import { gql } from '../helpers/jest'
-import Factory from '../seed/factories'
+import Factory from '../factories'
-import { getNeode, getDriver } from '../bootstrap/neo4j'
+import { getNeode, getDriver } from '../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../server'
 

backend/src/middleware/permissionsMiddleware.js

@@ -1,5 +1,5 @@
 import { rule, shield, deny, allow, or } from 'graphql-shield'
-import { getNeode } from '../bootstrap/neo4j'
+import { getNeode } from '../db/neo4j'
 import CONFIG from '../config'
 
 const debug = !!CONFIG.DEBUG

backend/src/middleware/permissionsMiddleware.spec.js

@@ -1,8 +1,8 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../server'
-import Factory from '../seed/factories'
+import Factory from '../factories'
 import { gql } from '../helpers/jest'
-import { getDriver, getNeode } from '../bootstrap/neo4j'
+import { getDriver, getNeode } from '../db/neo4j'
 
 const factory = Factory()
 const instance = getNeode()

backend/src/middleware/slugifyMiddleware.spec.js

@@ -1,6 +1,6 @@
-import Factory from '../seed/factories'
+import Factory from '../factories'
 import { gql } from '../helpers/jest'
-import { getNeode, getDriver } from '../bootstrap/neo4j'
+import { getNeode, getDriver } from '../db/neo4j'
 import createServer from '../server'
 import { createTestClient } from 'apollo-server-testing'
 

backend/src/middleware/softDelete/softDeleteMiddleware.spec.js

@@ -1,6 +1,6 @@
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 

backend/src/middleware/validation/validationMiddleware.spec.js

@@ -1,6 +1,6 @@
 import { gql } from '../../helpers/jest'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
 

backend/src/models/User.spec.js

@@ -1,5 +1,5 @@
-import Factory from '../seed/factories'
+import Factory from '../factories'
-import { getNeode } from '../bootstrap/neo4j'
+import { getNeode } from '../db/neo4j'
 
 const factory = Factory()
 const neode = getNeode()

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

@@ -1,8 +1,8 @@
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 
 const driver = getDriver()
 const neode = getNeode()

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

@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 let mutate, query, authenticatedUser, variables

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

@@ -1,6 +1,6 @@
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getDriver, getNeode } from '../../bootstrap/neo4j'
+import { getDriver, getNeode } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 

backend/src/schema/resolvers/follow.js

@@ -1,4 +1,4 @@
-import { getNeode } from '../../bootstrap/neo4j'
+import { getNeode } from '../../db/neo4j'
 
 const neode = getNeode()
 

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

@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
-import { getDriver, getNeode } from '../../bootstrap/neo4j'
+import { getDriver, getNeode } from '../../db/neo4j'
 import createServer from '../../server'
 import { gql } from '../../helpers/jest'
 

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

@@ -1,6 +1,6 @@
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 

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

@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 const factory = Factory()

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

@@ -1,6 +1,6 @@
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getDriver } from '../../bootstrap/neo4j'
+import { getDriver } from '../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../.././server'
 

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

@@ -1,6 +1,6 @@
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createPasswordReset from './helpers/createPasswordReset'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'

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

@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 const driver = getDriver()

backend/src/schema/resolvers/registration.js

@@ -1,5 +1,5 @@
 import { UserInputError } from 'apollo-server'
-import { getNeode } from '../../bootstrap/neo4j'
+import { getNeode } from '../../db/neo4j'
 import fileUpload from './fileUpload'
 import encryptPassword from '../../helpers/encryptPassword'
 import generateNonce from './helpers/generateNonce'

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

@@ -1,6 +1,6 @@
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getDriver, getNeode } from '../../bootstrap/neo4j'
+import { getDriver, getNeode } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 

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

@@ -1,8 +1,8 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../.././server'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getDriver, getNeode } from '../../bootstrap/neo4j'
+import { getDriver, getNeode } from '../../db/neo4j'
 
 const factory = Factory()
 const instance = getNeode()

backend/src/schema/resolvers/rewards.js

@@ -1,4 +1,4 @@
-import { getNeode } from '../../bootstrap/neo4j'
+import { getNeode } from '../../db/neo4j'
 import { UserInputError } from 'apollo-server'
 
 const neode = getNeode()

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

@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 const factory = Factory()

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

@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 let mutate, query, authenticatedUser, variables

backend/src/schema/resolvers/socialMedia.js

@@ -1,4 +1,4 @@
-import { getNeode } from '../../bootstrap/neo4j'
+import { getNeode } from '../../db/neo4j'
 import Resolver from './helpers/Resolver'
 
 const neode = getNeode()

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

@@ -1,8 +1,8 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 
 const driver = getDriver()
 const factory = Factory()

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

@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
 let query, authenticatedUser

backend/src/schema/resolvers/user_management.js

@@ -1,7 +1,7 @@
 import encode from '../../jwt/encode'
 import bcrypt from 'bcryptjs'
 import { AuthenticationError } from 'apollo-server'
-import { getNeode } from '../../bootstrap/neo4j'
+import { getNeode } from '../../db/neo4j'
 import normalizeEmail from './helpers/normalizeEmail'
 import log from './helpers/databaseLogger'
 

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

@@ -1,11 +1,11 @@
 import jwt from 'jsonwebtoken'
 import CONFIG from './../../config'
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
 import { createTestClient } from 'apollo-server-testing'
 import createServer, { context } from '../../server'
 import encode from '../../jwt/encode'
-import { getNeode } from '../../bootstrap/neo4j'
+import { getNeode } from '../../db/neo4j'
 
 const factory = Factory()
 const neode = getNeode()

backend/src/schema/resolvers/users.js

@@ -1,6 +1,6 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import fileUpload from './fileUpload'
-import { getNeode } from '../../bootstrap/neo4j'
+import { getNeode } from '../../db/neo4j'
 import { UserInputError, ForbiddenError } from 'apollo-server'
 import Resolver from './helpers/Resolver'
 import log from './helpers/databaseLogger'

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

@@ -1,6 +1,6 @@
-import Factory from '../../seed/factories'
+import Factory from '../../factories'
 import { gql } from '../../helpers/jest'
-import { getNeode, getDriver } from '../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 

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

@@ -1,8 +1,8 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../../server'
-import Factory from '../../../seed/factories'
+import Factory from '../../../factories'
 import { gql } from '../../../helpers/jest'
-import { getNeode, getDriver } from '../../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../../db/neo4j'
 
 const driver = getDriver()
 const factory = Factory()

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

@@ -1,6 +1,6 @@
 import { gql } from '../../../helpers/jest'
-import Factory from '../../../seed/factories'
+import Factory from '../../../factories'
-import { getNeode, getDriver } from '../../../bootstrap/neo4j'
+import { getNeode, getDriver } from '../../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../../server'
 

backend/src/seed/seed-helpers.js

@@ -1,134 +0,0 @@
-const _ = require('lodash')
-const faker = require('faker')
-const unsplashTopics = [
-  'love',
-  'family',
-  'spring',
-  'business',
-  'nature',
-  'travel',
-  'happy',
-  'landscape',
-  'health',
-  'friends',
-  'computer',
-  'autumn',
-  'space',
-  'animal',
-  'smile',
-  'face',
-  'people',
-  'portrait',
-  'amazing',
-]
-let unsplashTopicsTmp = []
-
-const ngoLogos = [
-  'http://www.fetchlogos.com/wp-content/uploads/2015/11/Girl-Scouts-Of-The-Usa-Logo.jpg',
-  'http://logos.textgiraffe.com/logos/logo-name/Ngo-designstyle-friday-m.png',
-  'http://seeklogo.com/images/N/ngo-logo-BD53A3E024-seeklogo.com.png',
-  'https://dcassetcdn.com/design_img/10133/25833/25833_303600_10133_image.jpg',
-  'https://cdn.tutsplus.com/vector/uploads/legacy/articles/08bad_ngologos/20.jpg',
-  'https://cdn.tutsplus.com/vector/uploads/legacy/articles/08bad_ngologos/33.jpg',
-  null,
-]
-
-const difficulties = ['easy', 'medium', 'hard']
-
-export default {
-  randomItem: (items, filter) => {
-    const ids = filter
-      ? Object.keys(items).filter(id => {
-          return filter(items[id])
-        })
-      : _.keys(items)
-    const randomIds = _.shuffle(ids)
-    return items[randomIds.pop()]
-  },
-  randomItems: (items, key = 'id', min = 1, max = 1) => {
-    const randomIds = _.shuffle(_.keys(items))
-    const res = []
-
-    const count = _.random(min, max)
-
-    for (let i = 0; i < count; i++) {
-      let r = items[randomIds.pop()][key]
-      if (key === 'id') {
-        r = r.toString()
-      }
-      res.push(r)
-    }
-    return res
-  },
-  random: items => {
-    return _.shuffle(items).pop()
-  },
-  randomDifficulty: () => {
-    return _.shuffle(difficulties).pop()
-  },
-  randomLogo: () => {
-    return _.shuffle(ngoLogos).pop()
-  },
-  randomUnsplashUrl: () => {
-    if (Math.random() < 0.6) {
-      // do not attach images in 60 percent of the cases (faster seeding)
-      return
-    }
-    if (unsplashTopicsTmp.length < 2) {
-      unsplashTopicsTmp = _.shuffle(unsplashTopics)
-    }
-    return (
-      'https://source.unsplash.com/daily?' + unsplashTopicsTmp.pop() + ',' + unsplashTopicsTmp.pop()
-    )
-  },
-  randomCategories: (seederstore, allowEmpty = false) => {
-    let count = Math.round(Math.random() * 3)
-    if (allowEmpty === false && count === 0) {
-      count = 1
-    }
-    const categorieIds = _.shuffle(_.keys(seederstore.categories))
-    const ids = []
-    for (let i = 0; i < count; i++) {
-      ids.push(categorieIds.pop())
-    }
-    return ids
-  },
-  randomAddresses: () => {
-    const count = Math.round(Math.random() * 3)
-    const addresses = []
-    for (let i = 0; i < count; i++) {
-      addresses.push({
-        city: faker.address.city(),
-        zipCode: faker.address.zipCode(),
-        street: faker.address.streetAddress(),
-        country: faker.address.countryCode(),
-        lat: 54.032726 - Math.random() * 10,
-        lng: 6.558838 + Math.random() * 10,
-      })
-    }
-    return addresses
-  },
-  /**
-   * Get array of ids from the given seederstore items after mapping them by the key in the values
-   *
-   * @param items  items from the seederstore
-   * @param values values for which you need the ids
-   * @param key    the field key that is represented in the values (slug, name, etc.)
-   */
-  mapIdsByKey: (items, values, key) => {
-    const res = []
-    values.forEach(value => {
-      res.push(_.find(items, [key, value]).id.toString())
-    })
-    return res
-  },
-  genInviteCode: () => {
-    const chars = '23456789abcdefghkmnpqrstuvwxyzABCDEFGHJKLMNPRSTUVWXYZ'
-    let code = ''
-    for (let i = 0; i < 8; i++) {
-      const n = _.random(0, chars.length - 1)
-      code += chars.substr(n, 1)
-    }
-    return code
-  },
-}

backend/src/server.js

@@ -3,7 +3,7 @@ import helmet from 'helmet'
 import { ApolloServer } from 'apollo-server-express'
 import CONFIG from './config'
 import middleware from './middleware'
-import { getNeode, getDriver } from './bootstrap/neo4j'
+import { getNeode, getDriver } from './db/neo4j'
 import decode from './jwt/decode'
 import schema from './schema'
 import webfinger from './activitypub/routes/webfinger'

backend/test/features/support/steps.js

@@ -3,7 +3,7 @@ import { Given, When, Then, AfterAll } from 'cucumber'
 import { expect } from 'chai'
 // import { client } from '../../../src/activitypub/apollo-client'
 import { GraphQLClient } from 'graphql-request'
-import Factory from '../../../src/seed/factories'
+import Factory from '../../../src/factories'
 const debug = require('debug')('ea:test:steps')
 
 const factory = Factory()

cypress/support/factories.js

@@ -1,5 +1,5 @@
-import Factory from '../../backend/src/seed/factories'
+import Factory from '../../backend/src/factories'
-import { getDriver, getNeode } from '../../backend/src/bootstrap/neo4j'
+import { getDriver, getNeode } from '../../backend/src/db/neo4j'
 
 const neo4jConfigs = {
   uri: Cypress.env('NEO4J_URI'),

features/support/steps.js

@@ -1,6 +1,6 @@
 // features/support/steps.js
 import { Given, When, Then, After, AfterAll } from 'cucumber'
-import Factory from '../../backend/src/seed/factories'
+import Factory from '../../backend/src/factories'
 import dotenv from 'dotenv'
 import expect from 'expect'