@@ -52,14 +52,15 @@ async function getResources (currentUser, challengeId, roleId, page, perPage) {
52
52
page = page || 1
53
53
perPage = perPage || config . DEFAULT_PAGE_SIZE
54
54
55
- boolQuery . push ( { match : { challengeId } } )
55
+ boolQuery . push ( { match_phrase : { challengeId } } )
56
56
57
+ // logger.warn('User Check')
57
58
if ( ! currentUser || ( ! currentUser . isMachine && ! helper . hasAdminRole ( currentUser ) ) ) {
58
59
// await checkAccess(currentUser, resources)
59
60
// if not admin, and not machine, only return submitters
60
- boolQuery . push ( { match : { roleId : config . SUBMITTER_RESOURCE_ROLE_ID } } )
61
+ boolQuery . push ( { match_phrase : { roleId : config . SUBMITTER_RESOURCE_ROLE_ID } } )
61
62
} else if ( roleId ) {
62
- boolQuery . push ( { match : { roleId } } )
63
+ boolQuery . push ( { match_phrase : { roleId } } )
63
64
}
64
65
65
66
mustQuery . push ( {
@@ -83,7 +84,7 @@ async function getResources (currentUser, challengeId, roleId, page, perPage) {
83
84
}
84
85
const esClient = await helper . getESClient ( )
85
86
let docs
86
- // logger.info(`ES Query ${JSON.stringify(esQuery)}`)
87
+ logger . info ( `ES Query ${ JSON . stringify ( esQuery ) } ` )
87
88
try {
88
89
docs = await esClient . search ( esQuery )
89
90
} catch ( e ) {
@@ -99,6 +100,7 @@ async function getResources (currentUser, challengeId, roleId, page, perPage) {
99
100
}
100
101
// Extract data from hits
101
102
const resources = _ . map ( docs . hits . hits , item => item . _source )
103
+ // logger.warn('Resources extracted')
102
104
103
105
const memberIds = _ . uniq ( _ . map ( resources , r => r . memberId ) )
104
106
0 commit comments