cleanup

Author: soccermax

CHANGELOG.md

@@ -5,7 +5,7 @@ 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).
 
-## v2.0.2 - 2025-11-XX
+## v2.0.2 - 2025-12-01
 
 ### Added
 

srv/service/admin-service.cds

@@ -12,9 +12,6 @@ service EventQueueAdminService {
         *
   } actions {
       action setStatusAndAttempts(
-        // TODO: remove tenant as soon as CAP issue is fixed https://github.tools.sap/cap/issues/issues/18445
-        @mandatory
-        tenant: String,
         status: db.Status,
         @assert.range: [0,100]
         attempts: Integer) returns Event;
@@ -31,9 +28,6 @@ service EventQueueAdminService {
     createdAt: Integer;
   } actions {
       action releaseLock(
-        // TODO: remove tenant as soon as CAP issue is fixed https://github.tools.sap/cap/issues/issues/18445
-        @mandatory
-        tenant: String,
         @mandatory
         type: String,
         @mandatory

srv/service/admin-service.js

@@ -93,8 +93,9 @@ module.exports = class AdminService extends cds.ApplicationService {
     });
 
     this.on("releaseLock", async (req) => {
+      const tenant = req.headers["z-id"];
       cds.log("eventQueue").info("Releasing event-queue lock", req.data);
-      const { tenant, type, subType, namespace } = req.data;
+      const { type, subType, namespace } = req.data;
       return await cds.tx({ tenant }, async (tx) => {
         return await distributedLock.releaseLock(tx.context, [namespace, type, subType].join("##"), {
           skipNamespace: true,

test/__snapshots__/admin-service.test.js.snap

@@ -66,14 +66,12 @@ exports[`admin-service-test metadata snapshot 1`] = `
       </EntityType>
       <Action Name="setStatusAndAttempts" IsBound="true" EntitySetPath="in">
         <Parameter Name="in" Type="EventQueueAdminService.Event"/>
-        <Parameter Name="tenant" Type="Edm.String"/>
         <Parameter Name="status" Type="Edm.Int32"/>
         <Parameter Name="attempts" Type="Edm.Int32"/>
         <ReturnType Type="EventQueueAdminService.Event"/>
       </Action>
       <Action Name="releaseLock" IsBound="true">
         <Parameter Name="in" Type="EventQueueAdminService.Lock"/>
-        <Parameter Name="tenant" Type="Edm.String"/>
         <Parameter Name="type" Type="Edm.String"/>
         <Parameter Name="subType" Type="Edm.String"/>
         <ReturnType Type="Edm.Boolean"/>
@@ -144,9 +142,6 @@ exports[`admin-service-test metadata snapshot 1`] = `
       <Annotations Target="EventQueueAdminService.Event/createdAt">
         <Annotation Term="Core.Computed" Bool="true"/>
       </Annotations>
-      <Annotations Target="EventQueueAdminService.setStatusAndAttempts(EventQueueAdminService.Event)/tenant">
-        <Annotation Term="Common.FieldControl" EnumMember="Common.FieldControlType/Mandatory"/>
-      </Annotations>
       <Annotations Target="EventQueueAdminService.setStatusAndAttempts(EventQueueAdminService.Event)/status">
         <Annotation Term="Validation.AllowedValues">
           <Collection>
@@ -198,9 +193,6 @@ exports[`admin-service-test metadata snapshot 1`] = `
           </Record>
         </Annotation>
       </Annotations>
-      <Annotations Target="EventQueueAdminService.releaseLock(EventQueueAdminService.Lock)/tenant">
-        <Annotation Term="Common.FieldControl" EnumMember="Common.FieldControlType/Mandatory"/>
-      </Annotations>
       <Annotations Target="EventQueueAdminService.releaseLock(EventQueueAdminService.Lock)/type">
         <Annotation Term="Common.FieldControl" EnumMember="Common.FieldControlType/Mandatory"/>
       </Annotations>

test/admin-service.test.js

@@ -102,7 +102,6 @@ describe("admin-service-test", () => {
     const { ID } = response.data.value[0];
 
     const responseSetStatus = await POST(`/odata/v4/event-queue/admin/Event/${ID}/setStatusAndAttempts`, {
-      tenant: "local-dummy",
       status: eventQueue.EventProcessingStatus.Done,
       attempts: 1,
     });