Merge pull request #2828 from Human-Connection/neo4j_data_migrations

feat(db): Setup neo4j data migrations

.travis.yml

@@ -18,7 +18,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

@@ -53,6 +53,27 @@ can issue GraphQL requests or access GraphQL Playground in the browser.
 
 ![GraphQL Playground](../.gitbook/assets/graphql-playground.png)
 
+### Database Indices and Constraints
+
+Database indices and constraints need to be created when the database and the
+backend is running:
+
+{% tabs %}
+{% tab title="Docker" %}
+```bash
+docker-compose exec backend yarn run db:migrate init
+```
+{% endtab %}
+
+{% tab title="Without Docker" %}
+```bash
+# in folder backend/
+# make sure your database is running on http://localhost:7474/browser/
+yarn run db:migrate init
+```
+{% endtab %}
+{% endtabs %}
+
 
 #### Seed Database
 
@@ -73,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 %}
 
@@ -90,6 +111,38 @@ $ yarn run db:reset
 {% endtab %}
 {% endtabs %}
 
+### Data migrations
+
+Although Neo4J is schema-less,you might find yourself in a situation in which
+you have to migrate your data e.g. because your data modeling has changed.
+
+{% tabs %}
+{% tab title="Docker" %}
+Generate a data migration file:
+```bash
+$ docker-compose exec backend yarn run db:migrate:create your_data_migration
+# Edit the file in ./src/db/migrations/
+```
+
+To run the migration:
+```bash
+$ docker-compose exec backend yarn run db:migrate up
+```
+{% endtab %}
+{% tab title="Without Docker" %}
+Generate a data migration file:
+```bash
+$ yarn run db:migrate:create your_data_migration
+# Edit the file in ./src/db/migrations/
+```
+
+To run the migration:
+```bash
+$ yarn run db:migrate up
+```
+{% endtab %}
+{% endtabs %}
+
 # Testing
 
 **Beware**: We have no multiple database setup at the moment. We clean the

backend/package.json

@@ -4,14 +4,19 @@
   "description": "GraphQL Backend for Human Connection",
   "main": "src/index.js",
   "scripts": {
-    "build": "babel src/ -d dist/ --copy-files",
+    "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations",
+    "prod:migrate": "migrate --migrations-dir ./dist/db/migrations --store ./dist/db/migrate/store.js",
     "start": "node dist/",
+    "build": "babel src/ -d dist/ --copy-files",
     "dev": "nodemon --exec babel-node src/ -e js,gql",
     "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:seed": "babel-node src/seed/seed-db.js"
+    "db:clean": "babel-node src/db/clean.js",
+    "db:reset": "yarn run db:clean",
+    "db:seed": "babel-node src/db/seed.js",
+    "db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js",
+    "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js --date-format 'yyyymmddHHmmss' create"
   },
   "author": "Human Connection gGmbH",
   "license": "MIT",
@@ -78,6 +83,7 @@
     "metascraper-url": "^5.10.6",
     "metascraper-video": "^5.10.5",
     "metascraper-youtube": "^5.10.6",
+    "migrate": "^1.6.2",
     "minimatch": "^3.0.4",
     "mustache": "^4.0.0",
     "neo4j-driver": "^4.0.1",
@@ -102,7 +108,7 @@
     "@babel/node": "~7.8.3",
     "@babel/plugin-proposal-throw-expressions": "^7.8.3",
     "@babel/preset-env": "~7.8.3",
-    "@babel/register": "~7.8.3",
+    "@babel/register": "^7.8.3",
     "apollo-server-testing": "~2.9.16",
     "babel-core": "~7.0.0-0",
     "babel-eslint": "~10.0.3",

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

@@ -1,6 +1,6 @@
 import { handler } from './webfinger'
-import Factory from '../../seed/factories'
-import { getDriver } from '../../bootstrap/neo4j'
+import Factory from '../../factories'
+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

