Refactor remove resource

Author: rootelement

src/app.js

@@ -8,7 +8,7 @@ const { isNil, get } = require('lodash')
 const Kafka = require('no-kafka')
 const healthcheck = require('topcoder-healthcheck-dropin')
 const logger = require('./common/logger')
-const helper = require('./common/helper')
+// const helper = require('./common/helper')
 const { getKafkaOptions } = require('./common/utils')
 const ProcessorService = require('./services/ProcessorService')
 

src/services/ProjectService.js

@@ -1,5 +1,6 @@
 const helper = require('../common/helper')
 const logger = require('../common/logger')
+const { toInteger } = require('lodash')
 const Constants = require('../constants')
 
 const QUERY_CHECK_RESOURCE_EXISTS = 'SELECT COUNT(*) as num FROM resource WHERE project_id = %d AND resource_role_id = %d AND user_id = %d'
@@ -12,8 +13,8 @@ const QUERY_CHECK_RESOURCE_EXISTS = 'SELECT COUNT(*) as num FROM resource WHERE
  * @return the result
  */
 async function resourceExists (challengeId, roleId, userId) {
-  const result = helper.queryDataFromDB(QUERY_CHECK_RESOURCE_EXISTS, [challengeId, roleId, userId])
-  logger.debug(`resourceExists ${JSON.stringify([challengeId, roleId, userId])} result: ${JSON.stringify(result)}`)
+  const result = helper.queryDataFromDB(QUERY_CHECK_RESOURCE_EXISTS, [challengeId, roleId, toInteger(userId)])
+  logger.debug(`resourceExists ${JSON.stringify([challengeId, roleId, toInteger(userId)])} result: ${JSON.stringify(result)}`)
   if (result && result.length > 0) {
     return result[0].num > 0
   }
@@ -92,6 +93,7 @@ const QUERY_DELETE_RESOURCE = 'DELETE FROM resource WHERE resource_id = ?'
  * @param operatorId operator id
  */
 async function removeResource (resource) {
+  logger.debug(`removeResource ${JSON.stringify(resource)}`)
   await helper.executeSQLonDB(QUERY_DELETE_RES_INFO, [resource.resourceid])
   await helper.executeSQLonDB(QUERY_DELETE_SUBMISSION, [resource.resourceid])
   await helper.executeSQLonDB(QUERY_DELETE_RESOURCE, [resource.resourceid])

src/services/ResourceDirectManager.js

@@ -3,6 +3,7 @@ const RegistrationDAO = require('../dao/RegistrationDAO')
 const SequenceDAO = require('../dao/SequenceDAO')
 const logger = require('../common/logger')
 const config = require('config')
+const { find, toString } = require('lodash')
 
 /**
  * Assign the given roleId to the specified userId in the given project.
@@ -51,38 +52,23 @@ async function assignRole (legacyChallengeId, roleId, userId, handle) {
 
 /**
  * Assign the given roleId to the specified userId in the given project.
- * @param operatorId
  * @param legacyChallengeId
  *            the id of the contest/challenge.
  * @param roleId
  *            the id of the role.
  * @param userId
  *            the id of the user.
- * @param phase
- *            the <code>Phase</code> associated with the resource.
- * @param addNotification
- *            whether to add notification.
- * @param addForumWatch
- *            whether to add forum watch.
- * @param isStudio
- *            whether assign to studio contest.
- * @param checkTerm
- *            whether to check terms and conditions.
  */
 async function removeRole (legacyChallengeId, roleId, userId) {
-  logger.debug('Checking that User ' + userId + ' has role ' + roleId + ' for the project ' + legacyChallengeId)
-  let found = await ProjectServices.resourceExists(legacyChallengeId, roleId, userId)
-  if (!found) {
+  const resources = await ProjectServices.searchResources(legacyChallengeId, roleId)
+  const existingResource = find(resources, r => toString(r.userid) === toString(userId))
+
+  if (!existingResource) {
     logger.error('removeRole Resource Not Found')
     throw new Error('User ' + userId + ' does not have role ' + roleId + ' for the project ' + legacyChallengeId)
   }
-  const resources = await ProjectServices.searchResources(legacyChallengeId, roleId)
-  for (const resource of resources) {
-    logger.debug(`removeRole - Loop ${JSON.stringify(resource)}`)
-    if (+resource.userid === userId) {
-      await ProjectServices.removeResource(resource)
-    }
-  }
+
+  await ProjectServices.removeResource(existingResource)
 }
 
 /**