Code review feedback

medic · Jun 23, 2023 · c65602b · c65602b
1 parent a437ca7
commit c65602b
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/lib/importer.js b/lib/importer.js
@@ -24,6 +24,15 @@ var sanitise = function(string) {
       return string.replace(/(\\+u0000)|\u0000/g, ''); // eslint-disable-line
 };
 
+const removeSecurityDetails = function(doc) {
+  const isUserDoc = doc && doc.type === 'user' && doc._id.startsWith('org.couchdb.user:');
+  if (isUserDoc) {
+    delete doc.password_scheme;
+    delete doc.derived_key;
+    delete doc.salt;
+  }
+};
+
 var deleteDocuments = function(db, postgresTable, docIdsToDelete) {
   if (docIdsToDelete && docIdsToDelete.length) {
     var query = format(DELETE_STMT, postgresTable, docIdsToDelete);
@@ -95,23 +104,13 @@ var loadAndStoreDocs = function(db, couchdb, concurrentDocLimit, docsToDownload,
     }).then(function(couchDbResult) {
       log.debug('Inserting ' + couchDbResult.rows.length + ' results into postgresql');
 
-      var insertSql = format(
-        INSERT_DOC_STMT,
-        postgresTable,
-        couchDbResult.rows.map(function(row) {
-          const isUserDoc = row.doc && row.doc.type === 'user' && row.doc._id.startsWith('org.couchdb.user:');
-          if (isUserDoc) {
-            delete row.doc.password_scheme;
-            delete row.doc.derived_key;
-            delete row.doc.salt;
-          }
-
-          return [row.doc];
-        })
-      );
+      const docsToInsert = couchDbResult.rows.map(function(row) {
+        removeSecurityDetails(row.doc);
+        return [row.doc];
+      });
 
+      let insertSql = format(INSERT_DOC_STMT, postgresTable, docsToInsert);
       insertSql = sanitise(insertSql);
-
       return db.query(insertSql);
     }).then(function() {
       return loadAndStoreDocs(db, couchdb, concurrentDocLimit, docsToDownload, postgresTable);