fix query and others (#444)

* fix query and others

* fix headers

* snapshot

---------

Co-authored-by: Max Gruenfelder <maximilian.gruenfelder@scheer-group.com>

Author: soccermax

db/Event.cds

@@ -24,6 +24,6 @@ entity Event: cuid {
     createdAt: Timestamp @cds.on.insert : $now;
     startAfter: Timestamp;
     context: LargeString;
-    error: String;
+    error: LargeString;
     namespace: String default 'default';
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/event-queue",
-  "version": "2.1.0-beta.2",
+  "version": "2.1.0-beta.3",
   "description": "An event queue that enables secure transactional processing of asynchronous and periodic events, featuring instant event processing with Redis Pub/Sub and load distribution across all application instances.",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package.json

@@ -11,6 +11,8 @@ const CDS_EVENT_TYPE = "CAP_OUTBOX";
 const COMPONENT_NAME = "/eventQueue/eventQueueAsOutbox";
 const EVENT_QUEUE_SPECIFIC_FIELDS = ["startAfter", "referenceEntity", "referenceEntityKey", "namespace"];
 
+const TO_COPY = ["inbound", "event", "data", "queue", "results", "method", "path", "params", "entity", "service"];
+
 function outboxed(srv, customOpts) {
   if (!(new.target || customOpts)) {
     const former = srv[OUTBOXED];
@@ -102,18 +104,27 @@ const _mapToEventAndPublish = async (req, namespace, subType, eventHeaders, cont
       }
     }
   }
-
   const event = {
     contextUser: context.user.id,
     ...(req._fromSend || (req.reply && { _fromSend: true })), // send or emit
-    ...(req.inbound && { inbound: req.inbound }),
-    ...(req.event && { event: req.event }),
-    ...(req.data && { data: req.data }),
     ...(eventHeaders && { headers: eventHeaders }),
-    ...(req.query && { query: req.query }),
     ...(Object.keys(contextProperties).length && { ...contextProperties }),
   };
 
+  for (const prop of TO_COPY) {
+    if (req[prop]) {
+      event[prop] = req[prop];
+    }
+  }
+
+  if (req.query) {
+    event.query = typeof req.query.flat === "function" ? req.query.flat() : req.query;
+    delete event.query._target;
+    delete event.query.__target;
+    delete event.query.target;
+    delete event.data; // `req.data` should be a getter to whatever is in `req.query`
+  }
+
   await publishEvent(
     cds.tx(context),
     {

src/outbox/eventQueueAsOutbox.js

@@ -11,6 +11,8 @@ exports[`event-queue outbox monkeyPatchCAPOutbox=true accept event-queue specifi
   },
   "event": "sendFiori",
   "headers": {},
+  "method": "sendFiori",
+  "params": [],
 }
 `;
 
@@ -370,6 +372,8 @@ exports[`event-queue outbox monkeyPatchCAPOutbox=true req.data should be stored
   },
   "event": "sendFiori",
   "headers": {},
+  "method": "sendFiori",
+  "params": [],
 }
 `;
 
@@ -453,6 +457,8 @@ exports[`event-queue outbox monkeyPatchCAPOutbox=true should store correct user
   },
   "event": "sendFiori",
   "headers": {},
+  "method": "sendFiori",
+  "params": [],
 }
 `;
 

test/__snapshots__/eventQueueOutbox.test.js.snap

@@ -1,4 +1,9 @@
+
+using sap.eventqueue as db from '../../../../../db';
+
 @impl: './service.js'
 service NotificationService {
     action sendFiori(to: String, subject: String, body: String);
+
+    entity Event as projection on db.Event;
 }

test/asset/outboxProject/srv/service/notificationService.cds

@@ -2751,6 +2751,25 @@ describe("event-queue outbox", () => {
         expect(loggerMock.callsLengths().error).toEqual(0);
       });
     });
+
+    describe("outbox queries", () => {
+      it("SELECT", async () => {
+        const service = await cds.connect.to("NotificationService");
+        const srvQueued = cds.queued(service);
+        await srvQueued.read("Event");
+        await commitAndOpenNew();
+        const [event] = await testHelper.selectEventQueueAndReturn(tx, {
+          expectedLength: 1,
+          additionalColumns: ["payload"],
+        });
+        const payload = JSON.parse(event.payload);
+        expect(payload.notExisting).toBeUndefined();
+        await processEventQueue(tx.context, "CAP_OUTBOX", service.name);
+        await commitAndOpenNew();
+        await testHelper.selectEventQueueAndExpectDone(tx, { expectedLength: 1 });
+        expect(loggerMock.callsLengths().error).toEqual(0);
+      });
+    });
   });
 
   const commitAndOpenNew = async () => {