improved code and tests as suggested by @Tirokk, thanks for the great…

… review!
Ocelot-Social-Community · Oct 10, 2022 · 631f34a · 631f34a
1 parent 4556276
commit 631f34a
Show file tree

Hide file tree

Showing 3 changed files with 215 additions and 234 deletions.
diff --git a/backend/src/schema/resolvers/groups.js b/backend/src/schema/resolvers/groups.js
@@ -287,17 +287,16 @@ export default {
       const session = context.driver.session()
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         let postRestrictionCypher = ''
-        if (['owner', 'admin', 'usual'].includes(roleInGroup)) {
+        if (roleInGroup === 'pending') {
           postRestrictionCypher = `
             WITH group, member, membership
-            FOREACH (restriction IN [(member)-[r:CANNOT_SEE]->(:Post)-[:IN]->(group) | r] |
-              DELETE restriction)`
+            FOREACH (post IN [(p:Post)-[:IN]->(group) | p] |
+              MERGE (member)-[:CANNOT_SEE]->(post))`
         } else {
-          // user becomes pending member
           postRestrictionCypher = `
             WITH group, member, membership
-            FOREACH (post IN [(p:Post)-[:IN]->(group) | p] |
-              MERGE (member)-[:CANNOT_SEE]->(post))`
+            FOREACH (restriction IN [(member)-[r:CANNOT_SEE]->(:Post)-[:IN]->(group) | r] |
+              DELETE restriction)`
         }
 
         const joinGroupCypher = `

diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
@@ -102,7 +102,7 @@ export default {
                WHERE group.groupType IN ['closed', 'hidden']
                  AND membership.role IN ['usual', 'admin', 'owner']
              WITH post, collect(user.id) AS userIds
-             OPTIONAL MATCH path =(blocked:User) WHERE NOT blocked.id IN userIds 
+             OPTIONAL MATCH path =(restricted:User) WHERE NOT restricted.id IN userIds 
              FOREACH (user IN nodes(path) |
                MERGE (user)-[:CANNOT_SEE]->(post)
              )`
@@ -129,7 +129,7 @@ export default {
             ${groupCypher}
             RETURN post {.*}
           `,
-          { userId: context.user.id, params, categoryIds, groupId },
+          { userId: context.user.id, categoryIds, groupId, params },
         )
         const [post] = createPostTransactionResponse.records.map((record) => record.get('post'))
         if (imageInput) {