get full role object for resources API

Author: zhijie

src/services/ResourceService.js

@@ -136,13 +136,35 @@ async function getResources (currentUser, challengeId, roleId, memberId, memberH
   const total = await prisma.resource.count(prismaFilter)
   const prismaQuery = {
     ...prismaFilter,
+    include: {
+      resourceRole: {
+        select: {
+          id: true,
+          name: true,
+          nameLower: true,
+          fullReadAccess: true,
+          fullWriteAccess: true,
+          isActive: true,
+          selfObtainable: true,
+          legacyId: true,
+          resourceRolePhaseDependencies: {
+            select: {
+              id: true,
+              phaseId: true,
+              resourceRoleId: true,
+              phaseState: true
+            }
+          }
+        }
+      }
+    },
     orderBy,
     skip: (page - 1) * perPage,
     take: perPage
   }
   let resources = await prisma.resource.findMany(prismaQuery)
   resources = _.map(resources, item => {
-    const ret = _.omit(item, 'updatedBy', 'updatedAt', 'createdAt')
+    const ret = _.omit(item, 'roleId', 'updatedBy', 'updatedAt', 'createdAt')
     ret.created = item.createdAt
     return ret
   })

test/unit/getResources.test.js

@@ -36,7 +36,7 @@ module.exports = describe('Get resources', () => {
     should.equal(entity.challengeId, challengeId)
     should.equal(entity.memberId, expected.memberId)
     should.equal(entity.memberHandle.toLowerCase(), expected.memberHandle.toLowerCase())
-    should.equal(entity.roleId, expected.roleId)
+    should.equal(entity.roleId, expected.resourceRole.id)
     if (entity.memberHandle.toLowerCase() === 'hohosky') {
       if (entity.roleId === copilotRoleId) {
         hasCopilotRole = true