Merge branch 'master' into develop

James Cori · James Cori · commit 09e991ea24a3 · 2021-02-19T11:43:53.000-05:00
diff --git a/src/services/resourceService.js b/src/services/resourceService.js
@@ -214,7 +214,7 @@ async function deleteAllResourcesForChallenge (challengeId) {
 
 async function getResourcesFromV5API (challengeId, roleId) {
   const token = await getM2MToken()
-  let url = `${config.RESOURCES_API_URL}?challengeId=${challengeId}`
+  let url = `${config.RESOURCES_API_URL}?challengeId=${challengeId}&perPage=1000`
   if (roleId) {
     url += `&roleId=${roleId}`
   }
diff --git a/src/services/syncService.js b/src/services/syncService.js
@@ -153,8 +153,8 @@ async function processResources (legacyId, challengeId, force) {
   const currentV4Array = await resourceService.getResourcesForChallenge(legacyId, challengeId)
   const currentV5Array = await resourceService.getResourcesFromV5API(challengeId)
 
-  // logger.debug(`Resources V4 Array ${JSON.stringify(currentV4Array)}`)
-  // logger.debug(`Resources V5 Array ${JSON.stringify(currentV5Array)}`)
+  logger.debug(`Resources V4 Array ${JSON.stringify(currentV4Array)}`)
+  logger.debug(`Resources V5 Array ${JSON.stringify(currentV5Array)}`)
 
   for (let i = 0; i < currentV4Array.length; i += 1) {
     const v4Obj = currentV4Array[i]

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ async function deleteAllResourcesForChallenge (challengeId) {`
`214`	`214`
`215`	`215`	`async function getResourcesFromV5API (challengeId, roleId) {`
`216`	`216`	`const token = await getM2MToken()`
`217`		- let url = `${config.RESOURCES_API_URL}?challengeId=${challengeId}`
	`217`	+ let url = `${config.RESOURCES_API_URL}?challengeId=${challengeId}&perPage=1000`
`218`	`218`	`if (roleId) {`
`219`	`219`	url += `&roleId=${roleId}`
`220`	`220`	`}`