Skip to content

Commit a1fe5b4

Browse files
committed
Resource name in response to make debugging easier
1 parent c94f45b commit a1fe5b4

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

src/services/ResourceService.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,21 @@ async function getResources (currentUser, challengeId, roleId, memberId, memberH
164164
...prismaFilter,
165165
orderBy,
166166
skip: (page - 1) * perPage,
167-
take: perPage
167+
take: perPage,
168+
include: {
169+
resourceRole: {
170+
select: {
171+
name: true
172+
}
173+
}
174+
}
168175
}
169176
let resources = await prisma.resource.findMany(prismaQuery)
170177
resources = _.map(resources, item => {
171-
const ret = _.omit(item, 'updatedBy', 'updatedAt', 'createdAt')
178+
const ret = _.omit(item, 'updatedBy', 'updatedAt', 'createdAt', 'resourceRole')
172179
ret.created = item.createdAt
173180
ret.phaseChangeNotifications = Boolean(item.phaseChangeNotifications)
181+
ret.roleName = _.get(item, 'resourceRole.name', null)
174182
return ret
175183
})
176184

test/unit/getResources.test.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ module.exports = describe('Get resources', () => {
3838
should.equal(entity.memberId, expected.memberId)
3939

4040
should.equal(entity.memberHandle.toLowerCase(), expected.memberHandle.toLowerCase())
41+
const resourceRole = await helper.getById('ResourceRole', entity.roleId)
42+
should.exist(expected.roleName)
43+
expected.roleName.should.be.String()
44+
should.equal(expected.roleName, resourceRole.name)
4145
if (entity.memberHandle.toLowerCase() === 'phead') {
4246
if (entity.roleId === copilotRoleId) {
4347
hasCopilotRole = true
@@ -66,6 +70,7 @@ module.exports = describe('Get resources', () => {
6670
await assertResource(record.id, record)
6771
should.exist(record.memberEmail)
6872
record.memberEmail.should.be.String()
73+
should.exist(record.roleName)
6974
}
7075
// user phead should have two resources
7176
should.equal(hasCopilotRole, true)
@@ -81,6 +86,7 @@ module.exports = describe('Get resources', () => {
8186
await assertResource(record.id, record)
8287
should.exist(record.memberEmail)
8388
record.memberEmail.should.be.String()
89+
should.exist(record.roleName)
8490
}
8591
// user phead should have two resources
8692
should.equal(hasCopilotRole, true)
@@ -92,6 +98,7 @@ module.exports = describe('Get resources', () => {
9298
should.equal(result.total, 1)
9399
should.equal(result.data[0].memberHandle, 'diazz')
94100
should.not.exist(result.data[0].memberEmail)
101+
should.exist(result.data[0].roleName)
95102
})
96103

97104
it('get resources using m2m token', async () => {
@@ -103,6 +110,7 @@ module.exports = describe('Get resources', () => {
103110
await assertResource(record.id, record)
104111
should.exist(record.memberEmail)
105112
record.memberEmail.should.be.String()
113+
should.exist(record.roleName)
106114
}
107115
// user phead should have two resources
108116
should.equal(hasCopilotRole, true)
@@ -118,6 +126,7 @@ module.exports = describe('Get resources', () => {
118126
await assertResource(record.id, record)
119127
should.exist(record.memberEmail)
120128
record.memberEmail.should.be.String()
129+
should.exist(record.roleName)
121130
}
122131
// user phead should have copilot role
123132
should.equal(hasCopilotRole, true)

0 commit comments

Comments
 (0)