From d2442b73c964a7857a00489235300051cb331752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Fri, 15 Nov 2019 10:49:55 +0100 Subject: [PATCH] Refactor report mutation --- backend/src/schema/resolvers/reports.js | 6 ++++++ ...hange_disabled_relationship_to_decided_relationship.sh | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js index 4e77ee5ec..568b84e97 100644 --- a/backend/src/schema/resolvers/reports.js +++ b/backend/src/schema/resolvers/reports.js @@ -13,6 +13,12 @@ export default { 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, closed: false}]-(submitter) + MATCH (resource)<-[:FLAGGED]-(case:Case {closed: false}) + MERGE (resource)<-[:FLAGGED]-(case:Case {closed: false}) + ON CREATE SET case.id = randomUUID(), case.updatedAt = toString(datetime()), case.createdAt = case.updatedAt, case.disable = true, case.closed = false + //WITH submitter, resource + CREATE (case)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter) CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription, closed: false}]-(submitter) RETURN report, submitter, resource, labels(resource)[0] as type `, diff --git a/neo4j/change_disabled_relationship_to_decided_relationship.sh b/neo4j/change_disabled_relationship_to_decided_relationship.sh index 2aef78d1a..efd711b95 100755 --- a/neo4j/change_disabled_relationship_to_decided_relationship.sh +++ b/neo4j/change_disabled_relationship_to_decided_relationship.sh @@ -29,10 +29,10 @@ WITH moderator, disabledResource, case //, review //OPTIONAL MATCH (noReporterDisabledResource:User)-[:REPORTED]->(disabledResource) //WHERE noReporterDisabledResource IS NULL -OPTIONAL MATCH (:User)-[notExistingReport:REPORTED]->(disabledResource) -WHERE notExistingReport IS NULL -//MATCH (noReporterDisabledResource:User) -//WHERE NOT (noReporterDisabledResource:User)-[:REPORTED]->(disabledResource) +//OPTIONAL MATCH (:User)-[notExistingReport:REPORTED]->(disabledResource) +//WHERE notExistingReport IS NULL +OPTIONAL MATCH (noReporterDisabledResource:User)-[notExistingReport:REPORTED]->(disabledResource) +WHERE NOT (noReporterDisabledResource)-[notExistingReport]->(disabledResource) CREATE (moderator)-[addModeratorReport:REPORTED]->(case) SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'