From 623af5f47ba11fc71abda14848c1fffbde38bc0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 29 Aug 2022 11:18:40 +0200
Subject: [PATCH] Query for group 'id' directly in resolver

---
 backend/src/schema/resolvers/groups.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/groups.js b/backend/src/schema/resolvers/groups.js
index 5737f5505..2d9dde1ff 100644
--- a/backend/src/schema/resolvers/groups.js
+++ b/backend/src/schema/resolvers/groups.js
@@ -9,25 +9,26 @@ import Resolver from './helpers/Resolver'
 export default {
   Query: {
     Group: async (_object, params, context, _resolveInfo) => {
-      const { isMember } = params
+      const { id: groupId, isMember } = params
       const session = context.driver.session()
       const readTxResultPromise = session.readTransaction(async (txc) => {
+        const groupIdCypher = groupId ? ` {id: "${groupId}"}` : ''
         let groupCypher
         if (isMember === true) {
           groupCypher = `
-            MATCH (:User {id: $userId})-[membership:MEMBER_OF]->(group:Group)
+            MATCH (:User {id: $userId})-[membership:MEMBER_OF]->(group:Group${groupIdCypher})
             RETURN group {.*, myRole: membership.role}
           `
         } else {
           if (isMember === false) {
             groupCypher = `
-              MATCH (group:Group)
+              MATCH (group:Group${groupIdCypher})
               WHERE NOT (:User {id: $userId})-[:MEMBER_OF]->(group)
               RETURN group {.*, myRole: NULL}
             `
           } else {
             groupCypher = `
-              MATCH (group:Group)
+              MATCH (group:Group${groupIdCypher})
               OPTIONAL MATCH (:User {id: $userId})-[membership:MEMBER_OF]->(group)
               RETURN group {.*, myRole: membership.role}
             `