Skip to content

Commit cab341c

Browse files
committed
Changing memberID comparison to be a string for forward compatibility with uuids
1 parent fa915ce commit cab341c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/services/ResourceService.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ async function createResource (currentUser, resource) {
260260
}
261261

262262
if (_.reduce(resources,
263-
(result, r) => _.toNumber(r.memberId) === _.toNumber(memberId) && r.roleId === resource.roleId ? true : result,
263+
(result, r) => _.toString(r.memberId) === _.toString(memberId) && r.roleId === resource.roleId ? true : result,
264264
false)) {
265265
throw new errors.ConflictError(`User ${resource.memberHandle} already has resource with roleId: ${resource.roleId} in challenge: ${challengeId}`)
266266
}
@@ -309,7 +309,7 @@ async function deleteResource (currentUser, resource) {
309309
const { resources, memberId, handle } = await init(currentUser, challengeId, resource)
310310

311311
const ret = _.reduce(resources,
312-
(result, r) => _.toNumber(r.memberId) === _.toNumber(memberId) && r.roleId === resource.roleId ? r : result,
312+
(result, r) => _.toString(r.memberId) === _.toString(memberId) && r.roleId === resource.roleId ? r : result,
313313
undefined)
314314

315315
if (!ret) {
@@ -408,7 +408,7 @@ async function listChallengesByMember (memberId, criteria) {
408408
}
409409

410410
listChallengesByMember.schema = {
411-
memberId: Joi.number().integer().positive().required(),
411+
memberId: Joi.string().required(),
412412
criteria: Joi.object().keys({
413413
resourceRoleId: Joi.string().uuid(),
414414
page: Joi.page(),

0 commit comments

Comments
 (0)