Merge pull request #31 from lowdefy/mongodb-fix

Export additional types on connection to include log collection
lowdefy · Nov 17, 2023 · f7285bf · f7285bf
2 parents eaf0953 + 572cd7a
commit f7285bf
Show file tree

Hide file tree

Showing 17 changed files with 1,147 additions and 1,119 deletions.
diff --git a/.changeset/eight-shoes-type.md b/.changeset/eight-shoes-type.md
@@ -0,0 +1,6 @@
+---
+'@lowdefy/community-plugin-mongodb': patch
+---
+
+Add connectionId to log-changes logs.
+Fix: Request plugins were not exported as part of package.
diff --git a/plugins/community-plugin-mongodb/src/connections/MongoDBCollection/MongoDBCollection.js b/plugins/community-plugin-mongodb/src/connections/MongoDBCollection/MongoDBCollection.js
@@ -16,8 +16,14 @@
 
 import { MongoDBCollection } from '@lowdefy/connection-mongodb/connections';
 
+import MongoDBDeleteMany from './MongoDBDeleteMany/MongoDBDeleteMany.js';
+import MongoDBDeleteOne from './MongoDBDeleteOne/MongoDBDeleteOne.js';
 import MongoDBInsertConsecutiveId from './MongoDBInsertConsecutiveId/MongoDBInsertConsecutiveId.js';
+import MongoDBInsertMany from './MongoDBInsertMany/MongoDBInsertMany.js';
 import MongoDBInsertManyConsecutiveIds from './MongoDBInsertManyConsecutiveIds/MongoDBInsertManyConsecutiveIds.js';
+import MongoDBInsertOne from './MongoDBInsertOne/MongoDBInsertOne.js';
+import MongoDBUpdateMany from './MongoDBUpdateMany/MongoDBUpdateMany.js';
+import MongoDBUpdateOne from './MongoDBUpdateOne/MongoDBUpdateOne.js';
 import schema from './schema.js';
 
 const { requests } = MongoDBCollection;
@@ -26,7 +32,13 @@ export default {
   schema,
   requests: {
     ...requests,
+    MongoDBDeleteMany,
+    MongoDBDeleteOne,
     MongoDBInsertConsecutiveId,
+    MongoDBInsertMany,
     MongoDBInsertManyConsecutiveIds,
+    MongoDBInsertOne,
+    MongoDBUpdateMany,
+    MongoDBUpdateOne,
   },
 };
diff --git a/...y-plugin-mongodb/src/connections/MongoDBCollection/MongoDBDeleteMany/MongoDBDeleteMany.js b/...y-plugin-mongodb/src/connections/MongoDBCollection/MongoDBDeleteMany/MongoDBDeleteMany.js
@@ -18,7 +18,15 @@ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
 
