Merge pull request #592 from topcoder-platform/dev

fix: handle string dates

Author: rakibansary

src/common/challenge-helper.js

@@ -301,10 +301,10 @@ class ChallengeHelper {
       }
     }
 
-    if (challenge.created) challenge.created = new Date(challenge.created).toISOString();
-    if (challenge.updated) challenge.updated = new Date(challenge.updated).toISOString();
-    if (challenge.startDate) challenge.startDate = new Date(challenge.startDate).toISOString();
-    if (challenge.endDate) challenge.endDate = new Date(challenge.endDate).toISOString();
+    if (challenge.created) challenge.created = convertDateToISOString(challenge.created);
+    if (challenge.updated) challenge.updated = convertDateToISOString(challenge.updated);
+    if (challenge.startDate) challenge.startDate = convertDateToISOString(challenge.startDate);
+    if (challenge.endDate) challenge.endDate = convertDateToISOString(challenge.endDate);
 
     if (track) {
       challenge.track = track.name;
@@ -324,6 +324,18 @@ class ChallengeHelper {
     });
   }
 
+  convertDateToISOString(startDate) {
+    if (typeof startDate === "string" && !isNaN(startDate)) {
+      startDate = parseInt(startDate);
+    }
+    if (typeof startDate === "number") {
+      const date = new Date(startDate);
+      return date.toISOString();
+    } else {
+      return startDate;
+    }
+  }
+
   convertPrizeSetValuesToCents(prizeSets) {
     prizeSets.forEach((prizeSet) => {
       prizeSet.prizes.forEach((prize) => {

src/services/ChallengeService.js

@@ -42,6 +42,7 @@ const {
   sanitizeRepeatedFieldsInUpdateRequest,
   convertPrizeSetValuesToCents,
   convertPrizeSetValuesToDollars,
+  convertDateToISOString,
 } = require("../common/challenge-helper");
 const deepEqual = require("deep-equal");
 
@@ -1035,7 +1036,7 @@ async function createChallenge(currentUser, challenge, userToken) {
   if (!challenge.startDate) {
     challenge.startDate = new Date().toISOString();
   } else {
-    challenge.startDate = new Date(challenge.startDate).toISOString();
+    challenge.startDate = convertDateToISOString(challenge.startDate);
   }
 
   const { track, type } = await challengeHelper.validateAndGetChallengeTypeAndTrack(challenge);
@@ -1750,7 +1751,7 @@ async function updateChallenge(currentUser, challengeId, data) {
     }
 
     data.phases = newPhases;
-    data.startDate = new Date(newStartDate).toISOString();
+    data.startDate = convertDateToISOString(newStartDate);
     data.endDate = helper.calculateChallengeEndDate(challenge, data);
   }