From c7c8b3621eafa501e479dadbfd8c40d25f2547ee Mon Sep 17 00:00:00 2001
From: Jonathan Cremin <jonathan@crem.in>
Date: Sun, 7 Aug 2016 17:49:27 +0100
Subject: [PATCH] Fix user mapping for migration

---
 migrate/migrate-activations.js | 4 ++--
 migrate/migrate-files.js       | 5 ++++-
 migrate/migrate-users.js       | 4 ++--
 models/file.js                 | 1 +
 models/user.js                 | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/migrate/migrate-activations.js b/migrate/migrate-activations.js
index be6adbd..5e5e008 100644
--- a/migrate/migrate-activations.js
+++ b/migrate/migrate-activations.js
@@ -50,7 +50,7 @@ co(function *sync() {
       continue;
     }
 
-    const oldId = user._id.toString();
+    const mongoId = user._id.toString();
 
     const newUser = yield models.user.create({
       email: user.email,
@@ -62,7 +62,7 @@ co(function *sync() {
       deletedAt: user.status === 'deleted' ? new Date().getTime() : null,
       createdAt: user.createdAt,
       updatedAt: user.createdAt,
-      oldId,
+      mongoId,
     });
     yield newUser.save({ silent: true });
   }
diff --git a/migrate/migrate-files.js b/migrate/migrate-files.js
index e1e6424..9067b24 100644
--- a/migrate/migrate-files.js
+++ b/migrate/migrate-files.js
@@ -18,7 +18,7 @@ co(function *sync() {
   const userIds = {};
   debug('remap');
   for (const user of users) {
-    userIds[user._id] = user.id;
+    userIds[user.mongoId] = user.id;
   }
   debug('remap done');
   let files;
@@ -48,6 +48,8 @@ co(function *sync() {
     const processed = file.status !== 'uploading';
     const accessedAt = file.last_accessed ? new Date(file.last_accessed * 1000) : null;
 
+    const mongoId = file._id.toString();
+
     yield models.file.upsert({
       id: file._id.toString(),
       name: file.file_name,
@@ -68,6 +70,7 @@ co(function *sync() {
       md5: file.md5,
       malwarePositives: file.virustotal && file.virustotal.positives > 0 ?
       file.virustotal.positives : null,
+      mongoId,
     }, { /* logging: false */ });
   }
 
diff --git a/migrate/migrate-users.js b/migrate/migrate-users.js
index e036dae..88dc3da 100644
--- a/migrate/migrate-users.js
+++ b/migrate/migrate-users.js
@@ -50,7 +50,7 @@ co(function *sync() {
       continue;
     }
 
-    const oldId = user._id.toString();
+    const mongoId = user._id.toString();
 
     const newUser = yield models.user.create({
       email: user.email,
@@ -62,7 +62,7 @@ co(function *sync() {
       deletedAt: user.status === 'deleted' ? new Date().getTime() : null,
       createdAt: user.createdAt,
       updatedAt: user.createdAt,
-      oldId,
+      mongoId,
     }, {
       include: [models.activation],
     });
diff --git a/models/file.js b/models/file.js
index 566d1e3..504c438 100644
--- a/models/file.js
+++ b/models/file.js
@@ -21,6 +21,7 @@ export default function (sequelize, DataTypes) {
     legacyId: DataTypes.STRING(12), // eslint-disable-line new-cap
     md5: DataTypes.STRING(32), // eslint-disable-line new-cap
     malwarePositives: DataTypes.INTEGER,
+    mongoId: DataTypes.STRING,
   }, {
     paranoid: true,
     indexes: [
diff --git a/models/user.js b/models/user.js
index ff3bb7e..1b97d96 100644
--- a/models/user.js
+++ b/models/user.js
@@ -8,7 +8,7 @@ export default function (sequelize, DataTypes) {
     activated: DataTypes.BOOLEAN,
     banned: DataTypes.BOOLEAN,
     deletedAt: DataTypes.DATE,
-    oldId: DataTypes.STRING,
+    mongoId: DataTypes.STRING,
   }, {
     paranoid: true,
     indexes: [