From a1113bdee5c7b75568f03e9fb30d4a9b729558f8 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Wed, 12 Aug 2020 22:18:53 +0530 Subject: [PATCH 1/2] Fixed end date calculation It was causing errors with v4 challenge api (negative length error in ContestServiceFacade EJB in direct app container) --- src/services/ProcessorService.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/services/ProcessorService.js b/src/services/ProcessorService.js index a478261..1760d40 100644 --- a/src/services/ProcessorService.js +++ b/src/services/ProcessorService.js @@ -166,23 +166,23 @@ async function parsePayload (payload, m2mToken, isCreated = true, informixGroupI data.detailedRequirements += '\n\r' data.detailedRequirements += 'V5 Challenge - Additional Details: ' + payload.id } - + const SECONDS_TO_MILLIS = 1000 if (payload.phases) { const registrationPhase = _.find(payload.phases, p => p.phaseId === config.REGISTRATION_PHASE_ID) const submissionPhase = _.find(payload.phases, p => p.phaseId === config.SUBMISSION_PHASE_ID) const startDate = payload.startDate ? new Date(payload.startDate) : new Date() data.registrationStartsAt = startDate.toISOString() - data.registrationEndsAt = new Date(startDate.getTime() + (registrationPhase || submissionPhase).duration).toISOString() - data.registrationDuration = (registrationPhase || submissionPhase).duration - data.submissionEndsAt = new Date(startDate.getTime() + submissionPhase.duration).toISOString() - data.submissionDuration = submissionPhase.duration + data.registrationEndsAt = new Date(startDate.getTime() + (registrationPhase || submissionPhase).duration * SECONDS_TO_MILLIS).toISOString() + data.registrationDuration = (registrationPhase || submissionPhase).duration * SECONDS_TO_MILLIS + data.submissionEndsAt = new Date(startDate.getTime() + submissionPhase.duration * SECONDS_TO_MILLIS).toISOString() + data.submissionDuration = submissionPhase.duration * SECONDS_TO_MILLIS // Only Design can have checkpoint phase and checkpoint prizes const checkpointPhase = _.find(payload.phases, p => p.phaseId === config.CHECKPOINT_SUBMISSION_PHASE_ID) if (checkpointPhase) { data.checkpointSubmissionStartsAt = startDate.toISOString() - data.checkpointSubmissionEndsAt = new Date(startDate.getTime() + checkpointPhase.duration).toISOString() - data.checkpointSubmissionDuration = checkpointPhase.duration + data.checkpointSubmissionEndsAt = new Date(startDate.getTime() + checkpointPhase.duration * SECONDS_TO_MILLIS).toISOString() + data.checkpointSubmissionDuration = checkpointPhase.duration * SECONDS_TO_MILLIS } else { data.checkpointSubmissionStartsAt = null data.checkpointSubmissionEndsAt = null From f20786de5f718f525ff5b004b8f1395caa4473ba Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Wed, 12 Aug 2020 23:17:12 +0530 Subject: [PATCH 2/2] Temp deployable feature branch --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3a78bbe..8bc4ada 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,6 +70,7 @@ workflows: branches: only: - develop + - feature/negative_length_error_fix # Production builds are exectuted only on tagged commits to the # master branch.