Skip to content

Commit 7124c17

Browse files
authored
Merge pull request #102 from topcoder-platform/feat/return-group-uuid
feat: return group UUID
2 parents ec297fe + 9d8735b commit 7124c17

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ workflows:
7171
branches:
7272
only:
7373
- develop
74+
- feat/return-group-uuid
7475
- "build-prod":
7576
context : org-global
7677
filters:

src/controllers/GroupMembershipController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ async function listGroupsMemberCount (req, res) {
8888
* @param res the response
8989
*/
9090
async function getMemberGroups (req, res) {
91-
const result = await service.getMemberGroups(req.params.memberId)
91+
const result = await service.getMemberGroups(req.params.memberId, req.query)
9292
helper.setResHeaders(req, res, result)
9393
res.send(result)
9494
}

src/services/GroupMembershipService.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -540,11 +540,12 @@ listGroupsMemberCount.schema = {
540540
* @param {Object} query the search criteria
541541
* @returns {Object} the search result
542542
*/
543-
async function getMemberGroups (memberId) {
543+
async function getMemberGroups (memberId, query) {
544544
const session = helper.createDBSession()
545545
try {
546+
const returnUuid = query.uuid
546547
const res = await session.run(
547-
`MATCH (g:Group)-[r:GroupContains*1..]->(o {id: "${memberId}"}) WHERE exists(g.oldId) AND g.status = '${constants.GroupStatus.Active}' RETURN g.oldId order by g.oldId`
548+
`MATCH (g:Group)-[r:GroupContains*1..]->(o {id: "${memberId}"}) WHERE exists(g.oldId) AND g.status = '${constants.GroupStatus.Active}' RETURN ${returnUuid ? 'g.id order by g.id' : 'g.oldId order by g.oldId'}`
548549
)
549550

550551
return _.uniq(_.map(res.records, (record) => record.get(0)))
@@ -558,7 +559,10 @@ async function getMemberGroups (memberId) {
558559
}
559560

560561
getMemberGroups.schema = {
561-
memberId: Joi.id()
562+
memberId: Joi.id(),
563+
query: Joi.object().keys({
564+
uuid: Joi.boolean().default(false)
565+
})
562566
}
563567

564568
async function groupValidityCheck(memberId, groupId) {

0 commit comments

Comments
 (0)