@ocoda/event-sourcing-mariadb 1.0.2 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @ocoda/event-sourcing-mariadb
 
+## 1.1.1
+
+### Patch Changes
+
+- [#384](https://github.com/ocoda/event-sourcing/pull/384) [`9f9af0e`](https://github.com/ocoda/event-sourcing/commit/9f9af0e3bfa36239121886635013ca515f38b09f) Thanks [@renovate](https://github.com/apps/renovate)! - Update dependencies
+
+- Updated dependencies [[`9f9af0e`](https://github.com/ocoda/event-sourcing/commit/9f9af0e3bfa36239121886635013ca515f38b09f)]:
+  - @ocoda/event-sourcing@1.1.1
+
+## 1.1.0
+
+### Minor Changes
+
+- [#371](https://github.com/ocoda/event-sourcing/pull/371) [`eff4abd`](https://github.com/ocoda/event-sourcing/commit/eff4abda2b44a7fbcb1be7bccde7fc9267e7fded) Thanks [@drieshooghe](https://github.com/drieshooghe)! - Support for a getAllEnvelopes method on the EventStore
+
+### Patch Changes
+
+- Updated dependencies [[`eff4abd`](https://github.com/ocoda/event-sourcing/commit/eff4abda2b44a7fbcb1be7bccde7fc9267e7fded)]:
+  - @ocoda/event-sourcing@1.1.0
+
 ## 1.0.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { IEventPayload, IEvent, EventStore, IEventPool, IEventCollection, IEventCollectionFilter, EventStream, IEventFilter, EventEnvelope, EventStoreConfig, AggregateRoot, ISnapshot, SnapshotStore, ISnapshotPool, ISnapshotCollection, ISnapshotCollectionFilter, SnapshotStream, ISnapshotFilter, SnapshotEnvelope, ILatestSnapshotFilter, SnapshotStoreConfig } from '@ocoda/event-sourcing';
+import { IEventPayload, IEvent, EventStore, IEventPool, IEventCollection, IEventCollectionFilter, EventStream, IEventFilter, EventEnvelope, IAllEventsFilter, EventStoreConfig, AggregateRoot, ISnapshot, SnapshotStore, ISnapshotPool, ISnapshotCollection, ISnapshotCollectionFilter, SnapshotStream, ISnapshotFilter, SnapshotEnvelope, ILatestSnapshotFilter, SnapshotStoreConfig } from '@ocoda/event-sourcing';
 import { Type } from '@nestjs/common';
 import { PoolConfig } from 'mariadb';
 
@@ -23,8 +23,9 @@ declare class MariaDBEventStore extends EventStore<MariaDBEventStoreConfig> {
     getEvents({ streamId }: EventStream, filter?: IEventFilter): AsyncGenerator<IEvent[]>;
     getEvent({ streamId }: EventStream, version: number, pool?: IEventPool): Promise<IEvent>;
     appendEvents(stream: EventStream, aggregateVersion: number, events: IEvent[] | EventEnvelope[], pool?: IEventPool): Promise<EventEnvelope[]>;
-    getEnvelopes({ streamId }: EventStream, filter?: IEventFilter): AsyncGenerator<EventEnvelope[]>;
     getEnvelope({ streamId }: EventStream, version: number, pool?: IEventPool): Promise<EventEnvelope>;
+    getEnvelopes({ streamId }: EventStream, filter?: IEventFilter): AsyncGenerator<EventEnvelope[]>;
+    getAllEnvelopes(filter: IAllEventsFilter): AsyncGenerator<EventEnvelope[]>;
 }
 
 interface MariaDBEventStoreConfig extends EventStoreConfig, PoolConfig {
@@ -52,11 +53,11 @@ declare class MariaDBSnapshotStore extends SnapshotStore<MariaDBSnapshotStoreCon
     getSnapshot<A extends AggregateRoot>({ streamId }: SnapshotStream, version: number, pool?: ISnapshotPool): Promise<ISnapshot<A>>;
     appendSnapshot<A extends AggregateRoot>(stream: SnapshotStream, aggregateVersion: number, snapshot: ISnapshot<A>, pool?: ISnapshotPool): Promise<SnapshotEnvelope<A>>;
     getLastSnapshot<A extends AggregateRoot>(stream: SnapshotStream, pool?: ISnapshotPool): Promise<ISnapshot<A>>;
-    getManyLastSnapshots<A extends AggregateRoot>(streams: SnapshotStream[], pool?: ISnapshotPool): Promise<Map<SnapshotStream, ISnapshot<A>>>;
+    getLastSnapshots<A extends AggregateRoot>(streams: SnapshotStream[], pool?: ISnapshotPool): Promise<Map<SnapshotStream, ISnapshot<A>>>;
     getLastEnvelope<A extends AggregateRoot>(stream: SnapshotStream, pool?: ISnapshotPool): Promise<SnapshotEnvelope<A>>;
     getEnvelopes<A extends AggregateRoot>({ streamId }: SnapshotStream, filter?: ISnapshotFilter): AsyncGenerator<SnapshotEnvelope<A>[]>;
     getEnvelope<A extends AggregateRoot>({ streamId }: SnapshotStream, version: number, pool?: ISnapshotPool): Promise<SnapshotEnvelope<A>>;
-    getLastAggregateEnvelopes<A extends AggregateRoot>(aggregateName: string, filter?: ILatestSnapshotFilter): AsyncGenerator<SnapshotEnvelope<A>[]>;
+    getLastEnvelopesForAggregate<A extends AggregateRoot>(aggregate: Type<A>, filter?: ILatestSnapshotFilter): AsyncGenerator<SnapshotEnvelope<A>[]>;
     getManyLastSnapshotEnvelopes<A extends AggregateRoot>(streams: SnapshotStream[], pool?: ISnapshotPool): Promise<Map<SnapshotStream, SnapshotEnvelope<A>>>;
     private getLastStreamEntities;
 }

package/dist/index.js

@@ -93,13 +93,14 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
                     version INT NOT NULL,
                     event VARCHAR(80) NOT NULL,
                     payload JSON NOT NULL,
+					event_date VARCHAR(7) NOT NULL,
                     event_id VARCHAR(40) NOT NULL,
                     aggregate_id VARCHAR(40) NOT NULL,
                     occurred_on TIMESTAMP NOT NULL,
                     correlation_id VARCHAR(255),
                     causation_id VARCHAR(255),
                     PRIMARY KEY (stream_id, version),
-					INDEX idx_event_id (event_id)
+					INDEX idx_event_date_id (event_date, event_id)
                 )`);
         return collection;
       } catch (error) {
@@ -245,13 +246,14 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
           envelopes.push(envelope);
         }
         yield connection.beginTransaction();
-        yield connection.batch(`INSERT INTO \`${collection}\` VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, envelopes.map(({ event, payload, metadata }) => {
+        yield connection.batch(`INSERT INTO \`${collection}\` VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, envelopes.map(({ event, payload, metadata }) => {
           var _a, _b;
           return [
             stream.streamId,
             metadata.version,
             event,
             JSON.stringify(payload),
+            metadata.eventId.yearMonth,
             metadata.eventId.value,
             metadata.aggregateId,
             metadata.occurredOn,
@@ -274,6 +276,26 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
       }
     });
   }
+  getEnvelope(_0, _1, _2) {
+    return __async(this, arguments, function* ({ streamId }, version, pool) {
+      const collection = import_event_sourcing.EventCollection.get(pool);
+      const [entity] = yield this.pool.query(`SELECT event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id FROM \`${collection}\` WHERE stream_id = ? AND version = ?`, [
+        streamId,
+        version
+      ]);
+      if (!entity) {
+        throw new import_event_sourcing.EventNotFoundException(streamId, version);
+      }
+      return import_event_sourcing.EventEnvelope.from(entity.event, entity.payload, {
+        eventId: import_event_sourcing.EventId.from(entity.event_id),
+        aggregateId: entity.aggregate_id,
+        version: entity.version,
+        occurredOn: entity.occurred_on,
+        correlationId: entity.correlation_id,
+        causationId: entity.causation_id
+      });
+    });
+  }
   getEnvelopes(_0, _1) {
     return __asyncGenerator(this, arguments, function* ({ streamId }, filter) {
       const connection = this.pool.getConnection();
@@ -338,24 +360,59 @@ var _MariaDBEventStore = class _MariaDBEventStore extends import_event_sourcing.
       }
     });
   }