@@ -0,0 +1,97 @@
+import { getDriver, getNeode } from '../../db/neo4j'
+
+class Store {
+  async init(next) {
+    const neode = getNeode()
+    const { driver } = neode
+    const session = driver.session()
+    // eslint-disable-next-line no-console
+    const writeTxResultPromise = session.writeTransaction(async txc => {
+      await txc.run('CALL apoc.schema.assert({},{},true)') // drop all indices
+      return Promise.all(
+        [
+          'CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"])',
+          'CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])',
+        ].map(statement => txc.run(statement)),
+      )
+    })
+    try {
+      await writeTxResultPromise
+      await getNeode().schema.install()
+      // eslint-disable-next-line no-console
+      console.log('Successfully created database indices and constraints!')
+      next()
+    } catch (error) {
+      console.log(error) // eslint-disable-line no-console
+      next(error, null)
+    } finally {
+      session.close()
+      driver.close()
+    }
+  }
+
+  async load(next) {
+    const driver = getDriver()
+    const session = driver.session()
+    const readTxResultPromise = session.readTransaction(async txc => {
+      const result = await txc.run(
+        'MATCH (migration:Migration) RETURN migration {.*} ORDER BY migration.timestamp DESC',
+      )
+      return result.records.map(r => r.get('migration'))
+    })
+    try {
+      const migrations = await readTxResultPromise
+      if (migrations.length <= 0) {
+        // eslint-disable-next-line no-console
+        console.log(
+          "No migrations found in database. If it's the first time you run migrations, then this is normal.",
+        )
+        return next(null, {})
+      }
+      const [{ title: lastRun }] = migrations
+      next(null, { lastRun, migrations })
+    } catch (error) {
+      console.log(error) // eslint-disable-line no-console
+      next(error)
+    } finally {
+      session.close()
+    }
+  }
+
+  async save(set, next) {
+    const driver = getDriver()
+    const session = driver.session()
+    const { migrations } = set
+    const writeTxResultPromise = session.writeTransaction(txc => {
+      return Promise.all(
+        migrations.map(async migration => {
+          const { title, description, timestamp } = migration
+          const properties = { title, description, timestamp }
+          const migrationResult = await txc.run(
+            `
+              MERGE (migration:Migration { title: $properties.title })
+              ON MATCH SET
+              migration += $properties
+              ON CREATE SET
+              migration += $properties,
+              migration.migratedAt = toString(datetime())
+            `,
+            { properties },
+          )
+          return migrationResult
+        }),
+      )
+    })
+    try {
+      await writeTxResultPromise
+      next()
+    } catch (error) {
+      console.log(error) // eslint-disable-line no-console
+      next(error)
+    } finally {
+      session.close()
+    }
+  }
+}
+
+module.exports = Store

backend/src/db/migrate/template.js

@@ -0,0 +1,31 @@
+import { getDriver } from '../../db/neo4j'
+
+export const description = ''
+
+export function up(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  try {
+    // Implement your migration here.
+    next()
+  } catch (err) {
+    next(err)
+  } finally {
+    session.close()
+    driver.close()
+  }
+}
+
+export function down(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  try {
+    // Rollback your migration here.
+    next()
+  } catch (err) {
+    next(err)
+  } finally {
+    session.close()
+    driver.close()
+  }
+}

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

