reviewable-enterprise-tools 1.5.2 → 1.5.4

package/extract_data.js

@@ -88,6 +88,8 @@ const pace = args.logging ?
 let reviewKeys = [];
 const reversePullRequests = {};
 let ghostedUsers = [];
+const unknownUsers = [];
+
 const missingReviewKeys = [];
 const missingOrgs = new Set();
 const brokenFiles = [];
@@ -118,6 +120,7 @@ async function extract() {
   logMissingReviews();
   logMissingOrgs();
   await logUnmappedUsers();
+  logUnknownUsers();
   logBrokenFiles();
 }
 
@@ -150,6 +153,12 @@ async function logUnmappedUsers() {
   );
 }
 
+function logUnknownUsers() {
+  if (!unknownUsers.length) return;
+  console.log(`\n${unknownUsers.length} users from map have no record in Reviewable:`);
+  console.log(_(unknownUsers).map(userKey => userKey.replace('github:', '')).join(', '));
+}
+
 function logMissingReviews() {
   if (!missingReviewKeys.length) return;
   console.log(`\n${missingReviewKeys.length} reviews could not be found:`);
@@ -361,6 +370,10 @@ async function extractUsers() {
   log('Extracting users');
   await forEachOfLimit(userMap, 25, async (newUserKey, oldUserKey) => {
     let user = await db.child('users/:oldUserKey', {oldUserKey}).get();
+    if (!user) {
+      unknownUsers.push(oldUserKey);
+      return;
+    }
     user = _.omit(
       user, 'lastUpdateTimestamp', 'lastSeatAllocationTimestamp', 'lastOwnershipsSyncTimestamp',
       'enterpriseLicenseAdmin', 'core', 'dashboardCache', 'stripe', 'enrollments', 'notifications',
@@ -388,24 +401,14 @@ async function extractUsers() {
     if (user.state) user.state = _.pick(user.state, reviewKeys);
     if (_.isEmpty(user.state)) delete user.state;
     if (args.merge) {
-      delete user.onboarding;  // too many props to merge efficiently
-      await forEachOf(user, async (value, key) => {
-        switch (key) {
-          case 'index':
-            await forEachOf(user.index.extraMentions, async (mention, mentionKey) => {
-              await writeItem(`users/${newUserKey}/index/extraMentions/${mentionKey}`, mention);
-            });
-            break;
-          case 'state':
-          case 'settings':
-            await forEachOf(user[key], async (subValue, subKey) => {
-              await writeItem(`users/${newUserKey}/${key}/${subKey}`, subValue);
-            })
-            break;
-          default:
-            await writeItem(`users/${newUserKey}/${key}`, value);
-        }
+      await writeItem(
+        `users/${newUserKey}`, _.omit(user, 'onboarding', 'settings', 'state', 'index'));
+      await forEachOf(['onboarding', 'settings', 'state'], async key => {
+        if (user[key]) await writeItem(`users/${newUserKey}/${key}`, user[key]);
       });
+      if (user.index?.extraMentions) {
+        await writeItem(`users/${newUserKey}/index/extraMentions`, user.index.extraMentions);
+      }
     } else {
       await writeItem(`users/${newUserKey}`, user);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reviewable-enterprise-tools",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "type": "module",
   "description": "Admin tools for Reviewable Enterprise",
   "bin": {
@@ -14,7 +14,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "repository": {
     "type": "git",