-  getEnvelope(_0, _1, _2) {
-    return __async(this, arguments, function* ({ streamId }, version, pool) {
-      const collection = import_event_sourcing.EventCollection.get(pool);
-      const [entity] = yield this.pool.query(`SELECT event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id FROM \`${collection}\` WHERE stream_id = ? AND version = ?`, [
-        streamId,
-        version
-      ]);
-      if (!entity) {
-        throw new import_event_sourcing.EventNotFoundException(streamId, version);
+  getAllEnvelopes(filter) {
+    return __asyncGenerator(this, null, function* () {
+      const connection = this.pool.getConnection();
+      const collection = import_event_sourcing.EventCollection.get(filter == null ? void 0 : filter.pool);
+      const yearMonths = this.getYearMonthRange(filter.since, filter.until);
+      const batch = (filter == null ? void 0 : filter.batch) || import_event_sourcing.DEFAULT_BATCH_SIZE;
+      const query = `
+            SELECT event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id
+            FROM \`${collection}\`
+            WHERE event_date IN (?)
+            ORDER BY event_date ASC, event_id ASC
+        `;
+      const params = [
+        yearMonths
+      ];
+      const client = yield new __await(connection);
+      const stream = client.queryStream(query, params);
+      try {
+        let batchedEvents = [];
+        try {
+          for (var iter = __forAwait(stream), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+            const { event, payload, event_id, aggregate_id, version, occurred_on, correlation_id, causation_id } = temp.value;
+            batchedEvents.push(import_event_sourcing.EventEnvelope.from(event, payload, {
+              eventId: import_event_sourcing.EventId.from(event_id),
+              aggregateId: aggregate_id,
+              version,
+              occurredOn: occurred_on,
+              correlationId: correlation_id,
+              causationId: causation_id
+            }));
+            if (batchedEvents.length === batch) {
+              yield batchedEvents;
+              batchedEvents = [];
+            }
+          }
+        } catch (temp) {
+          error = [temp];
+        } finally {
+          try {
+            more && (temp = iter.return) && (yield new __await(temp.call(iter)));
+          } finally {
+            if (error)
+              throw error[0];
+          }
+        }
+        if (batchedEvents.length > 0) {
+          yield batchedEvents;
+        }
+      } catch (e) {
+        stream.destroy();
+      } finally {
+        yield new __await(client.release());
       }
-      return import_event_sourcing.EventEnvelope.from(entity.event, entity.payload, {
-        eventId: import_event_sourcing.EventId.from(entity.event_id),
-        aggregateId: entity.aggregate_id,
-        version: entity.version,
-        occurredOn: entity.occurred_on,
-        correlationId: entity.correlation_id,
-        causationId: entity.causation_id
-      });
     });
   }
 };
@@ -575,7 +632,7 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
       }
     });
   }
