From ab0afa9bacbd5bae5fa8ffb02b39dc088d7a72a3 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 13 Sep 2024 09:15:29 +0200
Subject: [PATCH] events-backend: made some names in EventBusStore more
 explicit

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../events-backend/src/service/hub/DatabaseEventBusStore.ts | 4 ++--
 .../events-backend/src/service/hub/MemoryEventBusStore.ts   | 4 ++--
 .../events-backend/src/service/hub/createEventBusRouter.ts  | 2 +-
 plugins/events-backend/src/service/hub/types.ts             | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/events-backend/src/service/hub/DatabaseEventBusStore.ts b/plugins/events-backend/src/service/hub/DatabaseEventBusStore.ts
index 63cc06d40d..b8a3e54ab8 100644
--- a/plugins/events-backend/src/service/hub/DatabaseEventBusStore.ts
+++ b/plugins/events-backend/src/service/hub/DatabaseEventBusStore.ts
@@ -350,7 +350,7 @@ export class DatabaseEventBusStore implements EventBusStore {
   async publish(options: {
     params: EventParams;
     consumedBy?: string[];
-  }): Promise<{ id: string } | undefined> {
+  }): Promise<{ eventId: string } | undefined> {
     const topic = options.params.topic;
     const consumedBy = options.consumedBy ?? [];
     // This query inserts a new event into the database, but only if there are
@@ -410,7 +410,7 @@ export class DatabaseEventBusStore implements EventBusStore {
       );
     }
 
-    return { id };
+    return { eventId: id };
   }
 
   async upsertSubscription(id: string, topics: string[]): Promise<void> {
diff --git a/plugins/events-backend/src/service/hub/MemoryEventBusStore.ts b/plugins/events-backend/src/service/hub/MemoryEventBusStore.ts
index 3071a51edf..1527eeb1fa 100644
--- a/plugins/events-backend/src/service/hub/MemoryEventBusStore.ts
+++ b/plugins/events-backend/src/service/hub/MemoryEventBusStore.ts
@@ -33,7 +33,7 @@ export class MemoryEventBusStore implements EventBusStore {
   async publish(options: {
     params: EventParams;
     consumedBy: string[];
-  }): Promise<{ id: string } | undefined> {
+  }): Promise<{ eventId: string } | undefined> {
     const topic = options.params.topic;
     const consumedBy = new Set(options.consumedBy);
 
@@ -57,7 +57,7 @@ export class MemoryEventBusStore implements EventBusStore {
         this.#listeners.delete(listener);
       }
     }
-    return { id: String(nextSeq) };
+    return { eventId: String(nextSeq) };
   }
 
   #getMaxSeq() {
diff --git a/plugins/events-backend/src/service/hub/createEventBusRouter.ts b/plugins/events-backend/src/service/hub/createEventBusRouter.ts
index 532ceaf2b8..fd0732e279 100644
--- a/plugins/events-backend/src/service/hub/createEventBusRouter.ts
+++ b/plugins/events-backend/src/service/hub/createEventBusRouter.ts
@@ -167,7 +167,7 @@ export async function createEventBusRouter(options: {
       consumedBy: req.body.consumedBy,
     });
     if (result) {
-      logger.info(`Published event to '${topic}' with ID '${result.id}'`, {
+      logger.info(`Published event to '${topic}' with ID '${result.eventId}'`, {
         subject: credentials.principal.subject,
       });
       res.status(201).end();
diff --git a/plugins/events-backend/src/service/hub/types.ts b/plugins/events-backend/src/service/hub/types.ts
index 315a4a7220..b221f6696d 100644
--- a/plugins/events-backend/src/service/hub/types.ts
+++ b/plugins/events-backend/src/service/hub/types.ts
@@ -20,11 +20,11 @@ export type EventBusStore = {
   publish(options: {
     params: EventParams;
     consumedBy?: string[];
-  }): Promise<{ id: string } | undefined>;
+  }): Promise<{ eventId: string } | undefined>;
 
-  upsertSubscription(id: string, topics: string[]): Promise<void>;
+  upsertSubscription(subscriptionId: string, topics: string[]): Promise<void>;
 
-  readSubscription(id: string): Promise<{ events: EventParams[] }>;
+  readSubscription(subscriptionId: string): Promise<{ events: EventParams[] }>;
 
   setupListener(
     subscriptionId: string,