Fix periodic events CAP (#366)

soccermax · web-flow · commit d68cc313ab9b · 2025-07-10T08:38:26.000+02:00
* fix periodic events CAP

* fix periodic events CAP

* fix periodic events CAP

* fix periodic events CAP

* fix periodic events CAP

---------

Co-authored-by: Max Gruenfelder &lt;maximilian.gruenfelder@sap.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## v1.10.10 - 2025-07-09
+
+### Fixed
+
+- [CAP outbox] adding periodic events of CAP services with the same action name
+
 ## v1.10.9 - 2025-07-07
 
 ### Fixed
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cap-js-community/event-queue",
-  "version": "1.10.9",
+  "version": "1.10.10",
   "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",
@@ -54,17 +54,17 @@
     "yaml": "^2.7.1"
   },
   "devDependencies": {
-    "@cap-js/cds-test": "^0.3.0",
+    "@cap-js/cds-test": "^0.4.0",
     "@cap-js/hana": "^2.1.0",
     "@cap-js/sqlite": "^2.0.1",
-    "@sap/cds": "^9.0.3",
-    "@sap/cds-dk": "^9.0.4",
+    "@sap/cds": "^9.1.0",
+    "@sap/cds-dk": "^9.1.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-node": "^11.1.0",
     "express": "^4.21.2",
-    "hdb": "^0.19.10",
+    "hdb": "^2.25.1",
     "jest": "^29.7.0",
     "prettier": "^2.8.8",
     "sqlite3": "^5.1.7",
diff --git a/src/config.js b/src/config.js
@@ -484,10 +484,11 @@ class Config {
               delete base.interval;
             }
 
-            result[fnName] = Object.assign(
+            const subType = `${name}.${fnName}`;
+            result[subType] = Object.assign(
               {
                 type: CAP_EVENT_TYPE,
-                subType: `${name}.${fnName}`,
+                subType,
                 impl: "./outbox/EventQueueGenericOutboxHandler",
                 internalEvent: true,
               },
diff --git a/src/periodicEvents.js b/src/periodicEvents.js
@@ -15,6 +15,9 @@ const COMPONENT_NAME = "/eventQueue/periodicEvents";
 
 const checkAndInsertPeriodicEvents = async (context) => {
   const now = new Date();
+  cds.log(COMPONENT_NAME).info("updating periodic events", {
+    tenant: context.tenant,
+  });
   const tx = cds.tx(context);
   const baseCqn = SELECT.from(eventConfig.tableNameEventQueue)
     .where([
diff --git a/src/runner/runner.js b/src/runner/runner.js
@@ -509,6 +509,7 @@ const _checkPeriodicEventsSingleTenantOneTime = async () => {
         tenantScoped: false,
       });
       if (!couldAcquireLock) {
+        logger.info("skipping updating periodic events - lock not acquired");
         return;
       }
       return await cds.tx({}, async (tx) => await periodicEvents.checkAndInsertPeriodicEvents(tx.context));
diff --git a/test/__snapshots__/admin-service.test.js.snap b/test/__snapshots__/admin-service.test.js.snap
@@ -234,7 +234,7 @@ exports[`admin-service-test metadata snapshot 1`] = `
 </edmx:Edmx>"
 `;
 
-exports[`admin-service-test not allowed if disabled by config 1`] = `[Error: 403 - Admin service is disabled by configuration]`;
+exports[`admin-service-test not allowed if disabled by config 1`] = `[AxiosError: 403 - Admin service is disabled by configuration]`;
 
 exports[`admin-service-test read entities: Event 1`] = `
 {
diff --git a/test/__snapshots__/periodicEvents.test.js.snap b/test/__snapshots__/periodicEvents.test.js.snap

Original file line number	Diff line number	Diff line change
`@@ -484,10 +484,11 @@ class Config {`
`484`	`484`	`delete base.interval;`
`485`	`485`	`}`
`486`	`486`
`487`		`- result[fnName] = Object.assign(`
	`487`	+ const subType = `${name}.${fnName}`;
	`488`	`+ result[subType] = Object.assign(`
`488`	`489`	`{`
`489`	`490`	`type: CAP_EVENT_TYPE,`
`490`		- subType: `${name}.${fnName}`,
	`491`	`+ subType,`
`491`	`492`	`impl: "./outbox/EventQueueGenericOutboxHandler",`
`492`	`493`	`internalEvent: true,`
`493`	`494`	`},`
Original file line number	Diff line number	Diff line change
`@@ -509,6 +509,7 @@ const _checkPeriodicEventsSingleTenantOneTime = async () => {`
`509`	`509`	`tenantScoped: false,`
`510`	`510`	`});`
`511`	`511`	`if (!couldAcquireLock) {`
	`512`	`+ logger.info("skipping updating periodic events - lock not acquired");`
`512`	`513`	`return;`
`513`	`514`	`}`
`514`	`515`	`return await cds.tx({}, async (tx) => await periodicEvents.checkAndInsertPeriodicEvents(tx.context));`
Original file line number	Diff line number	Diff line change
@@ -234,7 +234,7 @@ exports[`admin-service-test metadata snapshot 1`] = `
`234`	`234`	`</edmx:Edmx>"`
`235`	`235`	`;
`236`	`236`
`237`		-exports[`admin-service-test not allowed if disabled by config 1`] = `[Error: 403 - Admin service is disabled by configuration]`;
	`237`	+exports[`admin-service-test not allowed if disabled by config 1`] = `[AxiosError: 403 - Admin service is disabled by configuration]`;
`238`	`238`
`239`	`239`	exports[`admin-service-test read entities: Event 1`] = `
`240`	`240`	`{`