Merge branch 'develop'

Author: rootelement

config/default.js

@@ -31,6 +31,10 @@ module.exports = {
   RESOURCES_API_URL: process.env.RESOURCES_API_URL || 'https://api.topcoder-dev.com/v5/resources',
   GROUPS_API_URL: process.env.GROUPS_API_URL || 'https://api.topcoder-dev.com/v5/groups',
   TERMS_API_URL: process.env.TERMS_API_URL || 'https://api.topcoder-dev.com/v5/terms',
+  V4_CHALLENGE_API_URL: process.env.V4_CHALLENGE_API_URL || 'https://api.topcoder-dev.com/v4/challenges',
+  V3_MEMBER_API_URL: process.env.V3_MEMBER_API_URL || 'https://api.topcoder-dev.com/v3/members',
+  V4_ES_FEEDER_API_URL: process.env.V4_ES_FEEDER_API_URL || 'https://api.topcoder-dev.com/v4/esfeeder/challenges',
+  FORCE_ES_FEEDER: process.env.FORCE_ES_FEEDER ? process.env.FORCE_ES_FEEDER === 'true' : false,
   CREATED_DATE_BEGIN: process.env.CREATED_DATE_BEGIN,
   POPULATE_MIGRATION_TABLE_DATE_BEGIN: process.env.POPULATE_MIGRATION_TABLE_DATE_BEGIN || process.env.CREATED_DATE_BEGIN || new Date(),
 
@@ -204,6 +208,8 @@ module.exports = {
     SUCCESS: 'Success'
   },
 
+  MM_DIRECT_PROJECT_ID: process.env.MM_DIRECT_PROJECT_ID || 23650,
+  MM_CONNECT_PROJECT_ID: process.env.MM_CONNECT_PROJECT_ID || 16612,
   SUBMITTER_ROLE_ID: process.env.SUBMITTER_ROLE_ID || '732339e7-8e30-49d7-9198-cccf9451e221',
   SUBMISSION_TYPE: process.env.SUBMISSION_TYPE || 'Contest Submission',
   CHECKPOINT_SUBMISSION_TYPE: process.env.CHECKPOINT_SUBMISSION_TYPE || 'Checkpoint Submission',
@@ -219,5 +225,7 @@ module.exports = {
       WRITE: process.env.SCOPE_CHALLENGES_WRITE || 'write:challenges',
       ALL: process.env.SCOPE_CHALLENGES_ALL || 'all:challenges'
     }
-  }
+  },
+
+  COPILOT_PAYMENT_TYPE: process.env.COPILOT_PAYMENT_TYPE || 'copilot'
 }

package-lock.json

@@ -8,10 +8,12 @@
     "bluebird": "^3.5.5",
     "config": "^3.1.0",
     "cors": "^2.8.5",
+    "csv-parser": "^2.3.3",
     "dynamoose": "^1.11.1",
     "elasticsearch": "^16.1.1",
     "express": "^4.17.1",
     "express-interceptor": "^1.2.0",
+    "fs": "0.0.1-security",
     "hashmap": "^2.4.0",
     "http-aws-es": "^6.0.0",
     "informix-wrapper": "git+https://github.com/appirio-tech/informix-wrapper.git#less-logs",

package.json

@@ -1,7 +1,7 @@
 const config = require('config')
 const logger = require('../util/logger')
 // const moment = require('moment')
-const { slice, union, toString, toNumber } = require('lodash')
+const { slice, union, toString, toNumber, remove } = require('lodash')
 const challengeSyncStatusService = require('../services/challengeSyncStatusService')
 const challengeSyncHistoryService = require('../services/challengeSyncHistoryService')
 const syncService = require('../services/syncService')
@@ -77,12 +77,14 @@ async function queueChallenges (filter) {
   // get active challenges from v4
   const { ids: v4IdArray } = await syncService.getV4ChallengeIds(filter)
   // console.log('v4', v4IdArray)
+  // logger.debug(`v4 Array ${v4IdArray}`)
   // get active challenges from v5
   const { ids: v5IdArray } = await syncService.getV5LegacyChallengeIds(filter)
-  // console.log('v5', v5IdArray)
+  // logger.debug(`v5 Array ${v5IdArray}`)
 
   // combine arrays, return unique
   const combinedArray = union(v4IdArray, v5IdArray)
+  remove(combinedArray, n => toString(n) === 'NaN')
   const totalChallengesCount = combinedArray.length
   // console.log('union length', combinedArray.length)