-async function MongodbDeleteMany({ blockId, connection, pageId, request, requestId, payload }) {
+async function MongodbDeleteMany({
+  blockId,
+  connection,
+  connectionId,
+  pageId,
+  request,
+  requestId,
+  payload,
+}) {
   const deserializedRequest = deserialize(request);
   const { filter, options } = deserializedRequest;
   const { collection, client, logCollection } = await getCollection({ connection });
@@ -29,6 +37,7 @@ async function MongodbDeleteMany({ blockId, connection, pageId, request, request
       await logCollection.insertOne({
         args: { filter, options },
         blockId,
+        connectionId,
         pageId,
         payload,
         requestId,

diff --git a/...gin-mongodb/src/connections/MongoDBCollection/MongoDBDeleteMany/MongoDBDeleteMany.test.js b/...gin-mongodb/src/connections/MongoDBCollection/MongoDBDeleteMany/MongoDBDeleteMany.test.js
@@ -78,6 +78,7 @@ test('deleteMany logCollection - Single Document', async () => {
   const res = await MongoDBDeleteMany({
     request,
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'deleteMany_log',
@@ -93,6 +94,7 @@ test('deleteMany logCollection - Single Document', async () => {
   });
   expect(logged).toMatchObject({
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'deleteMany_log',
@@ -132,6 +134,7 @@ test('deleteMany logCollection - Multiple Documents', async () => {
   const res = await MongoDBDeleteMany({
     request,
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'deleteMany_multiple',
@@ -147,6 +150,7 @@ test('deleteMany logCollection - Multiple Documents', async () => {
   });
   expect(logged).toMatchObject({
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'deleteMany_multiple',
@@ -186,6 +190,7 @@ test('deleteMany logCollection - Multiple Documents one field', async () => {
   const res = await MongoDBDeleteMany({
     request,
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'deleteMany_multiple_one_field',
@@ -201,6 +206,7 @@ test('deleteMany logCollection - Multiple Documents one field', async () => {
   });
   expect(logged).toMatchObject({
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'deleteMany_multiple_one_field',

diff --git a/...ity-plugin-mongodb/src/connections/MongoDBCollection/MongoDBDeleteOne/MongoDBDeleteOne.js b/...ity-plugin-mongodb/src/connections/MongoDBCollection/MongoDBDeleteOne/MongoDBDeleteOne.js
@@ -18,7 +18,15 @@ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
 
-async function MongodbDeleteOne({ blockId, connection, pageId, request, requestId, payload }) {
+async function MongodbDeleteOne({
+  blockId,
+  connection,
+  connectionId,
+  pageId,
+  request,
+  requestId,
+  payload,
+}) {
   const deserializedRequest = deserialize(request);
   const { filter, options } = deserializedRequest;
   const { collection, client, logCollection } = await getCollection({ connection });
@@ -30,6 +38,7 @@ async function MongodbDeleteOne({ blockId, connection, pageId, request, requestI
       await logCollection.insertOne({
         args: { filter, options },
         blockId,
+        connectionId,
         pageId,
         payload,
         requestId,

diff --git a/...lugin-mongodb/src/connections/MongoDBCollection/MongoDBDeleteOne/MongoDBDeleteOne.test.js b/...lugin-mongodb/src/connections/MongoDBCollection/MongoDBDeleteOne/MongoDBDeleteOne.test.js
@@ -63,6 +63,7 @@ test('deleteOne logCollection', async () => {
   const res = await MongoDBDeleteOne({
     request,
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'deleteOne_log',
@@ -80,6 +81,7 @@ test('deleteOne logCollection', async () => {
   });
   expect(logged).toMatchObject({
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'deleteOne_log',

diff --git a/...rc/connections/MongoDBCollection/MongoDBInsertConsecutiveId/MongoDBInsertConsecutiveId.js b/...rc/connections/MongoDBCollection/MongoDBInsertConsecutiveId/MongoDBInsertConsecutiveId.js
@@ -22,6 +22,7 @@ async function insertDocument({
   blockId,
   connection,
   collection,
+  connectionId,
   doc,
   logCollection,
   options,
@@ -36,6 +37,7 @@ async function insertDocument({
       {
         args: { doc, options },
         blockId,
+        connectionId,
         pageId,
         payload,
         requestId,

diff --git a/...y-plugin-mongodb/src/connections/MongoDBCollection/MongoDBInsertMany/MongoDBInsertMany.js b/...y-plugin-mongodb/src/connections/MongoDBCollection/MongoDBInsertMany/MongoDBInsertMany.js
@@ -18,7 +18,15 @@ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
 
-async function MongodbInsertMany({ blockId, connection, pageId, request, requestId, payload }) {
+async function MongodbInsertMany({
+  blockId,
+  connection,
+  connectionId,
+  pageId,
+  request,
+  requestId,
+  payload,
+}) {
   const deserializedRequest = deserialize(request);
   const { docs, options } = deserializedRequest;
   const { collection, client, logCollection } = await getCollection({ connection });
@@ -29,6 +37,7 @@ async function MongodbInsertMany({ blockId, connection, pageId, request, request
       await logCollection.insertOne({
         args: { docs, options },
         blockId,
+        connectionId,
         pageId,
         payload,
         requestId,

diff --git a/...gin-mongodb/src/connections/MongoDBCollection/MongoDBInsertMany/MongoDBInsertMany.test.js b/...gin-mongodb/src/connections/MongoDBCollection/MongoDBInsertMany/MongoDBInsertMany.test.js
@@ -66,6 +66,7 @@ test('insertMany logCollection', async () => {
   const res = await MongoDBInsertMany({
     request,
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'insertMany_log',
@@ -81,6 +82,7 @@ test('insertMany logCollection', async () => {
   });
   expect(logged).toMatchObject({
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'insertMany_log',
@@ -122,6 +124,7 @@ test('insertMany logCollection options', async () => {
   const res = await MongoDBInsertMany({
     request,
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'insertMany_options_log',
@@ -137,6 +140,7 @@ test('insertMany logCollection options', async () => {
   });
   expect(logged).toMatchObject({
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'insertMany_options_log',

diff --git a/...ions/MongoDBCollection/MongoDBInsertManyConsecutiveIds/MongoDBInsertManyConsecutiveIds.js b/...ions/MongoDBCollection/MongoDBInsertManyConsecutiveIds/MongoDBInsertManyConsecutiveIds.js
@@ -21,6 +21,7 @@ import schema from './schema.js';
 async function insertDocuments({
   blockId,
   connection,
+  connectionId,
   collection,
   docs,
   logCollection,
@@ -36,6 +37,7 @@ async function insertDocuments({
       {
         args: { docs, options },
         blockId,
+        connectionId,
         pageId,
         payload,
         requestId,

diff --git a/...ity-plugin-mongodb/src/connections/MongoDBCollection/MongoDBInsertOne/MongoDBInsertOne.js b/...ity-plugin-mongodb/src/connections/MongoDBCollection/MongoDBInsertOne/MongoDBInsertOne.js
@@ -18,7 +18,15 @@ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
 
-async function MongodbInsertOne({ blockId, connection, pageId, request, requestId, payload }) {
+async function MongodbInsertOne({
+  blockId,
+  connection,
+  connectionId,
+  pageId,
+  request,
+  requestId,
+  payload,
+}) {
   const deserializedRequest = deserialize(request);
   const { doc, options } = deserializedRequest;
   const { collection, client, logCollection } = await getCollection({ connection });
@@ -29,6 +37,7 @@ async function MongodbInsertOne({ blockId, connection, pageId, request, requestI
       await logCollection.insertOne({
         args: { doc, options },
         blockId,
+        connectionId,
         pageId,
         payload,
         requestId,

diff --git a/...lugin-mongodb/src/connections/MongoDBCollection/MongoDBInsertOne/MongoDBInsertOne.test.js b/...lugin-mongodb/src/connections/MongoDBCollection/MongoDBInsertOne/MongoDBInsertOne.test.js
@@ -59,6 +59,7 @@ test('insertOne logCollection', async () => {
   const res = await MongoDBInsertOne({
     request,
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'insertOne_log',
@@ -74,6 +75,7 @@ test('insertOne logCollection', async () => {
   });
   expect(logged).toMatchObject({
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'insertOne_log',
@@ -115,6 +117,7 @@ test('insertOne logCollection options', async () => {
   const res = await MongoDBInsertOne({
     request,
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'insertOne_options_log',
@@ -130,6 +133,7 @@ test('insertOne logCollection options', async () => {
   });
   expect(logged).toMatchObject({
     blockId: 'blockId',
+    connectionId: 'connectionId',
     pageId: 'pageId',
     payload: { payload: true },
     requestId: 'insertOne_options_log',

diff --git a/...y-plugin-mongodb/src/connections/MongoDBCollection/MongoDBUpdateMany/MongoDBUpdateMany.js b/...y-plugin-mongodb/src/connections/MongoDBCollection/MongoDBUpdateMany/MongoDBUpdateMany.js
@@ -18,7 +18,15 @@ import getCollection from '../getCollection.js';
 import { serialize, deserialize } from '../serialize.js';
 import schema from './schema.js';
 
-async function MongodbUpdateMany({ blockId, connection, pageId, request, requestId, payload }) {
+async function MongodbUpdateMany({
+  blockId,
+  connection,
+  connectionId,
+  pageId,
+  request,
+  requestId,
+  payload,
+}) {
   const deserializedRequest = deserialize(request);
   const { filter, update, options } = deserializedRequest;
   const { collection, client, logCollection } = await getCollection({ connection });
@@ -29,6 +37,7 @@ async function MongodbUpdateMany({ blockId, connection, pageId, request, request
       await logCollection.insertOne({
         args: { filter, update, options },
         blockId,
+        connectionId,
         pageId,
         payload,
         requestId,