Merge pull request topcoder-archive#137 from topcoder-platform/PLAT-2035

Author: rakibansary

.circleci/config.yml

@@ -72,6 +72,7 @@ workflows:
             branches:
               only:
                 - develop
+                - PLAT-2035
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

compose-dev.yaml

@@ -0,0 +1,13 @@
+services:
+  app:
+    entrypoint:
+    - sleep
+    - infinity
+    image: node:10.15.1
+    platform: linux/amd64
+    init: true
+    volumes:
+    - type: bind
+      source: /var/run/docker.sock
+      target: /var/run/docker.sock
+

package-lock.json

@@ -58,5 +58,8 @@
       "test/unit/test.js",
       "test/e2e/test.js"
     ]
+  },
+  "volta": {
+    "node": "12.22.12"
   }
 }

package.json

@@ -6,7 +6,7 @@ require('./bootstrap')
 const _ = require('lodash')
 const config = require('config')
 const Kafka = require('no-kafka')
-const healthcheck = require('@topcoder-platform/topcoder-healthcheck-dropin')
+// const healthcheck = require('@topcoder-platform/topcoder-healthcheck-dropin')
 const logger = require('./common/logger')
 const helper = require('./common/helper')
 const ProcessorService = require('./services/ProcessorService')
@@ -110,7 +110,7 @@ consumer
   // consume configured topics
   .then(() => {
     logger.info('Initialized.......')
-    healthcheck.init([check])
+    // healthcheck.init([check])
     logger.info('Adding topics successfully.......')
     logger.info(topics)
     logger.info('Kick Start.......')

src/app.js

@@ -99,7 +99,7 @@ async function recreatePhases (legacyId, v5Phases, createdBy) {
  * @param {Boolean} isSelfService is the challenge self-service
  * @param {String} createdBy the created by
  */
-async function syncChallengePhases (legacyId, v5Phases, createdBy, isSelfService, numOfReviewers) {
+async function syncChallengePhases (legacyId, v5Phases, createdBy, isSelfService, numOfReviewers, isBeingActivated) {
   const phaseTypes = await timelineService.getPhaseTypes()
   const phasesFromIFx = await timelineService.getChallengePhases(legacyId)
   logger.debug(`Phases from v5: ${JSON.stringify(v5Phases)}`)
@@ -131,14 +131,26 @@ async function syncChallengePhases (legacyId, v5Phases, createdBy, isSelfService
           if (v5Equivalent.isOpen && _.toInteger(phase.phase_status_id) === constants.PhaseStatusTypes.Closed) {
             newStatus = constants.PhaseStatusTypes.Scheduled
           }
+
+          if (isBeingActivated && ['Registration', 'Submission'].indexOf(v5Equivalent.name) != -1) {
+            const scheduledStartDate = v5Equivalent.scheduledStartDate;
+            const now = new Date().getTime();
+            if (scheduledStartDate != null && new Date(scheduledStartDate).getTime() < now) {
+              newStatus = constants.PhaseStatusTypes.Open;
+            }
+
+            logger.debug(`Challenge phase ${v5Equivalent.name} status is being set to: ${newStatus} on challenge activation.`)
+          }
+
           await timelineService.updatePhase(
             phase.project_phase_id,
             legacyId,
             phase.fixed_start_time ? v5Equivalent.scheduledStartDate : null,
             v5Equivalent.scheduledStartDate,
             v5Equivalent.scheduledEndDate,
             v5Equivalent.duration * 1000,
-            newStatus
+            newStatus,
+            isBeingActivated && newStatus == constants.PhaseStatusTypes.Open ? new Date() : null
           )
         } else {
           logger.info(`number of ${phaseName} does not match`)
@@ -759,11 +771,14 @@ async function processMessage (message) {
     }
   }
 
+  let isBeingActivated = false;
+
   if (message.payload.status && challenge) {
     // Whether we need to sync v4 ES again
     let needSyncV4ES = false
     // logger.info(`The status has changed from ${challenge.currentStatus} to ${message.payload.status}`)
     if (message.payload.status === constants.challengeStatuses.Active && challenge.currentStatus !== constants.challengeStatuses.Active) {
+      isBeingActivated = true;
       logger.info('Activating challenge...')
       const activated = await activateChallenge(legacyId)
       logger.info(`Activated! ${JSON.stringify(activated)}`)
@@ -790,7 +805,7 @@ async function processMessage (message) {
 
     if (!_.get(message.payload, 'task.isTask')) {
       const numOfReviewers = 2
-      await syncChallengePhases(legacyId, message.payload.phases, createdByUserId, _.get(message, 'payload.legacy.selfService'), numOfReviewers)
+      await syncChallengePhases(legacyId, message.payload.phases, createdByUserId, _.get(message, 'payload.legacy.selfService'), numOfReviewers, isBeingActivated)
       needSyncV4ES = true
     } else {
       logger.info('Will skip syncing phases as the challenge is a task...')

src/services/ProcessorService.js

@@ -19,6 +19,7 @@ const QUERY_GET_CHALLENGE_PHASES = 'SELECT project_phase_id, fixed_start_time, s
 const QUERY_DROP_CHALLENGE_PHASE = 'DELETE FROM project_phase WHERE project_id = ? AND project_phase_id = ?'
 const QUERY_INSERT_CHALLENGE_PHASE = 'INSERT INTO project_phase (project_phase_id, project_id, phase_type_id, phase_status_id,  scheduled_start_time, scheduled_end_time, duration, create_user, create_date, modify_user, modify_date) VALUES (?, ?, ?, ?, ?, ?, ?, ?, CURRENT, ?, CURRENT)'
 const QUERY_UPDATE_CHALLENGE_PHASE = 'UPDATE project_phase SET fixed_start_time = ?, scheduled_start_time = ?, scheduled_end_time = ?, duration = ?, phase_status_id = ? WHERE project_phase_id = %d and project_id = %d'
+const QUERY_UPDATE_CHALLENGE_PHASE_WITH_START_TIME = 'UPDATE project_phase SET fixed_start_time = ?, scheduled_start_time = ?, scheduled_end_time = ?, duration = ?, phase_status_id = ?, actual_start_time = ? WHERE project_phase_id = %d and project_id = %d'
 
 const QUERY_DROP_CHALLENGE_PHASE_CRITERIA = 'DELETE FROM phase_criteria WHERE project_phase_id = ?'
 
@@ -237,13 +238,19 @@ async function createPhase (challengeLegacyId, phaseTypeId, statusTypeId, schedu
  * @param {Date} duration the duration
  * @param {Number} statusTypeId the status type ID
  */
-async function updatePhase (phaseId, challengeLegacyId, fixedStartTime, startTime, endTime, duration, statusTypeId) {
+async function updatePhase (phaseId, challengeLegacyId, fixedStartTime, startTime, endTime, duration, statusTypeId, actualStartTime) {
   const connection = await helper.getInformixConnection()
   let result = null
   try {
     // await connection.beginTransactionAsync()
-    const query = await prepare(connection, util.format(QUERY_UPDATE_CHALLENGE_PHASE, phaseId, challengeLegacyId))
-    result = await query.executeAsync([formatDate(fixedStartTime), formatDate(startTime), formatDate(endTime), duration, statusTypeId])
+    const query = actualStartTime == null ?
+      await prepare(connection, util.format(QUERY_UPDATE_CHALLENGE_PHASE, phaseId, challengeLegacyId)) :
+      await prepare(connection, util.format(QUERY_UPDATE_CHALLENGE_PHASE_WITH_START_TIME, phaseId, challengeLegacyId))
+
+    result = actualStartTime == null ?
+      await query.executeAsync([formatDate(fixedStartTime), formatDate(startTime), formatDate(endTime), duration, statusTypeId]) :
+      await query.executeAsync([formatDate(fixedStartTime), formatDate(startTime), formatDate(endTime), duration, statusTypeId, formatDate(actualStartTime)])
+
     // await connection.commitTransactionAsync()
   } catch (e) {
     logger.error(`Error in 'updatePhase' ${e}, rolling back transaction`)