Merge pull request topcoder-archive#145 from topcoder-platform/fix/updateDate

fix: sync updated and updatedBy fields

Author: eisbilir

src/common/helper.js

@@ -4,6 +4,7 @@
 
 const _ = require('lodash')
 const config = require('config')
+const momentTZ = require('moment-timezone')
 const ifxnjs = require('ifxnjs')
 const request = require('superagent')
 const m2mAuth = require('tc-core-library-js').auth.m2m
@@ -190,6 +191,19 @@ async function getMemberIdByHandle (handle) {
   return memberId
 }
 
+/**
+ * Formats a date into a format supported by ifx
+ * @param {String} dateStr the date in string format
+ */
+function formatDate (dateStr) {
+  if (!dateStr) {
+    return null
+  }
+  const date = momentTZ.tz(dateStr, config.TIMEZONE).format('YYYY-MM-DD HH:mm:ss')
+  logger.info(`Formatting date ${dateStr} New Date ${date}`)
+  return date
+}
+
 module.exports = {
   getInformixConnection,
   getKafkaOptions,
@@ -200,5 +214,6 @@ module.exports = {
   postRequest,
   postBusEvent,
   forceV4ESFeeder,
-  getMemberIdByHandle
+  getMemberIdByHandle,
+  formatDate
 }

src/services/ProcessorService.js

@@ -760,6 +760,7 @@ async function processMessage (message) {
 
   const createdByUserHandle = _.get(message, 'payload.createdBy')
   const updatedByUserHandle = _.get(message, 'payload.updatedBy')
+  const updatedAt = _.get(message, 'payload.updated', new Date().toISOString())
 
   const createdByUserId = await helper.getMemberIdByHandle(createdByUserHandle)
   let updatedByUserId = createdByUserId
@@ -887,9 +888,12 @@ async function processMessage (message) {
     }
     if (message.payload.status === constants.challengeStatuses.CancelledClientRequest && challenge.currentStatus !== constants.challengeStatuses.CancelledClientRequest) {
       logger.info('Cancelling challenge...')
-      await legacyChallengeService.cancelChallenge(legacyId, updatedByUserId)
+      await legacyChallengeService.cancelChallenge(legacyId, updatedByUserId, updatedAt)
       needSyncV4ES = true
+    } else {
+      legacyChallengeService.updateChallengeAudit(legacyId, updatedByUserId, updatedAt)
     }
+
     if (needSyncV4ES) {
       try {
         logger.info(`Resync V4 ES for the legacy challenge ${legacyId}`)

src/services/legacyChallengeService.js

@@ -7,7 +7,8 @@ const util = require('util')
 const helper = require('../common/helper')
 const { createChallengeStatusesMap } = require('../constants')
 
-const QUERY_UPDATE_PROJECT = 'UPDATE project SET project_status_id = ?, modify_user = ? WHERE project_id = %d'
+const QUERY_UPDATE_PROJECT = 'UPDATE project SET project_status_id = ?, modify_user = ?, modify_date = ? WHERE project_id = %d'
+const QUERY_UPDATE_PROJECT_AUDIT = 'UPDATE project SET modify_user = ?, modify_date = ? WHERE project_id = %d'
 
 /**
  * Prepare Informix statement
@@ -24,15 +25,16 @@ async function prepare (connection, sql) {
 /**
  * Update a challenge in IFX
  * @param {Number} challengeLegacyId the legacy challenge ID
- * @param {Number} createdBy the creator user ID
+ * @param {Number} updatedBy the user ID
+ * @param {String} updatedAt the challenge modified time
  */
-async function cancelChallenge (challengeLegacyId, createdBy) {
+async function cancelChallenge (challengeLegacyId, updatedBy, updatedAt) {
   const connection = await helper.getInformixConnection()
   let result = null
   try {
     await connection.beginTransactionAsync()
     const query = await prepare(connection, util.format(QUERY_UPDATE_PROJECT, challengeLegacyId))
-    result = await query.executeAsync([createChallengeStatusesMap.CancelledClientRequest, createdBy])
+    result = await query.executeAsync([createChallengeStatusesMap.CancelledClientRequest, updatedBy, helper.formatDate(updatedAt)])
     await connection.commitTransactionAsync()
   } catch (e) {
     logger.error(`Error in 'cancelChallenge' ${e}, rolling back transaction`)
@@ -45,6 +47,29 @@ async function cancelChallenge (challengeLegacyId, createdBy) {
   return result
 }
 
+/**
+ * Update a challenge audit fields in IFX
+ * @param {Number} challengeLegacyId the legacy challenge ID
+ * @param {Number} updatedBy the user ID
+ * @param {String} updatedAt the challenge modified time
+ */
+async function updateChallengeAudit (challengeLegacyId, updatedBy, updatedAt) {
+  const connection = await helper.getInformixConnection()
+  let result = null
+  try {
+    const query = await prepare(connection, util.format(QUERY_UPDATE_PROJECT_AUDIT, challengeLegacyId))
+    result = await query.executeAsync([updatedBy, helper.formatDate(updatedAt)])
+  } catch (e) {
+    logger.error(`Error in 'updateChallengeAudit' ${e}`)
+    throw e
+  } finally {
+    logger.info(`Challenge audit for ${challengeLegacyId} has been updated`)
+    await connection.closeAsync()
+  }
+  return result
+}
+
 module.exports = {
-  cancelChallenge
+  cancelChallenge,
+  updateChallengeAudit
 }

src/services/timelineService.js

@@ -7,7 +7,6 @@ const _ = require('lodash')
 const logger = require('../common/logger')
 const util = require('util')
 const config = require('config')
-const momentTZ = require('moment-timezone')
 const IDGenerator = require('../common/idGenerator')
 const helper = require('../common/helper')
 
@@ -33,19 +32,6 @@ const QUERY_GET_PROJECT_PHASE_ID = 'SELECT project_phase_id as project_phase_id
 
 const QUERY_INSERT_CHALLENGE_PHASE_SCORECARD_ID = 'INSERT INTO phase_criteria (project_phase_id, phase_criteria_type_id, parameter, create_user, create_date, modify_user, modify_date) VALUES (?, 1, ?, ?, CURRENT, ?, CURRENT)'
 
-/**
- * Formats a date into a format supported by ifx
- * @param {String} dateStr the date in string format
- */
-function formatDate (dateStr) {
-  if (!dateStr) {
-    return null
-  }
-  const date = momentTZ.tz(dateStr, config.TIMEZONE).format('YYYY-MM-DD HH:mm:ss')
-  logger.info(`Formatting date ${dateStr} New Date ${date}`)
-  return date
-}
-
 /**
  * Prepare Informix statement
  * @param {Object} connection the Informix connection
@@ -198,8 +184,8 @@ async function createPhase (challengeLegacyId, phaseTypeId, statusTypeId, schedu
       challengeLegacyId,
       phaseTypeId,
       statusTypeId,
-      formatDate(scheduledStartDate),
-      formatDate(scheduledEndDate),
+      helper.formatDate(scheduledStartDate),
+      helper.formatDate(scheduledEndDate),
       duration,
       createdBy,
       createdBy
@@ -209,8 +195,8 @@ async function createPhase (challengeLegacyId, phaseTypeId, statusTypeId, schedu
       challengeLegacyId,
       phaseTypeId,
       statusTypeId,
-      formatDate(scheduledStartDate),
-      formatDate(scheduledEndDate),
+      helper.formatDate(scheduledStartDate),
+      helper.formatDate(scheduledEndDate),
       duration,
       createdBy,
       createdBy
@@ -248,8 +234,8 @@ async function updatePhase (phaseId, challengeLegacyId, fixedStartTime, startTim
       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 query.executeAsync([helper.formatDate(fixedStartTime), helper.formatDate(startTime), helper.formatDate(endTime), duration, statusTypeId]) :
+      await query.executeAsync([helper.formatDate(fixedStartTime), helper.formatDate(startTime), helper.formatDate(endTime), duration, statusTypeId, helper.formatDate(actualStartTime)])
 
     // await connection.commitTransactionAsync()
   } catch (e) {