From 74211dd2c98b926daa4e8589d767e886d4445a83 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Sat, 13 Apr 2019 17:14:04 -0700
Subject: [PATCH] Change signature of backupdb.add

---
 src/backupdb.js           | 22 +++++++++++-----------
 src/backups.js            |  4 ++--
 src/test/backups-test.js  |  4 ++--
 src/test/database-test.js |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/backupdb.js b/src/backupdb.js
index 08fbb6b1e..0048d8f7d 100644
--- a/src/backupdb.js
+++ b/src/backupdb.js
@@ -103,21 +103,21 @@ function get(id, callback) {
         });
 }
 
-function add(backup, callback) {
-    assert(backup && typeof backup === 'object');
-    assert.strictEqual(typeof backup.id, 'string');
-    assert.strictEqual(typeof backup.version, 'string');
-    assert(backup.type === exports.BACKUP_TYPE_APP || backup.type === exports.BACKUP_TYPE_BOX);
-    assert(util.isArray(backup.dependsOn));
-    assert.strictEqual(typeof backup.manifest, 'object');
-    assert.strictEqual(typeof backup.format, 'string');
+function add(id, data, callback) {
+    assert(data && typeof data === 'object');
+    assert.strictEqual(typeof id, 'string');
+    assert.strictEqual(typeof data.version, 'string');
+    assert(data.type === exports.BACKUP_TYPE_APP || data.type === exports.BACKUP_TYPE_BOX);
+    assert(util.isArray(data.dependsOn));
+    assert.strictEqual(typeof data.manifest, 'object');
+    assert.strictEqual(typeof data.format, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    var creationTime = backup.creationTime || new Date(); // allow tests to set the time
-    var manifestJson = JSON.stringify(backup.manifest);
+    var creationTime = data.creationTime || new Date(); // allow tests to set the time
+    var manifestJson = JSON.stringify(data.manifest);
 
     database.query('INSERT INTO backups (id, version, type, creationTime, state, dependsOn, manifestJson, format) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
-        [ backup.id, backup.version, backup.type, creationTime, exports.BACKUP_STATE_NORMAL, backup.dependsOn.join(','), manifestJson, backup.format ],
+        [ id, data.version, data.type, creationTime, exports.BACKUP_STATE_NORMAL, data.dependsOn.join(','), manifestJson, data.format ],
         function (error) {
             if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS));
             if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
diff --git a/src/backups.js b/src/backups.js
index 81e013583..8a4d3ebdd 100644
--- a/src/backups.js
+++ b/src/backups.js
@@ -799,7 +799,7 @@ function rotateBoxBackup(backupConfig, timestamp, appBackupIds, progressCallback
 
     debug(`Rotating box backup to id ${backupId}`);
 
-    backupdb.add({ id: backupId, version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds, manifest: null, format: format }, function (error) {
+    backupdb.add(backupId, { version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds, manifest: null, format: format }, function (error) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
         var copy = api(backupConfig.provider).copy(backupConfig, getBackupFilePath(backupConfig, 'snapshot/box', format), getBackupFilePath(backupConfig, backupId, format));
@@ -884,7 +884,7 @@ function rotateAppBackup(backupConfig, app, timestamp, progressCallback, callbac
 
     debug(`Rotating app backup of ${app.id} to id ${backupId}`);
 
-    backupdb.add({ id: backupId, version: manifest.version, type: backupdb.BACKUP_TYPE_APP, dependsOn: [ ], manifest: manifest, format: format }, function (error) {
+    backupdb.add(backupId, { version: manifest.version, type: backupdb.BACKUP_TYPE_APP, dependsOn: [ ], manifest: manifest, format: format }, function (error) {
         if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
 
         var copy = api(backupConfig.provider).copy(backupConfig, getBackupFilePath(backupConfig, `snapshot/app_${app.id}`, format), getBackupFilePath(backupConfig, backupId, format));
diff --git a/src/test/backups-test.js b/src/test/backups-test.js
index 561f664ef..2d5054bf8 100644
--- a/src/test/backups-test.js
+++ b/src/test/backups-test.js
@@ -156,7 +156,7 @@ describe('backups', function () {
             async.eachSeries([[ BACKUP_0, BACKUP_0_APP_0, BACKUP_0_APP_1 ], [ BACKUP_1, BACKUP_1_APP_0, BACKUP_1_APP_1 ]], function (backup, callback) {
                 // space out backups
                 setTimeout(function () {
-                    async.each(backup, backupdb.add, callback);
+                    async.each(backup, (b, done) => backupdb.add(b.id, b, done), callback);
                 }, 2000);
             }, function (error) {
                 expect(error).to.not.be.ok();
@@ -202,7 +202,7 @@ describe('backups', function () {
         });
 
         it('succeeds for app backups not referenced by a box backup', function (done) {
-            async.eachSeries([BACKUP_0_APP_0, BACKUP_0_APP_1], backupdb.add, function (error) {
+            async.eachSeries([BACKUP_0_APP_0, BACKUP_0_APP_1], (b, done) => backupdb.add(b.id, b, done), function (error) {
                 expect(error).to.not.be.ok();
 
                 // wait for expiration
diff --git a/src/test/database-test.js b/src/test/database-test.js
index 7a8bd7dbb..35ab07c6d 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -1589,7 +1589,7 @@ describe('database', function () {
                 format: 'tgz'
             };
 
-            backupdb.add(backup, function (error) {
+            backupdb.add(backup.id, backup, function (error) {
                 expect(error).to.be(null);
                 done();
             });
@@ -1655,7 +1655,7 @@ describe('database', function () {
                 format: 'tgz'
             };
 
-            backupdb.add(backup, function (error) {
+            backupdb.add(backup.id, backup, function (error) {
                 expect(error).to.be(null);
                 done();
             });