Skip to content

Commit ba0098e

Browse files
committed
Fixes issues with track being null and TCO events not displaying on eligible challenges.
1 parent c65af46 commit ba0098e

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

src/services/challenges.js

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ export function normalizeChallengeDetails(v4, v4Filtered, v4User, username) {
4545
reliabilityBonus: _.get(v4Filtered, 'reliabilityBonus', 0),
4646
status: (v4.currentStatus || '').toUpperCase(),
4747

48+
allPhases: [],
49+
currentPhases: [],
4850
name: v4.challengeName || v4.challengeTitle,
4951
projectId: Number(v4.projectId),
5052
forumId: Number(v4.forumId),
@@ -68,20 +70,14 @@ export function normalizeChallengeDetails(v4, v4Filtered, v4User, username) {
6870
technologies: v4.technologies || v4.technology || [],
6971
platforms: v4.platforms || [],
7072
prizes: v4.prize || v4.prizes || [],
71-
events: v4.event ? [
72-
{
73-
eventName: v4.event.eventShortDesc,
74-
eventId: v4.event.id,
75-
description: v4.event.eventDescription,
76-
}] : [],
77-
mainEvent: v4.event ? {
78-
eventName: v4.event.eventShortDesc,
79-
eventId: v4.event.id,
80-
description: v4.event.eventDescription,
81-
} : {},
73+
events: _.map(v4.event, e => ({
74+
eventName: e.eventShortDesc,
75+
eventId: e.id,
76+
description: e.eventDescription,
77+
})),
8278
terms: v4.terms,
8379
submissions: v4.submissions,
84-
track: v4.subTrack === 'DEVELOP_MARATHON_MATCH' ? 'DATA_SCIENCE' : v4.track,
80+
track: _.toUpper(v4.challengeCommunity),
8581
subTrack: v4.subTrack === 'DEVELOP_MARATHON_MATCH' ? 'MARATHON_MATCH' : v4.subTrack,
8682
checkpoints: v4.checkpoints,
8783
documents: v4.documents || [],
@@ -90,8 +86,15 @@ export function normalizeChallengeDetails(v4, v4Filtered, v4User, username) {
9086
registrants: v4.registrants || [],
9187
};
9288

89+
if (challenge.technologies.includes('Data Science') || challenge.subTrack === 'MARATHON_MATCH') {
90+
challenge.track = 'DATA_SCIENCE';
91+
}
92+
93+
// It's not clear if this will be the main event, will need to be investigated
94+
challenge.mainEvent = challenge.events[0] || {};
95+
9396
/* It's unclear if these normalization steps are still required for V4 */
94-
// Fill missing data from v3_filtered
97+
// Fill missing data from v4_filtered
9598
if (v4Filtered) {
9699
const groups = {};
97100
if (v4Filtered.groupIds) {
@@ -100,12 +103,10 @@ export function normalizeChallengeDetails(v4, v4Filtered, v4User, username) {
100103
});
101104
}
102105

103-
// Normalize name convention for subtrack
104-
_.defaults(challenge, {
106+
_.merge(challenge, {
105107
componentId: v4Filtered.componentId,
106108
contestId: v4Filtered.contestId,
107109

108-
track: v4Filtered.track,
109110
submissionEndDate: v4Filtered.submissionEndDate, // Dates are not correct in v3
110111
submissionEndTimestamp: v4Filtered.submissionEndDate, // Dates are not correct in v3
111112

0 commit comments

Comments
 (0)