@@ -0,0 +1,84 @@
+import { throwError, concat } from 'rxjs'
+import { flatMap, mergeMap, map, catchError, filter } from 'rxjs/operators'
+import { getDriver } from '../neo4j'
+import normalizeEmail from '../../schema/resolvers//helpers/normalizeEmail'
+
+export const description = `
+  This migration merges duplicate :User and :EmailAddress nodes. It became
+  necessary after we implemented the email normalization but forgot to migrate
+  the existing data. Some (40) users decided to just register with a new account
+  but the same email address. On signup our backend would normalize the email,
+  which is good, but would also keep the existing unnormalized email address.
+
+  This led to about 40 duplicate user and email address nodes in our database.
+`
+export function up(next) {
+  const driver = getDriver()
+  const rxSession = driver.rxSession()
+  rxSession
+    .beginTransaction()
+    .pipe(
+      flatMap(txc =>
+        concat(
+          txc
+            .run('MATCH (email:EmailAddress) RETURN email {.email}')
+            .records()
+            .pipe(
+              map(record => {
+                const { email } = record.get('email')
+                const normalizedEmail = normalizeEmail(email)
+                return { email, normalizedEmail }
+              }),
+              filter(({ email, normalizedEmail }) => email !== normalizedEmail),
+              mergeMap(({ email, normalizedEmail }) => {
+                return txc
+                  .run(
+                    `
+                  MATCH (oldUser:User)-[:PRIMARY_EMAIL]->(oldEmail:EmailAddress {email: $email}), (oldUser)-[previousRelationship]-(oldEmail)
+                  MATCH (user:User)-[:PRIMARY_EMAIL]->(email:EmailAddress {email: $normalizedEmail})
+                  DELETE previousRelationship
+                  WITH oldUser, oldEmail, user, email
+                  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()
+                  .pipe(
+                    map(r => ({
+                      oldEmail: email,
+                      email: r.get('email'),
+                      user: r.get('user'),
+                    })),
+                  )
+              }),
+            ),
+          txc.commit(),
+        ).pipe(catchError(err => txc.rollback().pipe(throwError(err)))),
+      ),
+    )
+    .subscribe({
+      next: ({ user, email, oldUser, oldEmail }) =>
+        // eslint-disable-next-line no-console
+        console.log(`
+          Merged:
+          =============================
+          userId: ${user.id}
+          email: ${oldEmail} => ${email.email}
+          =============================
+        `),
+      complete: () => {
+        // eslint-disable-next-line no-console
+        console.log('Merging of duplicate users completed')
+        next()
+      },
+      error: error => {
+        next(new Error(error), null)
+      },
+    })
+}
+
+export function down(next) {
+  next(new Error('Irreversible migration'))
+}

backend/src/db/migrations/20200123150110-merge_duplicate_location_nodes.js

@@ -0,0 +1,77 @@
+import { throwError, concat } from 'rxjs'
+import { flatMap, mergeMap, map, catchError } from 'rxjs/operators'
+import { getDriver } from '../neo4j'
+
+export const description = `
+  This migration merges duplicate :Location nodes. It became
+  necessary after we realized that we had not set up constraints for Location.id in production.
+`
+export function up(next) {
+  const driver = getDriver()
+  const rxSession = driver.rxSession()
+  rxSession
+    .beginTransaction()
+    .pipe(
+      flatMap(transaction =>
+        concat(
+          transaction
+            .run(
+              `
+                    MATCH (location:Location)
+                    RETURN location {.id}
+                  `,
+            )
+            .records()
+            .pipe(
+              map(record => {
+                const { id: locationId } = record.get('location')
+                return { locationId }
+              }),
+              mergeMap(({ locationId }) => {
+                return transaction
+                  .run(
+                    ` 
+                    MATCH(location:Location {id: $locationId}), (location2:Location {id: $locationId})
+                    WHERE location.id = location2.id AND id(location) < id(location2)
+                    CALL apoc.refactor.mergeNodes([location, location2], { properties: 'combine', mergeRels: true }) YIELD node as updatedLocation
+                    RETURN location {.*},updatedLocation {.*}
+                  `,
+                    { locationId },
+                  )
+                  .records()
+                  .pipe(
+                    map(record => ({
+                      location: record.get('location'),
+                      updatedLocation: record.get('updatedLocation'),
+                    })),
+                  )
+              }),
+            ),
+          transaction.commit(),
+        ).pipe(catchError(error => transaction.rollback().pipe(throwError(error)))),
+      ),
+    )
+    .subscribe({
+      next: ({ updatedLocation, location }) =>
+        // eslint-disable-next-line no-console
+        console.log(`
+          Merged:
+          =============================
+          locationId: ${location.id}
+          updatedLocation: ${location.id} => ${updatedLocation.id}
+          =============================
+        `),
+      complete: () => {
+        // eslint-disable-next-line no-console
+        console.log('Merging of duplicate locations completed')
+        next()
+      },
+      error: error => {
+        next(new Error(error), null)
+      },
+    })
+}
+
+export function down(next) {
+  next(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 { getNeode, getDriver } from '../bootstrap/neo4j'
+import Factory from '../factories'
+import { getNeode, getDriver } from '../db/neo4j'
 import { gql } from '../helpers/jest'
 
 const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']

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 { getDriver, getNeode } from '../bootstrap/neo4j'
+import Factory from '../factories/index'
+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 { getNeode, getDriver } from '../bootstrap/neo4j'
+import Factory from '../factories'
+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 { getNeode, getDriver } from '../../bootstrap/neo4j'
+import Factory from '../../factories'
+import { getNeode, getDriver } from '../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
 

backend/src/models/Category.js

@@ -3,7 +3,7 @@ import uuid from 'uuid/v4'
 export default {
   id: { type: 'string', primary: true, default: uuid },
   name: { type: 'string', required: true, default: false },
-  slug: { type: 'string' },
+  slug: { type: 'string', unique: 'true' },
   icon: { type: 'string', required: true, default: false },
   createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
   updatedAt: {

backend/src/models/Migration.js

@@ -0,0 +1,5 @@
+export default {
+  title: { type: 'string', primary: true, token: true },
+  description: { type: 'string' },
+  migratedAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+}

backend/src/models/Post.js

@@ -11,7 +11,7 @@ export default {
     direction: 'in',
   },
   title: { type: 'string', disallow: [null], min: 3 },
-  slug: { type: 'string', allow: [null] },
+  slug: { type: 'string', allow: [null], unique: 'true' },
   content: { type: 'string', disallow: [null], min: 3 },
   contentExcerpt: { type: 'string', allow: [null] },
   image: { type: 'string', allow: [null] },

backend/src/models/UnverifiedEmailAddress.js

@@ -1,5 +1,5 @@
 export default {
-  email: { type: 'string', primary: true, lowercase: true, email: true },
+  email: { type: 'string', lowercase: true, email: true },
   createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
   nonce: { type: 'string', token: true },
   belongsTo: {

backend/src/models/User.js

@@ -4,7 +4,7 @@ export default {
   id: { type: 'string', primary: true, default: uuid }, // TODO: should be type: 'uuid' but simplified for our tests
   actorId: { type: 'string', allow: [null] },
   name: { type: 'string', disallow: [null], min: 3 },
-  slug: { type: 'string', regex: /^[a-z0-9_-]+$/, lowercase: true },
+  slug: { type: 'string', unique: 'true', regex: /^[a-z0-9_-]+$/, lowercase: true },
   encryptedPassword: 'string',
   avatar: { type: 'string', allow: [null] },
   coverImg: { type: 'string', allow: [null] },

backend/src/models/User.spec.js

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

backend/src/models/index.js

@@ -13,4 +13,5 @@ export default {
   Location: require('./Location.js').default,
   Donations: require('./Donations.js').default,
   Report: require('./Report.js').default,
+  Migration: require('./Migration.js').default,
 }

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 { getDriver, getNeode } from '../../bootstrap/neo4j'
+import Factory from '../../factories'
+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/location.spec.js

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

backend/src/schema/resolvers/users/mutedUsers.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/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()

backend/yarn.lock

@@ -758,7 +758,7 @@
     levenary "^1.1.0"
     semver "^5.5.0"
 
-"@babel/register@^7.8.3", "@babel/register@~7.8.3":
+"@babel/register@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.8.3.tgz#5d5d30cfcc918437535d724b8ac1e4a60c5db1f8"
   integrity sha512-t7UqebaWwo9nXWClIPLPloa5pN33A2leVs8Hf0e9g9YwUP8/H9NeR7DJU+4CXo23QtjChQv5a3DjEtT83ih1rg==
@@ -1763,6 +1763,11 @@ ansi-regex@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
 ansi-styles@^3.1.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -2585,6 +2590,17 @@ chalk@2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -2822,6 +2838,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^2.9.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 commander@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
@@ -3119,6 +3140,11 @@ date-fns@2.9.0:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.9.0.tgz#d0b175a5c37ed5f17b97e2272bbc1fa5aec677d2"
   integrity sha512-khbFLu/MlzLjEzy9Gh8oY1hNt/Dvxw3J6Rbc28cVoYWQaC1S3YI4xwkF9ZWcjDLscbZlY9hISMr66RFzZagLsA==
 
+dateformat@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
+  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
+
 dayjs@^1.8.19:
   version "1.8.19"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.19.tgz#5117dc390d8f8e586d53891dbff3fa308f51abfe"
@@ -3541,7 +3567,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3963,7 +3989,6 @@ extsprintf@^1.2.0:
 
 faker@Marak/faker.js#master:
   version "4.1.0"
-  uid "3b2fa4aebccee52ae1bafc15d575061fb30c3cf1"
   resolved "https://codeload.github.com/Marak/faker.js/tar.gz/3b2fa4aebccee52ae1bafc15d575061fb30c3cf1"
 
 fast-deep-equal@^2.0.1:
@@ -4518,6 +4543,13 @@ har-validator@~5.1.0:
     ajv "^6.5.5"
     har-schema "^2.0.0"
 
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -6279,6 +6311,20 @@ micromatch@^4.0.2:
     braces "^3.0.1"
     picomatch "^2.0.5"
 
+migrate@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/migrate/-/migrate-1.6.2.tgz#8970d596780553fe9f545bdf83806df8473f025b"
+  integrity sha512-XAFab+ArPTo9BHzmihKjsZ5THKRryenA+lwob0R+ax0hLDs7YzJFJT5YZE3gtntZgzdgcuFLs82EJFB/Dssr+g==
+  dependencies:
+    chalk "^1.1.3"
+    commander "^2.9.0"
+    dateformat "^2.0.0"
+    dotenv "^4.0.0"
+    inherits "^2.0.3"
+    minimatch "^3.0.3"
+    mkdirp "^0.5.1"
+    slug "^0.9.2"
+
 mime-db@1.40.0:
   version "1.40.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
@@ -6323,7 +6369,7 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-minimatch@^3.0.4:
+minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -7952,6 +7998,13 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
+slug@^0.9.2:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/slug/-/slug-0.9.4.tgz#fad5f1ef33150830c7688cd8500514576eccabd8"
+  integrity sha512-3YHq0TeJ4+AIFbJm+4UWSQs5A1mmeWOTQqydW3OoPmQfNKxlO96NDRTIrp+TBkmvEsEFrd+Z/LXw8OD/6OlZ5g==
+  dependencies:
+    unicode ">= 0.3.1"
+
 slug@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slug/-/slug-2.1.0.tgz#293f8d53de7e55c15871846fd1bc36114841a8c7"
@@ -8350,6 +8403,11 @@ supertest@~4.0.2:
     methods "^1.1.2"
     superagent "^3.8.3"
 
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
 supports-color@^4.0.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"

cypress/support/factories.js

@@ -1,5 +1,5 @@
-import Factory from '../../backend/src/seed/factories'
-import { getDriver, getNeode } from '../../backend/src/bootstrap/neo4j'
+import Factory from '../../backend/src/factories'
+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'
 

neo4j/.archived/change_disabled_relationship_to_report_node.sh

@@ -23,7 +23,6 @@ DELETE disabled
 CREATE (moderator)-[review:REVIEWED]->(report:Report)-[:BELONGS_TO]->(disabledResource)
 SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true
 SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.closed = false
-
 // if disabledResource has no filed report, then create a moderators default filed report
 WITH moderator, disabledResource, report
 OPTIONAL MATCH (disabledResourceReporter:User)-[existingFiledReport:FILED]->(disabledResource)
@@ -36,7 +35,6 @@ FOREACH(disabledResource IN CASE WHEN existingFiledReport IS NOT NULL THEN [1] E
   SET moveModeratorReport = existingFiledReport
   DELETE existingFiledReport
 )
-
 RETURN disabledResource {.id};
 " | cypher-shell
 
@@ -49,7 +47,5 @@ ON CREATE SET report.id = randomUUID(), report.createdAt = toString(datetime()),
 CREATE (reporter)-[filed:FILED]->(report)
 SET report = oldReport
 DELETE oldReport
-
 RETURN notDisabledResource {.id};
 " | cypher-shell
-

neo4j/Dockerfile

@@ -4,7 +4,5 @@ LABEL Description="Neo4J database of the Social Network Human-Connection.org wit
 ARG BUILD_COMMIT
 ENV BUILD_COMMIT=$BUILD_COMMIT
 
-COPY db_setup.sh /usr/local/bin/db_setup
-
 RUN apt-get update && apt-get -y install wget htop
 RUN wget https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/3.5.0.4/apoc-3.5.0.4-all.jar -P plugins/

neo4j/README.md

@@ -18,15 +18,6 @@ docker-compose up
 You can access Neo4J through [http://localhost:7474/](http://localhost:7474/)
 for an interactive cypher shell and a visualization of the graph.
 
-### Database Indices and Constraints
-
-Database indices and constraints need to be created when the database is
-running. So start the container with the command above and run:
-
-```bash
-docker-compose exec neo4j db_setup
-```
-
 
 ## Installation without Docker
 
@@ -45,20 +36,6 @@ Then make sure to allow Apoc procedures by adding the following line to your Neo
 ```
 dbms.security.procedures.unrestricted=apoc.*
 ```
-### Database Indices and Constraints
-
-If you have `cypher-shell` available with your local installation of neo4j you
-can run:
-
-```bash
-# in folder neo4j/
-$ cp .env.template .env
-$ ./db_setup.sh
-```
-
-Otherwise, if you don't have `cypher-shell` available, copy the cypher
-statements [from the `db_setup.sh` script](https://github.com/Human-Connection/Human-Connection/blob/master/neo4j/db_setup.sh) and paste the scripts into your
-[database browser frontend](http://localhost:7474).
 
 ### Alternatives
 

neo4j/db_manipulation/change_disabled_relationship_to_report_node.sh

@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-
-ENV_FILE=$(dirname "$0")/.env
-[[ -f "$ENV_FILE" ]] && source "$ENV_FILE"
-
-if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then
-  echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables."
-  echo "Database manipulation is not possible without connecting to the database."
-  echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container"
-fi
-
-until echo 'RETURN "Connection successful" as info;' | cypher-shell
-do
-  echo "Connecting to neo4j failed, trying again..."
-  sleep 1
-done
-
-echo "
-  :begin
-  MATCH(user)-[reported:REPORTED]->(resource)
-  WITH reported, resource, COLLECT(user) as users
-  MERGE(report:Report)-[:BELONGS_TO]->(resource)
-  SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.closed = false
-  WITH report, users, reported
-  UNWIND users as user
-  MERGE (user)-[filed:FILED]->(report)
-  SET filed = reported
-  DELETE reported;
-
-  MATCH(moderator)-[disabled:DISABLED]->(resource)
-  MATCH(report:Report)-[:BELONGS_TO]->(resource)
-  WITH disabled, resource, COLLECT(moderator) as moderators, report
-  DELETE disabled
-  WITH report, moderators, disabled
-  UNWIND moderators as moderator
-  MERGE (moderator)-[review:REVIEWED {disable: true}]->(report)
-  SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true;
-
-  MATCH(moderator)-[disabled:DISABLED]->(resource)
-  WITH disabled, resource, COLLECT(moderator) as moderators
-  MERGE(report:Report)-[:BELONGS_TO]->(resource)
-  SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.closed = false
-  DELETE disabled
-  WITH report, moderators, disabled
-  UNWIND moderators as moderator
-  MERGE(moderator)-[filed:FILED]->(report)
-  SET filed.createdAt = toString(datetime()), filed.reasonCategory = 'other', filed.reasonDescription = 'Old DISABLED relations didn\'t enforce mandatory reporting !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
-  MERGE (moderator)-[review:REVIEWED {disable: true}]->(report)
-  SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true;
-  :commit
-" | cypher-shell

neo4j/db_setup.sh

@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-ENV_FILE=$(dirname "$0")/.env
-[[ -f "$ENV_FILE" ]] && source "$ENV_FILE"
-if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then
-  echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables."
-  echo "Setting up database constraints and indexes will probably fail because of authentication errors."
-  echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container"
-fi
-
-until echo 'RETURN "Connection successful" as info;' | cypher-shell
-do
-  echo "Connecting to neo4j failed, trying again..."
-  sleep 1
-done
-
-echo '
-RETURN "Here is a list of indexes and constraints BEFORE THE SETUP:" as info;
-CALL db.indexes();
-' | cypher-shell
-
-echo '
-CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"]);
-CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"]);
-CREATE CONSTRAINT ON (p:Post)          ASSERT p.id IS UNIQUE;
-CREATE CONSTRAINT ON (c:Comment)       ASSERT c.id IS UNIQUE;
-CREATE CONSTRAINT ON (c:Category)      ASSERT c.id IS UNIQUE;
-CREATE CONSTRAINT ON (u:User)          ASSERT u.id IS UNIQUE;
-CREATE CONSTRAINT ON (t:Tag)           ASSERT t.id IS UNIQUE;
-
-CREATE CONSTRAINT ON (p:Post)          ASSERT p.slug IS UNIQUE;
-CREATE CONSTRAINT ON (c:Category)      ASSERT c.slug IS UNIQUE;
-CREATE CONSTRAINT ON (u:User)          ASSERT u.slug IS UNIQUE;
-
-CREATE CONSTRAINT ON (e:EmailAddress)  ASSERT e.email IS UNIQUE;
-' | cypher-shell
-
-echo '
-RETURN "Setting up all the indexes and constraints seems to have been successful. Here is a list AFTER THE SETUP:" as info;
-CALL db.indexes();
-' | cypher-shell