events-backend: fix schema and response shape

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

plugins/events-backend/src/schema/openapi.generated.ts

@@ -250,6 +250,7 @@ export const spec = {
               'application/json': {
                 schema: {
                   type: 'object',
+                  required: ['events'],
                   properties: {
                     events: {
                       type: 'array',
@@ -258,7 +259,6 @@ export const spec = {
                       },
                     },
                   },
-                  required: ['results'],
                 },
               },
             },

plugins/events-backend/src/schema/openapi.yaml

@@ -164,13 +164,13 @@ paths:
             application/json:
               schema:
                 type: object
+                required:
+                  - events
                 properties:
                   events:
                     type: array
                     items:
                       $ref: '#/components/schemas/Event'
-                required:
-                  - results
         '202':
           description: No new events are available. Response will block until the client should try again.
         default:

plugins/events-backend/src/service/hub/createEventBusRouter.ts

@@ -216,7 +216,12 @@ export async function createEventBusRouter(options: {
         );
 
         if (events.length > 0) {
-          res.json({ events });
+          res.json({
+            events: events.map(event => ({
+              topic: event.topic,
+              payload: event.eventPayload,
+            })),
+          });
         } else {
           res.status(202);
           res.flushHeaders();

plugins/events-node/src/generated/models/GetSubscriptionEvents200Response.model.ts

@@ -20,5 +20,5 @@
 import { Event } from '../models/Event.model';
 
 export interface GetSubscriptionEvents200Response {
-  events?: Array<Event>;
+  events: Array<Event>;
 }