Added message type to allow store not only events but also commands

This is the first step to enable message storing and workflows
event-driven-io · Feb 27, 2025 · 65405ae · 65405ae
1 parent b939074
commit 65405ae
Show file tree

Hide file tree

Showing 16 changed files with 221 additions and 98 deletions.
diff --git a/src/packages/emmett-mongodb/src/eventStore/mongoDBEventStore.ts b/src/packages/emmett-mongodb/src/eventStore/mongoDBEventStore.ts
@@ -336,7 +336,7 @@ class MongoDBEventStoreImplementation implements MongoDBEventStore, Closeable {
     const eventsToAppend: ReadEvent<EventType, MongoDBReadEventMetadata>[] =
       events.map((event) => {
         const metadata: MongoDBReadEventMetadata = {
-          eventId: uuid(),
+          messageId: uuid(),
           streamName,
           streamPosition: ++streamOffset,
         };

diff --git a/src/packages/emmett-postgresql/src/eventStore/projections/postgresProjectionSpec.ts b/src/packages/emmett-postgresql/src/eventStore/projections/postgresProjectionSpec.ts
@@ -85,11 +85,12 @@ export const PostgreSQLProjectionSpec = {
                   globalPosition: ++globalPosition,
                   streamPosition: globalPosition,
                   streamName: `test-${uuid()}`,
-                  eventId: uuid(),
+                  messageId: uuid(),
                 };
 
                 allEvents.push({
                   ...event,
+                  kind: 'Event',
                   metadata: {
                     ...metadata,
                     ...('metadata' in event ? (event.metadata ?? {}) : {}),

diff --git a/src/packages/emmett-postgresql/src/eventStore/schema/appendToStream.ts b/src/packages/emmett-postgresql/src/eventStore/schema/appendToStream.ts
@@ -146,9 +146,10 @@ export const appendToStream = (
 
       const eventsToAppend: ReadEvent[] = events.map((e, i) => ({
         ...e,
+        kind: e.kind ?? 'Event',
         metadata: {
           streamName,
-          eventId: uuid(),
+          messageId: uuid(),
           streamPosition: BigInt(i),
           ...('metadata' in e ? (e.metadata ?? {}) : {}),
         },
@@ -252,7 +253,7 @@ const appendEventsRaw = (
                   %s::bigint,
                   %L::text
               )`,
-        events.map((e) => sql('%L', e.metadata.eventId)).join(','),
+        events.map((e) => sql('%L', e.metadata.messageId)).join(','),
         events.map((e) => sql('%L', JSONParser.stringify(e.data))).join(','),
         events
           .map((e) => sql('%L', JSONParser.stringify(e.metadata ?? {})))

diff --git a/src/packages/emmett-postgresql/src/eventStore/schema/readMessagesBatch.ts b/src/packages/emmett-postgresql/src/eventStore/schema/readMessagesBatch.ts
@@ -93,14 +93,15 @@ export const readMessagesBatch = async <
 
       const metadata: ReadEventMetadataWithGlobalPosition = {
         ...('metadata' in rawEvent ? (rawEvent.metadata ?? {}) : {}),
-        eventId: row.event_id,
+        messageId: row.event_id,
         streamName: row.stream_id,
         streamPosition: BigInt(row.stream_position),
         globalPosition: BigInt(row.global_position),
       };
 
       return {
         ...rawEvent,
+        kind: 'Event',
         metadata: metadata as CombinedReadEventMetadata<
           MessageType,
           ReadEventMetadataType

diff --git a/src/packages/emmett-postgresql/src/eventStore/schema/readStream.ts b/src/packages/emmett-postgresql/src/eventStore/schema/readStream.ts
@@ -67,14 +67,15 @@ export const readStream = async <EventType extends Event>(
 
         const metadata: ReadEventMetadataWithGlobalPosition = {
           ...('metadata' in rawEvent ? (rawEvent.metadata ?? {}) : {}),
-          eventId: row.event_id,
+          messageId: row.event_id,
           streamName: streamId,
           streamPosition: BigInt(row.stream_position),
           globalPosition: BigInt(row.global_position),
         };
 
         return {
           ...rawEvent,
+          kind: 'Event',
           metadata: metadata as CombinedReadEventMetadata<
             EventType,
             ReadEventMetadataWithGlobalPosition

diff --git a/src/packages/emmett-sqlite/src/eventStore/schema/appendToStream.ts b/src/packages/emmett-sqlite/src/eventStore/schema/appendToStream.ts
@@ -44,9 +44,10 @@ export const appendToStream = async (
   const eventsToAppend: ReadEvent[] = events.map(
     (e: Event, i: number): ReadEvent => ({
       ...e,
+      kind: e.kind ?? 'Event',
       metadata: {
         streamName,
-        eventId: uuid(),
+        messageId: uuid(),
         streamPosition: BigInt(i + 1),
         ...('metadata' in e ? (e.metadata ?? {}) : {}),
       },
@@ -268,7 +269,7 @@ const buildEventInsertQuery = (
         JSONParser.stringify(event.metadata),
         expectedStreamVersion?.toString() ?? 0,
         event.type,
-        event.metadata.eventId,
+        event.metadata.messageId,
         false,
       );
 

diff --git a/src/packages/emmett-sqlite/src/eventStore/schema/readStream.ts b/src/packages/emmett-sqlite/src/eventStore/schema/readStream.ts
@@ -61,13 +61,14 @@ export const readStream = async <EventType extends Event>(
 
       const metadata: ReadEventMetadataWithGlobalPosition = {
         ...('metadata' in rawEvent ? (rawEvent.metadata ?? {}) : {}),
-        eventId: row.event_id,
+        messageId: row.event_id,
         streamName: streamId,
         streamPosition: BigInt(row.stream_position),
         globalPosition: BigInt(row.global_position),
       };
 
       return {
+        kind: 'Event',
         ...rawEvent,
         metadata: metadata as CombinedReadEventMetadata<
           EventType,

diff --git a/src/packages/emmett/src/eventStore/afterCommit/afterEventStoreCommitHandler.unit.spec.ts b/src/packages/emmett/src/eventStore/afterCommit/afterEventStoreCommitHandler.unit.spec.ts
@@ -31,22 +31,24 @@ void describe('InMemoryEventStore onAfterCommit', () => {
     let counter = 0;
     const events: TestReadEvent[] = [
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: true,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
         },
       },
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: false,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
@@ -76,22 +78,24 @@ void describe('InMemoryEventStore onAfterCommit', () => {
     let counter = 0;
     const events: TestReadEvent[] = [
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: true,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
         },
       },
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: false,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
@@ -100,22 +104,24 @@ void describe('InMemoryEventStore onAfterCommit', () => {
     ];
     const nextEvents: TestReadEvent[] = [
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: true,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
         },
       },
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: false,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
@@ -152,22 +158,24 @@ void describe('InMemoryEventStore onAfterCommit', () => {
     let counter = 0;
     const events: TestReadEvent[] = [
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: true,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
         },
       },
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: false,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,

diff --git a/src/packages/emmett/src/eventStore/afterCommit/forwardToMessageBus.unit.spec.ts b/src/packages/emmett/src/eventStore/afterCommit/forwardToMessageBus.unit.spec.ts
@@ -33,22 +33,24 @@ void describe('InMemoryEventStore onAfterCommit', () => {
     let counter = 0;
     const events: TestReadEvent[] = [
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: true,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
         },
       },
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: false,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
@@ -79,22 +81,24 @@ void describe('InMemoryEventStore onAfterCommit', () => {
     let counter = 0;
     const events: TestReadEvent[] = [
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: true,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
         },
       },
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: false,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
@@ -103,22 +107,24 @@ void describe('InMemoryEventStore onAfterCommit', () => {
     ];
     const nextEvents: TestReadEvent[] = [
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: true,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
         },
       },
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: false,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
@@ -151,22 +157,24 @@ void describe('InMemoryEventStore onAfterCommit', () => {
     let counter = 0;
     const events: TestReadEvent[] = [
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: true,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,
         },
       },
       {
+        kind: 'Event',
         type: 'test',
         data: { counter: ++counter },
         metadata: {
           some: false,
-          eventId: uuid(),
+          messageId: uuid(),
           globalPosition: 1n,
           streamName,
           streamPosition: 1n,

diff --git a/src/packages/emmett/src/eventStore/inMemoryEventStore.ts b/src/packages/emmett/src/eventStore/inMemoryEventStore.ts
@@ -161,12 +161,13 @@ export const getInMemoryEventStore = (
       >[] = events.map((event, index) => {
         const metadata: ReadEventMetadataWithGlobalPosition = {
           streamName,
-          eventId: uuid(),
+          messageId: uuid(),
           streamPosition: BigInt(currentEvents.length + index + 1),
           globalPosition: BigInt(getAllEventsCount() + index + 1),
         };
         return {
           ...event,
+          kind: event.kind ?? 'Event',
           metadata: {
             ...('metadata' in event ? (event.metadata ?? {}) : {}),
             ...metadata,

diff --git a/src/packages/emmett/src/eventStore/subscriptions/caughtUpTransformStream.unit.spec.ts b/src/packages/emmett/src/eventStore/subscriptions/caughtUpTransformStream.unit.spec.ts
@@ -22,9 +22,10 @@ void describe('CaughtUpTransformStream', () => {
     globalPosition: bigint,
   ): ReadEvent<ShoppingCartOpened, ReadEventMetadataWithGlobalPosition> => ({
     type: 'ShoppingCartOpened',
+    kind: 'Event',
     data: { cartId: 'cartId' },
     metadata: {
-      eventId: uuid(),
+      messageId: uuid(),
       globalPosition,
       streamPosition: globalPosition,
       streamName: 'test',

diff --git a/src/packages/emmett/src/eventStore/subscriptions/streamingCoordinator.unit.spec.ts b/src/packages/emmett/src/eventStore/subscriptions/streamingCoordinator.unit.spec.ts
@@ -159,10 +159,11 @@ const createMockEvent = (
   position: bigint,
 ): ReadEvent<MockEvent, ReadEventMetadataWithGlobalPosition> => ({
   type: 'Mocked',
+  kind: 'Event',
   data: { mocked: true },
   metadata: {
     streamName: 'testStream',
-    eventId: `event-${position}`,
+    messageId: `message-${position}`,
     streamPosition: position,
     globalPosition: position,
   },