From 6ba3ab03ce9ec746c06f3070b10f48e2db7d914b Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Fri, 5 Mar 2021 02:17:33 +0200 Subject: [PATCH 1/2] omit tags when syncing forward --- src/services/challengeService.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/services/challengeService.js b/src/services/challengeService.js index 88f49fa..ad81a54 100644 --- a/src/services/challengeService.js +++ b/src/services/challengeService.js @@ -31,7 +31,8 @@ const challengePropertiesToOmitFromDynamo = [ 'submissionStartDate', 'submissionEndDate', 'type', - 'track' + 'track', + 'tags' ] async function save (challenge) { @@ -88,7 +89,7 @@ async function updateChallenge (challenge) { id: challenge.id, body: { doc: { - ..._.omit(challenge, ['created', 'createdBy']), + ..._.omit(challenge, ['created', 'createdBy', 'tags']), groups: _.filter(challenge.groups, g => _.toString(g).toLowerCase() !== 'null') } } From c42fe5c3057f54b89c10e4436b04acfaaaff8334 Mon Sep 17 00:00:00 2001 From: Thomas Kranitsas Date: Fri, 5 Mar 2021 17:58:19 +0200 Subject: [PATCH 2/2] extend tags instead of replacing --- src/services/challengeService.js | 5 ++--- src/services/syncService.js | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/challengeService.js b/src/services/challengeService.js index ad81a54..88f49fa 100644 --- a/src/services/challengeService.js +++ b/src/services/challengeService.js @@ -31,8 +31,7 @@ const challengePropertiesToOmitFromDynamo = [ 'submissionStartDate', 'submissionEndDate', 'type', - 'track', - 'tags' + 'track' ] async function save (challenge) { @@ -89,7 +88,7 @@ async function updateChallenge (challenge) { id: challenge.id, body: { doc: { - ..._.omit(challenge, ['created', 'createdBy', 'tags']), + ..._.omit(challenge, ['created', 'createdBy']), groups: _.filter(challenge.groups, g => _.toString(g).toLowerCase() !== 'null') } } diff --git a/src/services/syncService.js b/src/services/syncService.js index 2666a8d..be4edfc 100644 --- a/src/services/syncService.js +++ b/src/services/syncService.js @@ -137,6 +137,7 @@ async function processChallenge (legacyId, challengeListing, challengeDetails) { ..._.omit(v5ChallengeFromAPI, ['prizeSets']), ..._.omit(v5ChallengeObjectFromV4, ommittedFields), prizeSets, + tags: _.filter(_.uniq(_.concat(_.get(v5ChallengeFromAPI, 'tags'), _.get(v5ChallengeObjectFromV4, 'tags'))), t => _.toLower(t) !== 'other'), ...additionalInformation } // logger.debug(`new V5 Object: ${JSON.stringify(updatedV5Object)}`)