From a07010f50ce537d2ef5a30b2f9ce13c2b0a30ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 10 Oct 2019 15:38:20 +0200
Subject: [PATCH 01/12] First step of implementing direct report relation

---
 backend/src/schema/index.js                  |  2 +-
 backend/src/schema/resolvers/reports.js      | 21 ++++++------
 backend/src/schema/resolvers/reports.spec.js |  2 +-
 backend/src/schema/types/schema.gql          | 35 ++++++++++++--------
 backend/src/schema/types/type/REPORTED.gql   | 30 +++++++++++++++++
 backend/src/seed/seed-db.js                  |  2 +-
 cypress/integration/common/report.js         |  2 +-
 webapp/graphql/Moderation.js                 |  7 ++--
 8 files changed, 71 insertions(+), 30 deletions(-)
 create mode 100644 backend/src/schema/types/type/REPORTED.gql

diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index 4d1b9574e..e3c835447 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -35,7 +35,7 @@ export default applyScalars(
             'Notfication',
             'Post',
             'Comment',
-            'Report',
+            'REPORTED',
             'Statistics',
             'LoggedInUser',
             'Location',
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 4b86e57f4..2cf1187e0 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -8,10 +8,10 @@ export default {
       { driver, _req, user },
       _resolveInfo,
     ) => {
-      const reportId = uuid()
+      // Wolle const reportId = uuid()
       const session = driver.session()
       const reportProperties = {
-        id: reportId,
+        // Wolle id: reportId,
         createdAt: new Date().toISOString(),
         reasonCategory,
         reasonDescription,
@@ -19,7 +19,7 @@ export default {
 
       const reportQueryRes = await session.run(
         `
-          MATCH (u:User {id:$submitterId})-[:REPORTED]->(report)-[:REPORTED]->(resource {id: $resourceId}) 
+          MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId}) 
           RETURN labels(resource)[0] as label
         `,
         {
@@ -39,22 +39,22 @@ export default {
 
       const res = await session.run(
         `
-          MATCH (submitter:User {id: $userId})
+          MATCH (submitter:User {id: $submitterId})
           MATCH (resource {id: $resourceId})
           WHERE resource:User OR resource:Comment OR resource:Post
-          CREATE (report:Report  {reportProperties})
-          MERGE (resource)<-[:REPORTED]-(report)
-          MERGE (report)<-[:REPORTED]-(submitter)
+          CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
           RETURN report, submitter, resource, labels(resource)[0] as type
         `,
         {
           resourceId,
-          userId: user.id,
-          reportProperties,
+          submitterId: user.id,
+          createdAt: reportProperties.createdAt,
+          reasonCategory: reportProperties.reasonCategory,
+          reasonDescription: reportProperties.reasonDescription,
         },
       )
 
-      session.close()
+     session.close()
 
       const [dbResponse] = res.records.map(r => {
         return {
@@ -65,6 +65,7 @@ export default {
         }
       })
       if (!dbResponse) return null
+
       const { report, submitter, resource, type } = dbResponse
 
       const response = {
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 4b0aa7ba4..cf89dab7a 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -16,7 +16,7 @@ describe('report', () => {
   const categoryIds = ['cat9']
 
   beforeEach(async () => {
-    returnedObject = '{ id }'
+    returnedObject = '{ createdAt }'
     variables = {
       resourceId: 'whatever',
       reasonCategory: 'reason-category-dummy',
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index cdf0d7f87..e4986ad73 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -24,7 +24,6 @@ type Mutation {
   changePassword(oldPassword: String!, newPassword: String!): String!
   requestPasswordReset(email: String!): Boolean!
   resetPassword(email: String!, nonce: String!, newPassword: String!): Boolean!
-  report(resourceId: ID!, reasonCategory: String!, reasonDescription: String!): Report
   disable(id: ID!): ID
   enable(id: ID!): ID
   # Shout the given Type and ID
@@ -35,18 +34,28 @@ type Mutation {
   unfollowUser(id: ID!): User
 }
 
-type Report {
-  id: ID!
-  createdAt: String!
-  reasonCategory: String!
-  reasonDescription: String!
-  submitter: User @relation(name: "REPORTED", direction: "IN")
-  type: String!
-    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(this) RETURN labels(resource)[0]")
-  comment: Comment @relation(name: "REPORTED", direction: "OUT")
-  post: Post @relation(name: "REPORTED", direction: "OUT")
-  user: User @relation(name: "REPORTED", direction: "OUT")
-}
+# Wolle
+# type Report {
+  # not necessary
+  # id: ID!
+  # done
+  # createdAt: String!
+  # done
+  # reasonCategory: String!
+  # done
+  # reasonDescription: String!
+  # done
+  # submitter: User @relation(name: "REPORTED", direction: "IN")
+  # done
+  # type: String!
+  #   @cypher(statement: "MATCH (resource)<-[:REPORTED]-(this) RETURN labels(resource)[0]")
+  # seems unused
+  # comment: Comment @relation(name: "REPORTED", direction: "OUT")
+  # seems unused
+  # post: Post @relation(name: "REPORTED", direction: "OUT")
+  # seems unused
+  # user: User @relation(name: "REPORTED", direction: "OUT")
+# }
 
 enum Deletable {
   Post
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
new file mode 100644
index 000000000..881184bb5
--- /dev/null
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -0,0 +1,30 @@
+type REPORTED {
+  createdAt: String
+  reasonCategory: String
+  reasonDescription: String
+  submitter: User
+    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
+  resource: ReportReource
+    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource")
+  resourceId: ID
+    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource {.id}")
+  type: String
+    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN labels(resource)[0]")
+  user: User
+  post: Post
+  comment: Comment
+}
+
+union ReportReource = User | Post | Comment
+
+enum ReportOrdering {
+  createdAt_desc
+}
+
+type Query {
+  Report(orderBy: ReportOrdering): [REPORTED]
+}
+
+type Mutation {
+  report(resourceId: ID!, reasonCategory: String!, reasonDescription: String!): REPORTED
+}
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 89180ac2e..aae955752 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -657,7 +657,7 @@ import { gql } from '../jest/helpers'
           reasonCategory: $reasonCategory
           reasonDescription: $reasonDescription
         ) {
-          id
+          type
         }
       }
     `
diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 907c3d5eb..ab9a90e36 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -129,7 +129,7 @@ Given('somebody reported the following posts:', table => {
       .authenticateAs(submitter)
       .mutate(`mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
         report(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
-          id
+          type
         }
       }`, {
         resourceId,
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index d86205042..981b8146e 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -1,14 +1,15 @@
 import gql from 'graphql-tag'
 
 export const reportListQuery = () => {
+  // no limit vor the moment like before: "Report(first: 20, orderBy: createdAt_desc)"
   return gql`
     query {
-      Report(first: 20, orderBy: createdAt_desc) {
-        id
+      Report(orderBy: createdAt_desc) {
         createdAt
         reasonCategory
         reasonDescription
         type
+        resourceId
         submitter {
           id
           slug
@@ -89,7 +90,7 @@ export const reportMutation = () => {
         reasonCategory: $reasonCategory
         reasonDescription: $reasonDescription
       ) {
-        id
+        type
       }
     }
   `

From 82228c6c99c4b33ab20ddfbc13cce6ac6f95792c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 11 Oct 2019 16:35:15 +0200
Subject: [PATCH 02/12] Refactored backend database to a single `REPORTED`
 relation

---
 .../src/middleware/permissionsMiddleware.js   |   2 +-
 backend/src/schema/index.js                   |   2 +-
 backend/src/schema/resolvers/reports.js       |  69 +++-
 backend/src/schema/resolvers/reports.spec.js  | 296 ++++++++++++++++--
 backend/src/schema/types/schema.gql           |  23 --
 backend/src/schema/types/type/REPORTED.gql    |  10 +-
 webapp/graphql/Moderation.js                  |   4 +-
 7 files changed, 330 insertions(+), 76 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index df87f743e..31efb9316 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -122,7 +122,7 @@ const permissions = shield(
       embed: allow,
       Category: allow,
       Tag: allow,
-      Report: isModerator,
+      reports: isModerator,
       statistics: allow,
       currentUser: allow,
       Post: or(onlyEnabledContent, isModerator),
diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index e3c835447..871810d47 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -35,7 +35,6 @@ export default applyScalars(
             'Notfication',
             'Post',
             'Comment',
-            'REPORTED',
             'Statistics',
             'LoggedInUser',
             'Location',
@@ -43,6 +42,7 @@ export default applyScalars(
             'User',
             'EMOTED',
             'NOTIFIED',
+            'REPORTED',
           ],
           // add 'User' here as soon as possible
         },
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 2cf1187e0..dd9375995 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,17 +1,10 @@
-import uuid from 'uuid/v4'
-
 export default {
   Mutation: {
-    report: async (
-      _parent,
-      { resourceId, reasonCategory, reasonDescription },
-      { driver, _req, user },
-      _resolveInfo,
-    ) => {
-      // Wolle const reportId = uuid()
+    report: async (_parent, params, { driver, _req, user }, _resolveInfo) => {
+      const { resourceId, reasonCategory, reasonDescription } = params
+
       const session = driver.session()
       const reportProperties = {
-        // Wolle id: reportId,
         createdAt: new Date().toISOString(),
         reasonCategory,
         reasonDescription,
@@ -54,7 +47,7 @@ export default {
         },
       )
 
-     session.close()
+      session.close()
 
       const [dbResponse] = res.records.map(r => {
         return {
@@ -88,6 +81,60 @@ export default {
           break
       }
 
+      return response
+    },
+  },
+  Query: {
+    reports: async (_parent, _params, { driver, _req, _user }, _resolveInfo) => {
+      const session = driver.session()
+      const res = await session.run(
+        `
+          MATCH (submitter:User)-[report:REPORTED]->(resource)
+          WHERE resource:User OR resource:Comment OR resource:Post
+          RETURN report, submitter, resource, labels(resource)[0] as type
+        `,
+        {},
+      )
+      session.close()
+
+      const dbResponse = res.records.map(r => {
+        return {
+          report: r.get('report'),
+          submitter: r.get('submitter'),
+          resource: r.get('resource'),
+          type: r.get('type'),
+        }
+      })
+      if (!dbResponse) return null
+
+      const response = []
+      dbResponse.forEach(ele => {
+        const { report, submitter, resource, type } = ele
+
+        const responseEle = {
+          ...report.properties,
+          resource: resource.properties,
+          resourceId: resource.properties.id,
+          post: null,
+          comment: null,
+          user: null,
+          submitter: submitter.properties,
+          type,
+        }
+        switch (type) {
+          case 'Post':
+            responseEle.post = resource.properties
+            break
+          case 'Comment':
+            responseEle.comment = resource.properties
+            break
+          case 'User':
+            responseEle.user = resource.properties
+            break
+        }
+        response.push(responseEle)
+      })
+
       return response
     },
   },
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index cf89dab7a..919153611 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -1,51 +1,24 @@
 import { GraphQLClient } from 'graphql-request'
 import Factory from '../../seed/factories'
-import { host, login } from '../../jest/helpers'
-import { neode } from '../../bootstrap/neo4j'
+import { host, login, gql } from '../../jest/helpers'
+import { getDriver, neode } from '../../bootstrap/neo4j'
+import { createTestClient } from 'apollo-server-testing'
+import createServer from '../.././server'
 
 const factory = Factory()
 const instance = neode()
+const driver = getDriver()
 
-describe('report', () => {
+describe('report mutation', () => {
   let reportMutation
   let headers
+  let client
   let returnedObject
   let variables
   let createPostVariables
   let user
   const categoryIds = ['cat9']
 
-  beforeEach(async () => {
-    returnedObject = '{ createdAt }'
-    variables = {
-      resourceId: 'whatever',
-      reasonCategory: 'reason-category-dummy',
-      reasonDescription: 'Violates code of conduct !!!',
-    }
-    headers = {}
-    user = await factory.create('User', {
-      email: 'test@example.org',
-      password: '1234',
-      id: 'u1',
-    })
-    await factory.create('User', {
-      id: 'u2',
-      name: 'abusive-user',
-      role: 'user',
-      email: 'abusive-user@example.org',
-    })
-    await instance.create('Category', {
-      id: 'cat9',
-      name: 'Democracy & Politics',
-      icon: 'university',
-    })
-  })
-
-  afterEach(async () => {
-    await factory.cleanDatabase()
-  })
-
-  let client
   const action = () => {
     // because of the template `${returnedObject}` the 'gql' tag from 'jest/helpers' is not working here
     reportMutation = `
@@ -59,6 +32,37 @@ describe('report', () => {
     return client.request(reportMutation, variables)
   }
 
+  beforeEach(async () => {
+    returnedObject = '{ createdAt }'
+    variables = {
+      resourceId: 'whatever',
+      reasonCategory: 'reason-category-dummy',
+      reasonDescription: 'Violates code of conduct !!!',
+    }
+    headers = {}
+    user = await factory.create('User', {
+      id: 'u1',
+      role: 'user',
+      email: 'test@example.org',
+      password: '1234',
+    })
+    await factory.create('User', {
+      id: 'u2',
+      role: 'user',
+      name: 'abusive-user',
+      email: 'abusive-user@example.org',
+    })
+    await instance.create('Category', {
+      id: 'cat9',
+      name: 'Democracy & Politics',
+      icon: 'university',
+    })
+  })
+
+  afterEach(async () => {
+    await factory.cleanDatabase()
+  })
+
   describe('unauthenticated', () => {
     it('throws authorization error', async () => {
       await expect(action()).rejects.toThrow('Not Authorised')
@@ -287,3 +291,227 @@ describe('report', () => {
     })
   })
 })
+
+describe('reports query', () => {
+  let query
+  let mutate
+  let authenticatedUser = null
+  let moderator
+  let user
+  let author
+  const categoryIds = ['cat9']
+
+  const reportMutation = gql`
+    mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+      report(
+        resourceId: $resourceId
+        reasonCategory: $reasonCategory
+        reasonDescription: $reasonDescription
+      ) {
+        type
+      }
+    }
+  `
+  const reportsQuery = gql`
+    query {
+      reports(orderBy: createdAt_desc) {
+        createdAt
+        reasonCategory
+        reasonDescription
+        submitter {
+          id
+        }
+        resourceId
+        type
+        user {
+          id
+        }
+        post {
+          id
+        }
+        comment {
+          id
+        }
+      }
+    }
+  `
+
+  beforeAll(() => {
+    const { server } = createServer({
+      context: () => {
+        return {
+          driver,
+          user: authenticatedUser,
+        }
+      },
+    })
+    query = createTestClient(server).query
+    mutate = createTestClient(server).mutate
+  })
+
+  beforeEach(async () => {
+    authenticatedUser = null
+
+    moderator = await factory.create('User', {
+      id: 'mod1',
+      role: 'moderator',
+      email: 'moderator@example.org',
+      password: '1234',
+    })
+    user = await factory.create('User', {
+      id: 'user1',
+      role: 'user',
+      email: 'test@example.org',
+      password: '1234',
+    })
+    author = await factory.create('User', {
+      id: 'auth1',
+      role: 'user',
+      name: 'abusive-user',
+      email: 'abusive-user@example.org',
+    })
+    await instance.create('Category', {
+      id: 'cat9',
+      name: 'Democracy & Politics',
+      icon: 'university',
+    })
+
+    await Promise.all([
+      factory.create('Post', {
+        author,
+        id: 'p1',
+        categoryIds,
+        content: 'Not for you',
+      }),
+      factory.create('Post', {
+        author: moderator,
+        id: 'p2',
+        categoryIds,
+        content: 'Already seen post mention',
+      }),
+      factory.create('Post', {
+        author: user,
+        id: 'p3',
+        categoryIds,
+        content: 'You have been mentioned in a post',
+      }),
+    ])
+    await Promise.all([
+      factory.create('Comment', {
+        author: user,
+        id: 'c1',
+        postId: 'p1',
+      }),
+    ])
+
+    authenticatedUser = await user.toJson()
+    await Promise.all([
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'p1',
+          reasonCategory: 'other',
+          reasonDescription: 'This comment is bigoted',
+        },
+      }),
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'c1',
+          reasonCategory: 'discrimination-etc',
+          reasonDescription: 'This post is bigoted',
+        },
+      }),
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'auth1',
+          reasonCategory: 'doxing',
+          reasonDescription: 'This user is harassing me with bigoted remarks',
+        },
+      }),
+    ])
+    authenticatedUser = null
+  })
+
+  afterEach(async () => {
+    await factory.cleanDatabase()
+  })
+
+  describe('unauthenticated', () => {
+    it('throws authorization error', async () => {
+      authenticatedUser = null
+      const { data, errors } = await query({ query: reportsQuery })
+      expect(data).toEqual({
+        reports: null,
+      })
+      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+    })
+
+    it('roll "user" gets no reports', async () => {
+      authenticatedUser = await user.toJson()
+      const { data, errors } = await query({ query: reportsQuery })
+      expect(data).toEqual({
+        reports: null,
+      })
+      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
+    })
+
+    it('roll "moderator" gets reports', async () => {
+      const expected = {
+        // to check 'orderBy: createdAt_desc' is not possible here, because 'createdAt' does not differ
+        reports: expect.arrayContaining([
+          expect.objectContaining({
+            createdAt: expect.any(String),
+            reasonCategory: 'doxing',
+            reasonDescription: 'This user is harassing me with bigoted remarks',
+            submitter: expect.objectContaining({
+              id: 'user1',
+            }),
+            resourceId: 'auth1',
+            type: 'User',
+            user: expect.objectContaining({
+              id: 'auth1',
+            }),
+            post: null,
+            comment: null,
+          }),
+          expect.objectContaining({
+            createdAt: expect.any(String),
+            reasonCategory: 'other',
+            reasonDescription: 'This comment is bigoted',
+            submitter: expect.objectContaining({
+              id: 'user1',
+            }),
+            resourceId: 'p1',
+            type: 'Post',
+            user: null,
+            post: expect.objectContaining({
+              id: 'p1',
+            }),
+            comment: null,
+          }),
+          expect.objectContaining({
+            createdAt: expect.any(String),
+            reasonCategory: 'discrimination-etc',
+            reasonDescription: 'This post is bigoted',
+            submitter: expect.objectContaining({
+              id: 'user1',
+            }),
+            resourceId: 'c1',
+            type: 'Comment',
+            user: null,
+            post: null,
+            comment: expect.objectContaining({
+              id: 'c1',
+            }),
+          }),
+        ]),
+      }
+
+      authenticatedUser = await moderator.toJson()
+      const { data } = await query({ query: reportsQuery })
+      expect(data).toEqual(expected)
+    })
+  })
+})
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index e4986ad73..27fd2206c 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -34,29 +34,6 @@ type Mutation {
   unfollowUser(id: ID!): User
 }
 
-# Wolle
-# type Report {
-  # not necessary
-  # id: ID!
-  # done
-  # createdAt: String!
-  # done
-  # reasonCategory: String!
-  # done
-  # reasonDescription: String!
-  # done
-  # submitter: User @relation(name: "REPORTED", direction: "IN")
-  # done
-  # type: String!
-  #   @cypher(statement: "MATCH (resource)<-[:REPORTED]-(this) RETURN labels(resource)[0]")
-  # seems unused
-  # comment: Comment @relation(name: "REPORTED", direction: "OUT")
-  # seems unused
-  # post: Post @relation(name: "REPORTED", direction: "OUT")
-  # seems unused
-  # user: User @relation(name: "REPORTED", direction: "OUT")
-# }
-
 enum Deletable {
   Post
   Comment
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index 881184bb5..276c5913b 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -4,8 +4,9 @@ type REPORTED {
   reasonDescription: String
   submitter: User
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
-  resource: ReportReource
-    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource")
+  # not yet supported
+  # resource: ReportReource
+  #   @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource")
   resourceId: ID
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource {.id}")
   type: String
@@ -15,14 +16,15 @@ type REPORTED {
   comment: Comment
 }
 
-union ReportReource = User | Post | Comment
+# not yet supported
+# union ReportReource = User | Post | Comment
 
 enum ReportOrdering {
   createdAt_desc
 }
 
 type Query {
-  Report(orderBy: ReportOrdering): [REPORTED]
+  reports(orderBy: ReportOrdering): [REPORTED]
 }
 
 type Mutation {
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 981b8146e..8ead28b61 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -1,10 +1,10 @@
 import gql from 'graphql-tag'
 
 export const reportListQuery = () => {
-  // no limit vor the moment like before: "Report(first: 20, orderBy: createdAt_desc)"
+  // no limit vor the moment like before: "reports(first: 20, orderBy: createdAt_desc)"
   return gql`
     query {
-      Report(orderBy: createdAt_desc) {
+      reports(orderBy: createdAt_desc) {
         createdAt
         reasonCategory
         reasonDescription

From 1c8385120cb03b58b2e8a001d6aa92e0b15a66c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 11 Oct 2019 16:36:37 +0200
Subject: [PATCH 03/12] Add date-time to the moderators report list

---
 webapp/locales/de.json            |  1 +
 webapp/locales/en.json            |  1 +
 webapp/pages/moderation/index.vue | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e54fcfcb0..1277b5737 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -431,6 +431,7 @@
       "name": "Meldungen",
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
+      "createdAt": "Datum",
       "submitter": "Gemeldet von",
       "disabledBy": "Deaktiviert von"
     }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index aa59a3732..7d08aa638 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -432,6 +432,7 @@
       "name": "Reports",
       "reasonCategory": "Category",
       "reasonDescription": "Description",
+      "createdAt": "Date",
       "submitter": "Reported by",
       "disabledBy": "Disabled by"
     }
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 1f05c93ab..535b2613c 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ds-card space="small">
     <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
-    <ds-table v-if="Report && Report.length" :data="Report" :fields="fields" condensed>
+    <ds-table v-if="reports && reports.length" :data="reports" :fields="fields" condensed>
       <!-- Icon -->
       <template slot="type" slot-scope="scope">
         <ds-text color="soft">
@@ -82,6 +82,14 @@
           {{ scope.row.submitter.name }}
         </nuxt-link>
       </template>
+      <!-- createdAt -->
+      <template slot="createdAt" slot-scope="scope">
+        <ds-text size="small">
+          <client-only>
+            <hc-relative-date-time :date-time="scope.row.createdAt" />
+          </client-only>
+        </ds-text>
+      </template>
       <!-- disabledBy -->
       <template slot="disabledBy" slot-scope="scope">
         <nuxt-link
@@ -123,15 +131,17 @@
 
 <script>
 import HcEmpty from '~/components/Empty.vue'
+import HcRelativeDateTime from '~/components/RelativeDateTime'
 import { reportListQuery } from '~/graphql/Moderation.js'
 
 export default {
   components: {
     HcEmpty,
+    HcRelativeDateTime,
   },
   data() {
     return {
-      Report: [],
+      reports: [],
     }
   },
   computed: {
@@ -142,13 +152,14 @@ export default {
         reasonCategory: this.$t('moderation.reports.reasonCategory'),
         reasonDescription: this.$t('moderation.reports.reasonDescription'),
         submitter: this.$t('moderation.reports.submitter'),
+        createdAt: this.$t('moderation.reports.createdAt'),
         disabledBy: this.$t('moderation.reports.disabledBy'),
         // actions: ' '
       }
     },
   },
   apollo: {
-    Report: {
+    reports: {
       query: reportListQuery(),
       fetchPolicy: 'cache-and-network',
     },

From d5e1a67e0cb27cef670b849e748d2db290ecc3bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 11 Oct 2019 17:33:04 +0200
Subject: [PATCH 04/12] Manipulate database to replace report node with direct
 REPORTED relation

---
 .../20191011_changeReportNodeToRelationOnly.cql            | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql

diff --git a/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql b/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql
new file mode 100644
index 000000000..8c32cf5ec
--- /dev/null
+++ b/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql
@@ -0,0 +1,7 @@
+MATCH (submitter:User)-[:REPORTED]->(report:Report)-[:REPORTED]->(resource)
+DETACH DELETE report
+CREATE (submitter)-[reported:REPORTED]->(resource)
+SET reported.createdAt = toString(datetime())
+SET reported.reasonCategory = 'other'
+SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! Date-time is this creation date and time.'
+RETURN reported
\ No newline at end of file

From b50896bb456bd48f4100aaf74ab299a6f11786a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 15:22:07 +0200
Subject: [PATCH 05/12] Update backend/src/schema/resolvers/reports.spec.js

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
---
 backend/src/schema/resolvers/reports.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 919153611..a7861e226 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -448,7 +448,7 @@ describe('reports query', () => {
       expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })
 
-    it('roll "user" gets no reports', async () => {
+    it('role "user" gets no reports', async () => {
       authenticatedUser = await user.toJson()
       const { data, errors } = await query({ query: reportsQuery })
       expect(data).toEqual({

From 3c472293ac151ebf813f9c72e3b319073ac73350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 15:22:25 +0200
Subject: [PATCH 06/12] Update backend/src/schema/resolvers/reports.spec.js

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
---
 backend/src/schema/resolvers/reports.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index a7861e226..ee5b6dc16 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -457,7 +457,7 @@ describe('reports query', () => {
       expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })
 
-    it('roll "moderator" gets reports', async () => {
+    it('role "moderator" gets reports', async () => {
       const expected = {
         // to check 'orderBy: createdAt_desc' is not possible here, because 'createdAt' does not differ
         reports: expect.arrayContaining([

From 6365d3df54b3f8bb26274615b83933e52c01dc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 15:53:36 +0200
Subject: [PATCH 07/12] Implement enum for report reason categories after Matts
 suggestion

---
 backend/src/schema/resolvers/reports.js    |  5 ++---
 backend/src/schema/types/type/REPORTED.gql | 14 +++++++++++++-
 shared/moderation/report.js                |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index dd9375995..3e63f1c1a 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,6 +1,6 @@
 export default {
   Mutation: {
-    report: async (_parent, params, { driver, _req, user }, _resolveInfo) => {
+    report: async (_parent, params, { driver, user }, _resolveInfo) => {
       const { resourceId, reasonCategory, reasonDescription } = params
 
       const session = driver.session()
@@ -85,7 +85,7 @@ export default {
     },
   },
   Query: {
-    reports: async (_parent, _params, { driver, _req, _user }, _resolveInfo) => {
+    reports: async (_parent, _params, { driver }, _resolveInfo) => {
       const session = driver.session()
       const res = await session.run(
         `
@@ -113,7 +113,6 @@ export default {
 
         const responseEle = {
           ...report.properties,
-          resource: resource.properties,
           resourceId: resource.properties.id,
           post: null,
           comment: null,
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index 276c5913b..b94dab882 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -1,6 +1,6 @@
 type REPORTED {
   createdAt: String
-  reasonCategory: String
+  reasonCategory: ReasonCategory
   reasonDescription: String
   submitter: User
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
@@ -16,6 +16,18 @@ type REPORTED {
   comment: Comment
 }
 
+# list see "reportReasonCategoriesDatabaseList" in shared file "shared/moderation/report.js"
+enum ReasonCategory {
+  other
+  discrimination-etc
+  pornographic-content-links
+  glorific-trivia-of-cruel-inhuman-acts
+  doxing
+  intentional-intimidation-stalking-persecution
+  advert-products-services-commercial
+  criminal-behavior-violation-german-law
+}
+
 # not yet supported
 # union ReportReource = User | Post | Comment
 
diff --git a/shared/moderation/report.js b/shared/moderation/report.js
index a90837f67..75f6a076d 100644
--- a/shared/moderation/report.js
+++ b/shared/moderation/report.js
@@ -1,4 +1,5 @@
 export const reportReasonCategoriesDatabaseList = () => {
+    // list see "ReasonCategory" in backend GraphQL schema file "REPORTED.gql"
     return [
       'other', // element # zero, because it is the nutral one
       'discrimination-etc',

From cae897808b5a560082f203a1bc84f8442d803e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 14 Oct 2019 17:38:38 +0200
Subject: [PATCH 08/12] Follow Matts suggestions from his review

---
 backend/src/schema/index.js                  |   1 +
 backend/src/schema/resolvers/reports.spec.js | 116 ++++++++++---------
 backend/src/schema/types/type/REPORTED.gql   |  14 +--
 webapp/components/Modal/ReportModal.vue      |   1 +
 4 files changed, 73 insertions(+), 59 deletions(-)

diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index 871810d47..95fa9ef61 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -23,6 +23,7 @@ export default applyScalars(
             'Location',
             'SocialMedia',
             'NOTIFIED',
+            'REPORTED',
           ],
           // add 'User' here as soon as possible
         },
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index ee5b6dc16..238de25dd 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -13,17 +13,36 @@ describe('report mutation', () => {
   let reportMutation
   let headers
   let client
-  let returnedObject
   let variables
   let createPostVariables
   let user
   const categoryIds = ['cat9']
 
   const action = () => {
-    // because of the template `${returnedObject}` the 'gql' tag from 'jest/helpers' is not working here
-    reportMutation = `
+    reportMutation = gql`
       mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
-        report(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) ${returnedObject}
+        report(
+          resourceId: $resourceId
+          reasonCategory: $reasonCategory
+          reasonDescription: $reasonDescription
+        ) {
+          createdAt
+          reasonCategory
+          reasonDescription
+          type
+          submitter {
+            email
+          }
+          user {
+            name
+          }
+          post {
+            title
+          }
+          comment {
+            content
+          }
+        }
       }
     `
     client = new GraphQLClient(host, {
@@ -33,10 +52,9 @@ describe('report mutation', () => {
   }
 
   beforeEach(async () => {
-    returnedObject = '{ createdAt }'
     variables = {
       resourceId: 'whatever',
-      reasonCategory: 'reason-category-dummy',
+      reasonCategory: 'other',
       reasonDescription: 'Violates code of conduct !!!',
     }
     headers = {}
@@ -95,8 +113,7 @@ describe('report mutation', () => {
         })
 
         it('returns type "User"', async () => {
-          returnedObject = '{ type }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               type: 'User',
             },
@@ -104,8 +121,7 @@ describe('report mutation', () => {
         })
 
         it('returns resource in user attribute', async () => {
-          returnedObject = '{ user { name } }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               user: {
                 name: 'abusive-user',
@@ -115,8 +131,7 @@ describe('report mutation', () => {
         })
 
         it('returns the submitter', async () => {
-          returnedObject = '{ submitter { email } }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               submitter: {
                 email: 'test@example.org',
@@ -126,36 +141,41 @@ describe('report mutation', () => {
         })
 
         it('returns a date', async () => {
-          returnedObject = '{ createdAt }'
-          await expect(action()).resolves.toEqual(
-            expect.objectContaining({
-              report: {
-                createdAt: expect.any(String),
-              },
-            }),
-          )
+          await expect(action()).resolves.toMatchObject({
+            report: {
+              createdAt: expect.any(String),
+            },
+          })
         })
 
         it('returns the reason category', async () => {
           variables = {
             ...variables,
-            reasonCategory: 'my-category',
+            reasonCategory: 'criminal_behavior_violation_german_law',
           }
-          returnedObject = '{ reasonCategory }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
-              reasonCategory: 'my-category',
+              reasonCategory: 'criminal_behavior_violation_german_law',
             },
           })
         })
 
+        it('gives an error if the reason category is not in enum "ReasonCategory"', async () => {
+          variables = {
+            ...variables,
+            reasonCategory: 'my_category',
+          }
+          await expect(action()).rejects.toThrow(
+            'Expected a value of type "ReasonCategory" but received: "my_category"',
+          )
+        })
+
         it('returns the reason description', async () => {
           variables = {
             ...variables,
             reasonDescription: 'My reason!',
           }
-          returnedObject = '{ reasonDescription }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               reasonDescription: 'My reason!',
             },
@@ -167,8 +187,7 @@ describe('report mutation', () => {
             ...variables,
             reasonDescription: 'My reason <sanitize></sanitize>!',
           }
-          returnedObject = '{ reasonDescription }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               reasonDescription: 'My reason !',
             },
@@ -191,8 +210,7 @@ describe('report mutation', () => {
         })
 
         it('returns type "Post"', async () => {
-          returnedObject = '{ type }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               type: 'Post',
             },
@@ -200,8 +218,7 @@ describe('report mutation', () => {
         })
 
         it('returns resource in post attribute', async () => {
-          returnedObject = '{ post { title } }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               post: {
                 title: 'Matt and Robert having a pair-programming',
@@ -211,8 +228,7 @@ describe('report mutation', () => {
         })
 
         it('returns null in user attribute', async () => {
-          returnedObject = '{ user { name } }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               user: null,
             },
@@ -245,8 +261,7 @@ describe('report mutation', () => {
         })
 
         it('returns type "Comment"', async () => {
-          returnedObject = '{ type }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               type: 'Comment',
             },
@@ -254,8 +269,7 @@ describe('report mutation', () => {
         })
 
         it('returns resource in comment attribute', async () => {
-          returnedObject = '{ comment { content } }'
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: {
               comment: {
                 content: 'Robert getting tired.',
@@ -280,7 +294,7 @@ describe('report mutation', () => {
         })
 
         it('returns null', async () => {
-          await expect(action()).resolves.toEqual({
+          await expect(action()).resolves.toMatchObject({
             report: null,
           })
         })
@@ -381,19 +395,19 @@ describe('reports query', () => {
         author,
         id: 'p1',
         categoryIds,
-        content: 'Not for you',
+        content: 'Interesting Knowledge',
       }),
       factory.create('Post', {
         author: moderator,
         id: 'p2',
         categoryIds,
-        content: 'Already seen post mention',
+        content: 'More things to do …',
       }),
       factory.create('Post', {
         author: user,
         id: 'p3',
         categoryIds,
-        content: 'You have been mentioned in a post',
+        content: 'I am at school …',
       }),
     ])
     await Promise.all([
@@ -418,7 +432,7 @@ describe('reports query', () => {
         mutation: reportMutation,
         variables: {
           resourceId: 'c1',
-          reasonCategory: 'discrimination-etc',
+          reasonCategory: 'discrimination_etc',
           reasonDescription: 'This post is bigoted',
         },
       }),
@@ -441,20 +455,18 @@ describe('reports query', () => {
   describe('unauthenticated', () => {
     it('throws authorization error', async () => {
       authenticatedUser = null
-      const { data, errors } = await query({ query: reportsQuery })
-      expect(data).toEqual({
-        reports: null,
+      expect(query({ query: reportsQuery })).resolves.toMatchObject({
+        data: { reports: null },
+        errors: [{ message: 'Not Authorised!' }],
       })
-      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })
 
     it('role "user" gets no reports', async () => {
       authenticatedUser = await user.toJson()
-      const { data, errors } = await query({ query: reportsQuery })
-      expect(data).toEqual({
-        reports: null,
+      expect(query({ query: reportsQuery })).resolves.toMatchObject({
+        data: { reports: null },
+        errors: [{ message: 'Not Authorised!' }],
       })
-      expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
     })
 
     it('role "moderator" gets reports', async () => {
@@ -493,7 +505,7 @@ describe('reports query', () => {
           }),
           expect.objectContaining({
             createdAt: expect.any(String),
-            reasonCategory: 'discrimination-etc',
+            reasonCategory: 'discrimination_etc',
             reasonDescription: 'This post is bigoted',
             submitter: expect.objectContaining({
               id: 'user1',
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index b94dab882..f7be579a1 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -16,16 +16,16 @@ type REPORTED {
   comment: Comment
 }
 
-# list see "reportReasonCategoriesDatabaseList" in shared file "shared/moderation/report.js"
+# this list equals the strings of an array in file "webapp/components/Modal/ReportModal.vue"
 enum ReasonCategory {
   other
-  discrimination-etc
-  pornographic-content-links
-  glorific-trivia-of-cruel-inhuman-acts
+  discrimination_etc
+  pornographic_content_links
+  glorific_trivia_of_cruel_inhuman_acts
   doxing
-  intentional-intimidation-stalking-persecution
-  advert-products-services-commercial
-  criminal-behavior-violation-german-law
+  intentional_intimidation_stalking_persecution
+  advert_products_services_commercial
+  criminal_behavior_violation_german_law
 }
 
 # not yet supported
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 7c237c923..c33515a37 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -62,6 +62,7 @@ export default {
     id: { type: String, required: true },
   },
   data() {
+    // this list equals to enums in GraphQL schema file "backend/src/schema/types/type/REPORTED.gql"
     let valuesReasonCategoryOptions = [
       'discrimination_etc',
       'pornographic_content_links',

From faf0a15aee460395862f8f2e230b3daad140e40a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 21:07:55 +0200
Subject: [PATCH 09/12] Update to use enum in tests, seed data, etc, refactor
 resolver

- Extract validations to the validations middleware to clean it up
- Remove resourceId since it throws an error in the mutation if the user
asks for it back, and the resourceId is returned in post/comment/user.id
- use writeTxResultPromise to benefit from automatic retries
- more descriptive variable naming
- extract cypher query to make db manipulation into script so that it
can be run from the command line, at least locally.
---
 .../validation/validationMiddleware.js        |  29 ++++
 backend/src/schema/resolvers/reports.js       | 127 +++++++-----------
 backend/src/schema/resolvers/reports.spec.js  |  20 +--
 backend/src/schema/types/type/REPORTED.gql    |   8 +-
 backend/src/seed/seed-db.js                   |   2 +-
 ...0191011_changeReportNodeToRelationOnly.cql |   7 -
 neo4j/change_report_node_to_relationship.sh   |  26 ++++
 7 files changed, 115 insertions(+), 104 deletions(-)
 delete mode 100644 deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql
 create mode 100755 neo4j/change_report_node_to_relationship.sh

diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index 0ecb6c115..ff3992ead 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -57,11 +57,40 @@ const validateUpdatePost = async (resolve, root, args, context, info) => {
   return validatePost(resolve, root, args, context, info)
 }
 
+const validateReport = async (resolve, root, args, context, info) => {
+  const { resourceId } = args
+  const { user, driver } = context
+  if (resourceId === user.id) throw new Error('You cannot report yourself!')
+  const session = driver.session()
+  const reportQueryRes = await session.run(
+    `
+      MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId}) 
+      RETURN labels(resource)[0] as label
+    `,
+    {
+      resourceId,
+      submitterId: user.id,
+    },
+  )
+  const [existingReportedResource] = reportQueryRes.records.map(record => {
+    return {
+      label: record.get('label'),
+    }
+  })
+
+  if (existingReportedResource)
+    throw new Error(
+      `You have already reported the ${existingReportedResource.label}, please only report the same ${existingReportedResource.label} once`,
+    )
+  return resolve(root, args, context, info)
+}
+
 export default {
   Mutation: {
     CreateComment: validateCommentCreation,
     UpdateComment: validateUpdateComment,
     CreatePost: validatePost,
     UpdatePost: validateUpdatePost,
+    report: validateReport,
   },
 }
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 3e63f1c1a..48677429a 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,87 +1,60 @@
 export default {
   Mutation: {
     report: async (_parent, params, { driver, user }, _resolveInfo) => {
+      let createdRelationshipWithNestedAttributes
       const { resourceId, reasonCategory, reasonDescription } = params
-
       const session = driver.session()
-      const reportProperties = {
-        createdAt: new Date().toISOString(),
-        reasonCategory,
-        reasonDescription,
-      }
-
-      const reportQueryRes = await session.run(
-        `
-          MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId}) 
-          RETURN labels(resource)[0] as label
-        `,
-        {
-          resourceId,
-          submitterId: user.id,
-        },
-      )
-      const [rep] = reportQueryRes.records.map(record => {
-        return {
-          label: record.get('label'),
-        }
+      const writeTxResultPromise = session.writeTransaction(async txc => {
+        const reportRelationshipTransactionResponse = await txc.run(
+          `
+            MATCH (submitter:User {id: $submitterId})
+            MATCH (resource {id: $resourceId})
+            WHERE resource:User OR resource:Comment OR resource:Post
+            CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
+            RETURN report, submitter, resource, labels(resource)[0] as type
+          `,
+          {
+            resourceId,
+            submitterId: user.id,
+            createdAt: new Date().toISOString(),
+            reasonCategory,
+            reasonDescription,
+          },
+        )
+        return reportRelationshipTransactionResponse.records.map(record => ({
+          report: record.get('report'),
+          submitter: record.get('submitter'),
+          resource: record.get('resource').properties,
+          type: record.get('type'),
+        }))
       })
-
-      if (rep) {
-        throw new Error(rep.label)
-      }
-
-      const res = await session.run(
-        `
-          MATCH (submitter:User {id: $submitterId})
-          MATCH (resource {id: $resourceId})
-          WHERE resource:User OR resource:Comment OR resource:Post
-          CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
-          RETURN report, submitter, resource, labels(resource)[0] as type
-        `,
-        {
-          resourceId,
-          submitterId: user.id,
-          createdAt: reportProperties.createdAt,
-          reasonCategory: reportProperties.reasonCategory,
-          reasonDescription: reportProperties.reasonDescription,
-        },
-      )
-
-      session.close()
-
-      const [dbResponse] = res.records.map(r => {
-        return {
-          report: r.get('report'),
-          submitter: r.get('submitter'),
-          resource: r.get('resource'),
-          type: r.get('type'),
+      try {
+        const txResult = await writeTxResultPromise
+        if (!txResult[0]) return null
+        const { report, submitter, resource, type } = txResult[0]
+        createdRelationshipWithNestedAttributes = {
+          ...report.properties,
+          post: null,
+          comment: null,
+          user: null,
+          submitter: submitter.properties,
+          type,
         }
-      })
-      if (!dbResponse) return null
-
-      const { report, submitter, resource, type } = dbResponse
-
-      const response = {
-        ...report.properties,
-        post: null,
-        comment: null,
-        user: null,
-        submitter: submitter.properties,
-        type,
+        switch (type) {
+          case 'Post':
+            createdRelationshipWithNestedAttributes.post = resource
+            break
+          case 'Comment':
+            createdRelationshipWithNestedAttributes.comment = resource
+            break
+          case 'User':
+            createdRelationshipWithNestedAttributes.user = resource
+            break
+        }
+      } finally {
+        session.close()
       }
-      switch (type) {
-        case 'Post':
-          response.post = resource.properties
-          break
-        case 'Comment':
-          response.comment = resource.properties
-          break
-        case 'User':
-          response.user = resource.properties
-          break
-      }
-
-      return response
+      return createdRelationshipWithNestedAttributes
     },
   },
   Query: {
@@ -113,13 +86,13 @@ export default {
 
         const responseEle = {
           ...report.properties,
-          resourceId: resource.properties.id,
           post: null,
           comment: null,
           user: null,
           submitter: submitter.properties,
           type,
         }
+
         switch (type) {
           case 'Post':
             responseEle.post = resource.properties
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 238de25dd..4022be1b1 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -20,7 +20,7 @@ describe('report mutation', () => {
 
   const action = () => {
     reportMutation = gql`
-      mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+      mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         report(
           resourceId: $resourceId
           reasonCategory: $reasonCategory
@@ -166,7 +166,7 @@ describe('report mutation', () => {
             reasonCategory: 'my_category',
           }
           await expect(action()).rejects.toThrow(
-            'Expected a value of type "ReasonCategory" but received: "my_category"',
+            'got invalid value "my_category"; Expected type ReasonCategory',
           )
         })
 
@@ -307,16 +307,11 @@ describe('report mutation', () => {
 })
 
 describe('reports query', () => {
-  let query
-  let mutate
-  let authenticatedUser = null
-  let moderator
-  let user
-  let author
+  let query, mutate, authenticatedUser, moderator, user, author
   const categoryIds = ['cat9']
 
   const reportMutation = gql`
-    mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+    mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
       report(
         resourceId: $resourceId
         reasonCategory: $reasonCategory
@@ -335,7 +330,6 @@ describe('reports query', () => {
         submitter {
           id
         }
-        resourceId
         type
         user {
           id
@@ -350,7 +344,8 @@ describe('reports query', () => {
     }
   `
 
-  beforeAll(() => {
+  beforeAll(async () => {
+    await factory.cleanDatabase()
     const { server } = createServer({
       context: () => {
         return {
@@ -480,7 +475,6 @@ describe('reports query', () => {
             submitter: expect.objectContaining({
               id: 'user1',
             }),
-            resourceId: 'auth1',
             type: 'User',
             user: expect.objectContaining({
               id: 'auth1',
@@ -495,7 +489,6 @@ describe('reports query', () => {
             submitter: expect.objectContaining({
               id: 'user1',
             }),
-            resourceId: 'p1',
             type: 'Post',
             user: null,
             post: expect.objectContaining({
@@ -510,7 +503,6 @@ describe('reports query', () => {
             submitter: expect.objectContaining({
               id: 'user1',
             }),
-            resourceId: 'c1',
             type: 'Comment',
             user: null,
             post: null,
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index f7be579a1..0822c14ed 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -5,10 +5,8 @@ type REPORTED {
   submitter: User
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
   # not yet supported
-  # resource: ReportReource
+  # resource: ReportResource
   #   @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource")
-  resourceId: ID
-    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource {.id}")
   type: String
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN labels(resource)[0]")
   user: User
@@ -29,7 +27,7 @@ enum ReasonCategory {
 }
 
 # not yet supported
-# union ReportReource = User | Post | Comment
+# union ReportResource = User | Post | Comment
 
 enum ReportOrdering {
   createdAt_desc
@@ -40,5 +38,5 @@ type Query {
 }
 
 type Mutation {
-  report(resourceId: ID!, reasonCategory: String!, reasonDescription: String!): REPORTED
+  report(resourceId: ID!, reasonCategory: ReasonCategory!, reasonDescription: String!): REPORTED
 }
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 8d93a90cf..76fbb4875 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -649,7 +649,7 @@ import { gql } from '../jest/helpers'
 
     // There is no error logged or the 'try' fails if this mutation is wrong. Why?
     const reportMutation = gql`
-      mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+      mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         report(
           resourceId: $resourceId
           reasonCategory: $reasonCategory
diff --git a/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql b/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql
deleted file mode 100644
index 8c32cf5ec..000000000
--- a/deployment/legacy-migration/maintenance-worker/migration/neo4j/dbManipulations/20191011_changeReportNodeToRelationOnly.cql
+++ /dev/null
@@ -1,7 +0,0 @@
-MATCH (submitter:User)-[:REPORTED]->(report:Report)-[:REPORTED]->(resource)
-DETACH DELETE report
-CREATE (submitter)-[reported:REPORTED]->(resource)
-SET reported.createdAt = toString(datetime())
-SET reported.reasonCategory = 'other'
-SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! Date-time is this creation date and time.'
-RETURN reported
\ No newline at end of file
diff --git a/neo4j/change_report_node_to_relationship.sh b/neo4j/change_report_node_to_relationship.sh
new file mode 100755
index 000000000..a17dc6fe0
--- /dev/null
+++ b/neo4j/change_report_node_to_relationship.sh
@@ -0,0 +1,26 @@
+#!/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 "
+MATCH (submitter:User)-[:REPORTED]->(report:Report)-[:REPORTED]->(resource)
+DETACH DELETE report
+CREATE (submitter)-[reported:REPORTED]->(resource)
+SET reported.createdAt = toString(datetime())
+SET reported.reasonCategory = 'other'
+SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! createdAt is when the database manipulation happened.'
+RETURN reported;
+" | cypher-shell

From 8e34b9581ba6c4924b0f58c472dcf4bc6d77a4fb Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 21:45:46 +0200
Subject: [PATCH 10/12] Update sneaky report mutation

---
 webapp/graphql/Moderation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 8ead28b61..9c31fbd34 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -84,7 +84,7 @@ export const reportListQuery = () => {
 
 export const reportMutation = () => {
   return gql`
-    mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+    mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
       report(
         resourceId: $resourceId
         reasonCategory: $reasonCategory

From f9fe93e5509278d0f281099a801bfc8e4575c21f Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 14 Oct 2019 21:56:28 +0200
Subject: [PATCH 11/12] Update reportListQuery to not request resourceId back

---
 webapp/graphql/Moderation.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 9c31fbd34..1a5bdb367 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -9,7 +9,6 @@ export const reportListQuery = () => {
         reasonCategory
         reasonDescription
         type
-        resourceId
         submitter {
           id
           slug

From 807c3e1972e0312e880aa42f4a9da799db0ac343 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 15 Oct 2019 00:33:54 +0200
Subject: [PATCH 12/12] Update missed reasonCategory param in cypress test

---
 cypress/integration/common/report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index ab9a90e36..c32d5e10a 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -127,7 +127,7 @@ Given('somebody reported the following posts:', table => {
     cy.factory()
       .create('User', submitter)
       .authenticateAs(submitter)
-      .mutate(`mutation($resourceId: ID!, $reasonCategory: String!, $reasonDescription: String!) {
+      .mutate(`mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         report(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
           type
         }