From d03d66905656d7ef9633ba79715ccbaff11bf66f Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 27 Nov 2019 17:26:42 +0100 Subject: [PATCH] Remove reviewedByModerator from resources - moved to Report node, as the report was reviewed by the moderator... a resource can have many reports on them, so we are interested in grouping reviewed/filed by report --- backend/src/schema/resolvers/comments.js | 4 ---- .../resolvers/helpers/reportResource.js | 21 ------------------- backend/src/schema/resolvers/posts.js | 4 ---- backend/src/schema/resolvers/users.js | 4 ---- backend/src/schema/types/type/Comment.gql | 9 -------- backend/src/schema/types/type/Post.gql | 9 -------- backend/src/schema/types/type/User.gql | 9 -------- 7 files changed, 60 deletions(-) delete mode 100644 backend/src/schema/resolvers/helpers/reportResource.js diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js index 57d4da2b9..16fa2ec29 100644 --- a/backend/src/schema/resolvers/comments.js +++ b/backend/src/schema/resolvers/comments.js @@ -1,6 +1,5 @@ import uuid from 'uuid/v4' import Resolver from './helpers/Resolver' -import { queryReviewedByModerator } from './helpers/reportResource.js' export default { Mutation: { @@ -72,8 +71,5 @@ export default { post: '-[:COMMENTS]->(related:Post)', }, }), - reviewedByModerator: async (parent, _params, context, _resolveInfo) => { - return queryReviewedByModerator('Comment', parent, context) - }, }, } diff --git a/backend/src/schema/resolvers/helpers/reportResource.js b/backend/src/schema/resolvers/helpers/reportResource.js deleted file mode 100644 index ff32e4a14..000000000 --- a/backend/src/schema/resolvers/helpers/reportResource.js +++ /dev/null @@ -1,21 +0,0 @@ -export async function queryReviewedByModerator(label, parent, context) { - if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator - const { id } = parent - const statement = ` - MATCH (resource {id: $id})<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User) - WHERE $label IN labels(resource) - RETURN moderator - ORDER BY report.updatedAt DESC, review.updatedAt DESC - LIMIT 1 - ` - let reviewedByModerator - const session = context.driver.session() - try { - const result = await session.run(statement, { label, id }) - const [firstElement] = result.records.map(r => r.get('moderator').properties) - reviewedByModerator = firstElement - } finally { - session.close() - } - return reviewedByModerator -} diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js index 495125729..5583eead5 100644 --- a/backend/src/schema/resolvers/posts.js +++ b/backend/src/schema/resolvers/posts.js @@ -5,7 +5,6 @@ import { getBlockedUsers, getBlockedByUsers } from './users.js' import { mergeWith, isArray, isEmpty } from 'lodash' import { UserInputError } from 'apollo-server' import Resolver from './helpers/Resolver' -import { queryReviewedByModerator } from './helpers/reportResource.js' const filterForBlockedUsers = async (params, context) => { if (!context.user) return params @@ -342,8 +341,5 @@ export default { } return relatedContributions }, - reviewedByModerator: async (parent, _params, context, _resolveInfo) => { - return queryReviewedByModerator('Post', parent, context) - }, }, } diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js index 7a9a1f0bc..c25d20c0f 100644 --- a/backend/src/schema/resolvers/users.js +++ b/backend/src/schema/resolvers/users.js @@ -3,7 +3,6 @@ import fileUpload from './fileUpload' import { neode } from '../../bootstrap/neo4j' import { UserInputError, ForbiddenError } from 'apollo-server' import Resolver from './helpers/Resolver' -import { queryReviewedByModerator } from './helpers/reportResource.js' const instance = neode() @@ -215,8 +214,5 @@ export default { badges: '<-[:REWARDED]-(related:Badge)', }, }), - reviewedByModerator: async (parent, _params, context, _resolveInfo) => { - return queryReviewedByModerator('User', parent, context) - }, }, } diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql index 23ab3aae0..cf53df41d 100644 --- a/backend/src/schema/types/type/Comment.gql +++ b/backend/src/schema/types/type/Comment.gql @@ -47,15 +47,6 @@ type Comment { updatedAt: String deleted: Boolean disabled: Boolean - reviewedByModerator: User - @cypher( - statement: """ - MATCH (this)<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User) - RETURN moderator - ORDER BY report.updatedAt DESC, review.updatedAt DESC - LIMIT 1 - """ - ) } type Query { diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql index eb6ab845a..fd387981d 100644 --- a/backend/src/schema/types/type/Post.gql +++ b/backend/src/schema/types/type/Post.gql @@ -121,15 +121,6 @@ type Post { visibility: Visibility deleted: Boolean disabled: Boolean - reviewedByModerator: User - @cypher( - statement: """ - MATCH (this)<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User) - RETURN moderator - ORDER BY report.updatedAt DESC, review.updatedAt DESC - LIMIT 1 - """ - ) pinned: Boolean createdAt: String updatedAt: String diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql index 499718e21..243f45322 100644 --- a/backend/src/schema/types/type/User.gql +++ b/backend/src/schema/types/type/User.gql @@ -33,15 +33,6 @@ type User { coverImg: String deleted: Boolean disabled: Boolean - reviewedByModerator: User - @cypher( - statement: """ - MATCH (this)<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User) - RETURN moderator - ORDER BY report.updatedAt DESC, review.updatedAt DESC - LIMIT 1 - """ - ) role: UserGroup! publicKey: String invitedBy: User @relation(name: "INVITED", direction: "IN")