fix: add submitter

Author: rakibansary

config/default.js

@@ -70,6 +70,7 @@ module.exports = {
     timeout: parseInt(process.env.TIMEOUT, 10) || 30000
   },
 
+  LEGACY_SUBMITTER_ROLE_ID: process.env.LEGACY_SUBMITTER_ROLE_ID || 1,
   LEGACY_REVIEWER_ROLE_ID: process.env.LEGACY_REVIEWER_ROLE_ID || 4,
   LEGACY_REVIEW_PHASE_ID: process.env.LEGACY_REVIEW_PHASE_ID || 4,
   LEGACY_REVIEWER_ITERATIVE_ROLE_ID: process.env.LEGACY_REVIEWER_ITERATIVE_ROLE_ID || 21,

src/common/helper.js

@@ -203,6 +203,10 @@ function isReviewerRole (roleId) {
   return roleId === config.REVIEWER_ROLE_ID || roleId === config.ITERATIVE_REVIEWER_ROLE_ID || roleId === config.LEGACY_REVIEWER_ROLE_ID || roleId === config.LEGACY_REVIEWER_ITERATIVE_ROLE_ID
 }
 
+function isSubmitterRole (roleId) {
+  return roleId === config.LEGACY_SUBMITTER_ROLE_ID || roleId === config.SUBMITTER_ROLE_ID
+}
+
 async function getUserId (handle) {
   const token = await getM2Mtoken()
   const result = await getRequest(`${config.MEMBER_API_V5_URL}/${handle}`, token)
@@ -223,5 +227,6 @@ module.exports = {
   executeSQLonDB,
   forceV4ESFeeder,
   isReviewerRole,
+  isSubmitterRole,
   getUserId
 }

src/dao/RegistrationDAO.js

@@ -52,6 +52,7 @@ async function persistResourceWithRoleId (userId, challengeId, resourceId, roleI
   await persistResourceInfo(userId, resourceId, RESOURCE_TYPE_HANDLE_ID, handle)
   await persistResourceInfo(userId, resourceId, RESOURCE_TYPE_REG_DATE, regDate)
   await persistResourceInfo(userId, resourceId, RESOURCE_TYPE_APPEALS_COMPLETED, 'NO')
+
   if (roleId === COPILOT_RESOURCE_ROLE_ID) {
     logger.debug(`Copilot Payment Amount Set on Resource Info Table: ${copilotPaymentAmount}`)
     await persistResourceInfo(userId, resourceId, RESOURCE_TYPE_COPILOT_PAYMENT_ID, copilotPaymentAmount || 0)

src/services/ProcessorService.js

@@ -116,12 +116,17 @@ async function _updateChallengeResource (message, isDelete) {
     await helper.forceV4ESFeeder(_.get(v5Challenge, 'legacyId'))
     await new Promise(resolve => setTimeout(resolve, config.INDEX_CHALLENGE_TIMEOUT * 1000))
     logger.debug('End v4 challenge reindexing to the elasticsearch service')
+
     if (isDelete) {
-      logger.debug(`v4 Unregistering Submitter ${config.CHALLENGE_API_V4_URL}/${_.get(v5Challenge, 'legacyId')}/unregister?userId=${userId} - ${JSON.stringify(body)}`)
-      await helper.postRequest(`${config.CHALLENGE_API_V4_URL}/${_.get(v5Challenge, 'legacyId')}/unregister?userId=${userId}`, {}, m2mToken)
+      // logger.debug(`v4 Unregistering Submitter ${config.CHALLENGE_API_V4_URL}/${_.get(v5Challenge, 'legacyId')}/unregister?userId=${userId} - ${JSON.stringify(body)}`)
+      // await helper.postRequest(`${config.CHALLENGE_API_V4_URL}/${_.get(v5Challenge, 'legacyId')}/unregister?userId=${userId}`, {}, m2mToken)
+      logger.debug(`Unregistering Submitter ${legacyChallengeID} with roleID ${config.LEGACY_SUBMITTER_ROLE_ID} and userId ${userId}`)
+      await ResourceDirectManager.removeResource(legacyChallengeID, config.LEGACY_SUBMITTER_ROLE_ID, userId)
     } else {
-      logger.debug(`v4 Registering Submitter ${config.CHALLENGE_API_V4_URL}/${_.get(v5Challenge, 'legacyId')}/register?userId=${userId}&v5ChallengeId=${challengeId} - ${JSON.stringify(body)}`)
-      await helper.postRequest(`${config.CHALLENGE_API_V4_URL}/${_.get(v5Challenge, 'legacyId')}/register?userId=${userId}&v5ChallengeId=${challengeId}`, {}, m2mToken)
+      // logger.debug(`v4 Registering Submitter ${config.CHALLENGE_API_V4_URL}/${_.get(v5Challenge, 'legacyId')}/register?userId=${userId}&v5ChallengeId=${challengeId} - ${JSON.stringify(body)}`)
+      // await helper.postRequest(`${config.CHALLENGE_API_V4_URL}/${_.get(v5Challenge, 'legacyId')}/register?userId=${userId}&v5ChallengeId=${challengeId}`, {}, m2mToken)
+      logger.debug(`Registering Submitter ${legacyChallengeID} with roleID ${config.LEGACY_SUBMITTER_ROLE_ID} and userId ${userId}`)
+      await ResourceDirectManager.addResource(legacyChallengeID, config.LEGACY_SUBMITTER_ROLE_ID, userId, handle, {}, {})
     }
   } else {
     if (isDelete) {

src/services/ResourceDirectManager.js

@@ -5,7 +5,7 @@ const ProjectPaymentDAO = require('../dao/ProjectPaymentDAO')
 const logger = require('../common/logger')
 const config = require('config')
 const { find, toString } = require('lodash')
-const { isReviewerRole } = require('../common/helper')
+const { isReviewerRole, isSubmitterRole } = require('../common/helper')
 
 /**
  * Assign the given roleId to the specified userId in the given project.
@@ -26,19 +26,22 @@ async function assignRole (legacyChallengeId, roleId, userId, handle, copilotPay
   if (found) {
     throw new Error('User ' + userId + ' with role ' + roleId + ' already exists')
   }
-  // if not found && user agreed terms (if any) && is eligible, add resource
-  if (!found && termChecking && eligible) {
-    const allroles = await ProjectServices.getAllResourceRoles()
-    let roleToSet = null
-    if (allroles && allroles.length > 0) {
-      for (const role of allroles) {
-        if (role.resource_role_id === roleId) {
-          roleToSet = role
+
+  if (!isSubmitterRole(roleId)) {
+    // if not found && user agreed terms (if any) && is eligible, add resource
+    if (!found && termChecking && eligible) {
+      const allroles = await ProjectServices.getAllResourceRoles()
+      let roleToSet = null
+      if (allroles && allroles.length > 0) {
+        for (const role of allroles) {
+          if (role.resource_role_id === roleId) {
+            roleToSet = role
+          }
         }
       }
-    }
-    if (!roleToSet) {
-      throw new Error('Invalid role id ' + roleId)
+      if (!roleToSet) {
+        throw new Error('Invalid role id ' + roleId)
+      }
     }
 
     let projectPhaseId = null