From 0354eeae16477d0b3e195f82c5baffff10873a06 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 10 Feb 2016 16:34:09 -0800 Subject: [PATCH] Move idMap to utils so it can be used elsewhere --- .../migrate-completed-challenges.js | 24 +++---------------- server/utils/bad-id-map.js | 19 +++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 server/utils/bad-id-map.js diff --git a/server/middlewares/migrate-completed-challenges.js b/server/middlewares/migrate-completed-challenges.js index 1aeaa4ec8a..7aec5e0b3c 100644 --- a/server/middlewares/migrate-completed-challenges.js +++ b/server/middlewares/migrate-completed-challenges.js @@ -2,6 +2,8 @@ import { Observable, Scheduler } from 'rx'; import { ObjectID } from 'mongodb'; import debug from 'debug'; +import idMap from '../utils/bad-id-map'; + const log = debug('freecc:migrate'); const challengeTypes = { html: 0, @@ -15,26 +17,6 @@ const challengeTypes = { waypoint: 0 }; -const idMap = { - bg9997c9c79feddfaeb9bdef: '56bbb991ad1ed5201cd392ca', - bg9995c9c69feddfaeb9bdef: '56bbb991ad1ed5201cd392cb', - bg9994c9c69feddfaeb9bdef: '56bbb991ad1ed5201cd392cc', - bg9996c9c69feddfaeb9bdef: '56bbb991ad1ed5201cd392cd', - bg9997c9c69feddfaeb9bdef: '56bbb991ad1ed5201cd392ce', - bg9997c9c89feddfaeb9bdef: '56bbb991ad1ed5201cd392cf', - bg9998c9c99feddfaeb9bdef: '56bbb991ad1ed5201cd392d0', - bg9999c9c99feddfaeb9bdef: '56bbb991ad1ed5201cd392d1', - bg9999c9c99feedfaeb9bdef: '56bbb991ad1ed5201cd392d2', - bg9999c9c99fdddfaeb9bdef: '56bbb991ad1ed5201cd392d3', - bb000000000000000000001: '56bbb991ad1ed5201cd392d4', - bc000000000000000000001: '56bbb991ad1ed5201cd392d5', - bb000000000000000000002: '56bbb991ad1ed5201cd392d6', - bb000000000000000000003: '56bbb991ad1ed5201cd392d7', - bb000000000000000000004: '56bbb991ad1ed5201cd392d8', - bb000000000000000000005: '56bbb991ad1ed5201cd392d9', - bb000000000000000000006: '56bbb991ad1ed5201cd392da' -}; - const challengeTypeReg = /^(waypoint|hike|zipline|basejump)/i; const challengeTypeRegWithColon = /^(bonfire|checkpoint|waypoint|hike|zipline|basejump):\s+/i; @@ -90,8 +72,8 @@ function buildChallengeMap(userId, completedChallenges = [], User) { null, Scheduler.default ) - .filter(({ id, _id }) => ObjectID.isValid(id || _id)) .map(updateId) + .filter(({ id, _id }) => ObjectID.isValid(id || _id)) .map(updateName) .reduce((challengeMap, challenge) => { const id = challenge.id || challenge._id; diff --git a/server/utils/bad-id-map.js b/server/utils/bad-id-map.js new file mode 100644 index 0000000000..4c95bee37a --- /dev/null +++ b/server/utils/bad-id-map.js @@ -0,0 +1,19 @@ +export default { + bg9997c9c79feddfaeb9bdef: '56bbb991ad1ed5201cd392ca', + bg9995c9c69feddfaeb9bdef: '56bbb991ad1ed5201cd392cb', + bg9994c9c69feddfaeb9bdef: '56bbb991ad1ed5201cd392cc', + bg9996c9c69feddfaeb9bdef: '56bbb991ad1ed5201cd392cd', + bg9997c9c69feddfaeb9bdef: '56bbb991ad1ed5201cd392ce', + bg9997c9c89feddfaeb9bdef: '56bbb991ad1ed5201cd392cf', + bg9998c9c99feddfaeb9bdef: '56bbb991ad1ed5201cd392d0', + bg9999c9c99feddfaeb9bdef: '56bbb991ad1ed5201cd392d1', + bg9999c9c99feedfaeb9bdef: '56bbb991ad1ed5201cd392d2', + bg9999c9c99fdddfaeb9bdef: '56bbb991ad1ed5201cd392d3', + bb000000000000000000001: '56bbb991ad1ed5201cd392d4', + bc000000000000000000001: '56bbb991ad1ed5201cd392d5', + bb000000000000000000002: '56bbb991ad1ed5201cd392d6', + bb000000000000000000003: '56bbb991ad1ed5201cd392d7', + bb000000000000000000004: '56bbb991ad1ed5201cd392d8', + bb000000000000000000005: '56bbb991ad1ed5201cd392d9', + bb000000000000000000006: '56bbb991ad1ed5201cd392da' +};