-  getManyLastSnapshots(streams, pool) {
+  getLastSnapshots(streams, pool) {
     return __async(this, null, function* () {
       const collection = import_event_sourcing2.SnapshotCollection.get(pool);
       const entities = yield this.getLastStreamEntities(collection, streams, [
@@ -690,26 +747,27 @@ var _MariaDBSnapshotStore = class _MariaDBSnapshotStore extends import_event_sou
       });
     });
   }
-  getLastAggregateEnvelopes(aggregateName, filter) {
+  getLastEnvelopesForAggregate(aggregate, filter) {
     return __asyncGenerator(this, null, function* () {
       const connection = this.pool.getConnection();
       const collection = import_event_sourcing2.SnapshotCollection.get(filter == null ? void 0 : filter.pool);
-      const fromId = filter == null ? void 0 : filter.fromId;
+      const { streamName } = (0, import_event_sourcing2.getAggregateMetadata)(aggregate);
+      const aggregateId = filter == null ? void 0 : filter.aggregateId;
       const limit = (filter == null ? void 0 : filter.limit) || Number.MAX_SAFE_INTEGER;
       const batch = (filter == null ? void 0 : filter.batch) || import_event_sourcing2.DEFAULT_BATCH_SIZE;
       const query = `
 	        SELECT payload, aggregate_id, registered_on, snapshot_id, version
 	        FROM \`${collection}\`
 	        WHERE aggregate_name = ?
-	        AND ${fromId ? "latest >= ?" : "latest LIKE 'latest%'"}
+	        AND ${aggregateId ? "latest >= ?" : "latest LIKE 'latest%'"}
 	        LIMIT ?
 	    `;
-      const params = fromId ? [
-        aggregateName,
-        fromId,
+      const params = aggregateId ? [
+        streamName,
+        aggregateId,
         limit
       ] : [
-        aggregateName,
+        streamName,
         limit
       ];
       const client = yield new __await(connection);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocoda/event-sourcing-mariadb",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "NestJS Event Sourcing Library (@mariadb)",
   "author": "Dries Hooghe <dries@drieshooghe.com>",
   "license": "MIT",
@@ -13,31 +13,31 @@
     "node": ">= 18.20.4"
   },
   "dependencies": {
-    "mariadb": "^3.3.2"
+    "mariadb": "^3.4.0"
   },
   "peerDependencies": {
     "@nestjs/core": "^10.0.0",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.2.0",
-    "@ocoda/event-sourcing": "1.0.2"
+    "@ocoda/event-sourcing": "1.1.1"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.9.3",
-    "@faker-js/faker": "^9.0.3",
-    "@nestjs/common": "10.4.4",
-    "@nestjs/core": "10.4.4",
-    "@nestjs/platform-express": "10.4.4",
-    "@nestjs/testing": "10.4.4",
+    "@biomejs/biome": "1.9.4",
+    "@faker-js/faker": "^9.2.0",
+    "@nestjs/common": "10.4.7",
+    "@nestjs/core": "10.4.7",
+    "@nestjs/platform-express": "10.4.7",
+    "@nestjs/testing": "10.4.7",
     "@swc-node/register": "^1.10.9",
-    "@swc/core": "1.7.35",
-    "@swc/jest": "0.2.36",
-    "@types/jest": "29.5.13",
-    "@types/node": "20.16.11",
+    "@swc/core": "1.9.2",
+    "@swc/jest": "0.2.37",
+    "@types/jest": "29.5.14",
+    "@types/node": "20.17.6",
     "jest": "29.7.0",
     "jest-mock": "29.7.0",
     "reflect-metadata": "0.2.2",
     "rxjs": "7.8.1",
-    "tsup": "^8.3.0",
+    "tsup": "^8.3.5",
     "typescript": "5.6.3",
     "@ocoda/event-sourcing-config": "1.0.0",
     "@ocoda/event-sourcing-testing": "1.0.0"