Merge branch 'develop'

Author: rootelement

src/services/ResourceService.js

@@ -55,10 +55,29 @@ async function getResources (currentUser, challengeId, roleId, page, perPage) {
   boolQuery.push({ match_phrase: { challengeId } })
 
   // logger.warn('User Check')
-  if (!currentUser || (!currentUser.isMachine && !helper.hasAdminRole(currentUser))) {
-    // await checkAccess(currentUser, resources)
-    // if not admin, and not machine, only return submitters
+  if (!currentUser) {
+    // if the user is not logged in, only return resources with submitter role ID
     boolQuery.push({ match_phrase: { roleId: config.SUBMITTER_RESOURCE_ROLE_ID } })
+  } else if ((!currentUser.isMachine && !helper.hasAdminRole(currentUser))) {
+    // await checkAccess(currentUser, resources)
+    // if not admin, and not machine, only return submitters + all my roles
+    boolQuery.push({
+      bool: {
+        should: [
+          { match_phrase: { memberId: currentUser.userId } },
+          {
+            bool: {
+              must: [
+                { match_phrase: { roleId: config.SUBMITTER_RESOURCE_ROLE_ID } }
+              ],
+              must_not: [
+                { match_phrase: { memberId: currentUser.userId } }
+              ]
+            }
+          }
+        ]
+      }
+    })
   } else if (roleId) {
     boolQuery.push({ match_phrase: { roleId } })
   }