wingbot-mongodb 3.2.2 → 3.2.4

package/.nyc_output/processinfo/8db620e2-5deb-4db5-b239-32d4e6eb824a.json

@@ -0,0 +1 @@
+{"parent":null,"pid":4692,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1681800952490,"ppid":4686,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/8db620e2-5deb-4db5-b239-32d4e6eb824a.json","externalId":"","uuid":"8db620e2-5deb-4db5-b239-32d4e6eb824a","files":["/Users/david/Development/wingbot-mongodb/src/BaseStorage.js","/Users/david/Development/wingbot-mongodb/src/defaultLogger.js","/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js","/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js","/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js","/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js","/Users/david/Development/wingbot-mongodb/src/tokenFactory.js","/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js","/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js","/Users/david/Development/wingbot-mongodb/src/StateStorage.js"]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"98a862df-b2a1-4d14-9176-6b0bada108f7":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["98a862df-b2a1-4d14-9176-6b0bada108f7"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["98a862df-b2a1-4d14-9176-6b0bada108f7"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["98a862df-b2a1-4d14-9176-6b0bada108f7"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["98a862df-b2a1-4d14-9176-6b0bada108f7"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["98a862df-b2a1-4d14-9176-6b0bada108f7"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["98a862df-b2a1-4d14-9176-6b0bada108f7"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["98a862df-b2a1-4d14-9176-6b0bada108f7"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["98a862df-b2a1-4d14-9176-6b0bada108f7"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["98a862df-b2a1-4d14-9176-6b0bada108f7"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["98a862df-b2a1-4d14-9176-6b0bada108f7"]},"externalIds":{}}
+{"processes":{"8db620e2-5deb-4db5-b239-32d4e6eb824a":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"]},"externalIds":{}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot-mongodb",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "description": "MongoDB storage for wingbot.ai",
   "main": "src/main.js",
   "scripts": {

package/src/BaseStorage.js

@@ -270,6 +270,12 @@ class BaseStorage {
         return this._collection;
     }
 
+    /**
+     *
+     * @param {object[]} indexes
+     * @param {Collection} collection
+     * @returns {Promise}
+     */
     async _ensureIndexes (indexes, collection) {
         let existing;
         try {
@@ -290,7 +296,7 @@ class BaseStorage {
                     });
             }, Promise.resolve());
 
-        const updated = await indexes
+        let updated = await indexes
             .filter((i) => !existing.some((e) => e.name === i.options.name))
             .reduce((p, i) => {
                 this._log.log(`DB.${this._collectionName} creating index ${i.options.name}`);
@@ -302,21 +308,47 @@ class BaseStorage {
                     .then(() => true);
             }, Promise.resolve(false));
 
-        if (updated || existing.every((i) => this.systemIndexes.includes(i.name))) {
-            // upsert fixtures
+        if (!updated) {
+            updated = existing.every((i) => this.systemIndexes.includes(i.name));
+        }
 
-            await this._fixtures.reduce(
-                (p, o) => p
-                    .then(() => collection.insertOne(o))
-                    .then(() => this._log.log(`DB.${this._collectionName} Inserted fixture doc to "${this._collectionName}"`))
-                    .catch((e) => {
-                        if (e.code !== 11000) {
-                            this._log.error(`DB.${this._collectionName} failed to insert fixture doc to "${this._collectionName}"`, e);
-                        }
-                    }),
-                Promise.resolve()
-            );
+        let fixtures = this._fixtures;
+
+        const $in = fixtures
+            .map((f) => f._id)
+            .filter((f) => !!f);
+
+        if (!updated && $in.length !== 0) {
+            const found = await collection
+                .find({ _id: { $in } })
+                .project({ _id: 1 })
+                .map((doc) => doc._id.toString())
+                .toArray();
+
+            if (found.length !== $in.length) {
+                updated = true;
+                fixtures = fixtures
+                    .filter((f) => !f._id || !found.includes(f._id.toString()));
+            }
         }
+
+        if (!updated || fixtures.length === 0) {
+            return;
+        }
+
+        await fixtures.reduce(
+            (p, o) => p
+                .then(() => collection.insertOne(o))
+                .then(() => this._log.log(`DB.${this._collectionName} Inserted fixture doc to "${this._collectionName}"`))
+                .catch((e) => {
+                    if (e.code === 11000) {
+                        this._log.log(`DB.${this._collectionName} fixture not inserted: ${e.message}`);
+                    } else {
+                        this._log.error(`DB.${this._collectionName} failed to insert fixture doc to "${this._collectionName}"`, e);
+                    }
+                }),
+            Promise.resolve()
+        );
     }
 
     /**

package/.nyc_output/processinfo/98a862df-b2a1-4d14-9176-6b0bada108f7.json

@@ -1 +0,0 @@
-{"parent":null,"pid":81134,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1676533760202,"ppid":81133,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/98a862df-b2a1-4d14-9176-6b0bada108f7.json","externalId":"","uuid":"98a862df-b2a1-4d14-9176-6b0bada108f7","files":["/Users/david/Development/wingbot-mongodb/src/BaseStorage.js","/Users/david/Development/wingbot-mongodb/src/defaultLogger.js","/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js","/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js","/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js","/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js","/Users/david/Development/wingbot-mongodb/src/tokenFactory.js","/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js","/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js","/Users/david/Development/wingbot-mongodb/src/StateStorage.js"]}