From 5c7f92e557e20726c3581a008a2a8212cca34e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 20 Feb 2020 10:54:34 +0100 Subject: [PATCH] Remove user GQL prop 'filedUnclosedReportByCurrentUser' again - Shall be implemented in a later PR. --- backend/src/schema/resolvers/reports.spec.js | 6 ------ backend/src/schema/resolvers/users.js | 2 -- backend/src/schema/types/type/User.gql | 8 -------- 3 files changed, 16 deletions(-) diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js index 97b0a2ac6..5e1156f0c 100644 --- a/backend/src/schema/resolvers/reports.spec.js +++ b/backend/src/schema/resolvers/reports.spec.js @@ -25,8 +25,6 @@ describe('file a report on a resource', () => { __typename ... on User { name - # Wolle filedUnclosedReportByCurrentUser - # Wolle test followedByCurrentUser } ... on Post { title @@ -198,7 +196,6 @@ describe('file a report on a resource', () => { describe('valid resource', () => { describe('creates report', () => { it('which belongs to resource', async () => { - // Wolle it('which belongs to resource now reported by current user', async () => { await expect( mutate({ mutation: fileReportMutation, @@ -210,7 +207,6 @@ describe('file a report on a resource', () => { reportId: expect.any(String), resource: { name: 'abusive-user', - // Wolle filedUnclosedReportByCurrentUser: true, }, }, }, @@ -752,8 +748,6 @@ describe('file a report on a resource', () => { resource: { __typename: 'User', id: 'abusive-user-1', - // Wolle filedUnclosedReportByCurrentUser: false, - // Wolle test followedByCurrentUser: false, }, filed: expect.arrayContaining([ expect.objectContaining({ diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js index 6d8041716..a1b68e20d 100644 --- a/backend/src/schema/resolvers/users.js +++ b/backend/src/schema/resolvers/users.js @@ -251,8 +251,6 @@ export default { boolean: { followedByCurrentUser: 'MATCH (this)<-[:FOLLOWS]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1', - filedUnclosedReportByCurrentUser: - 'MATCH (this)<-[:BELONGS_TO]-(:Report {closed: false})<-[:FILED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1', isBlocked: 'MATCH (this)<-[:BLOCKED]-(u:User {id: $cypherParams.currentUserId}) RETURN COUNT(u) >= 1', blocked: diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql index 4f07a7ebc..948d8e7d3 100644 --- a/backend/src/schema/types/type/User.gql +++ b/backend/src/schema/types/type/User.gql @@ -69,14 +69,6 @@ type User { """ ) - # Has the currently logged in user reported that user? - filedUnclosedReportByCurrentUser: Boolean! @cypher( - statement: """ - MATCH (this)<-[:BELONGS_TO]-(:Report {closed: false})<-[:FILED]-(u:User { id: $cypherParams.currentUserId}) - RETURN COUNT(u) >= 1 - """ - ) - isBlocked: Boolean! @cypher( statement: """ MATCH (this)<-[:BLOCKED]-(user:User {id: $cypherParams.currentUserId})