castore-dev · ThomasAribart · Oct 6, 2023 · Oct 6, 2023
diff --git a/packages/command-json-schema/src/command.fixtures.test.ts b/packages/command-json-schema/src/command.fixtures.test.ts
@@ -16,19 +16,13 @@ export const pushEventGroupMock = vi.fn();
 export const groupEvent = vi.fn();
 export const getEventsMock = vi.fn();
 export const listAggregateIdsMock = vi.fn();
-export const putSnapshotMock = vi.fn();
-export const getLastSnapshotMock = vi.fn();
-export const listSnapshotsMock = vi.fn();
 
 export const eventStorageAdapterMock: EventStorageAdapter = {
   pushEvent: pushEventMock,
   pushEventGroup: pushEventGroupMock,
   groupEvent: groupEvent,
   getEvents: getEventsMock,
   listAggregateIds: listAggregateIdsMock,
-  putSnapshot: putSnapshotMock,
-  getLastSnapshot: getLastSnapshotMock,
-  listSnapshots: listSnapshotsMock,
 };
 
 export const counterCreatedEvent = new EventType<'COUNTER_CREATED'>({

diff --git a/packages/core/src/command/command.fixtures.test.ts b/packages/core/src/command/command.fixtures.test.ts
@@ -15,19 +15,13 @@ export const pushEventGroupMock = vi.fn();
 export const groupEventMock = vi.fn();
 export const getEventsMock = vi.fn();
 export const listAggregateIdsMock = vi.fn();
-export const putSnapshotMock = vi.fn();
-export const getLastSnapshotMock = vi.fn();
-export const listSnapshotsMock = vi.fn();
 
 export const eventStorageAdapterMock: EventStorageAdapter = {
   pushEvent: pushEventMock,
   pushEventGroup: pushEventGroupMock,
   groupEvent: groupEventMock,
   getEvents: getEventsMock,
   listAggregateIds: listAggregateIdsMock,
-  putSnapshot: putSnapshotMock,
-  getLastSnapshot: getLastSnapshotMock,
-  listSnapshots: listSnapshotsMock,
 };
 
 // Counters

diff --git a/packages/core/src/connectedEventStore/connectedEventStore.unit.test.ts b/packages/core/src/connectedEventStore/connectedEventStore.unit.test.ts
@@ -31,9 +31,6 @@ export const anotherEventStorageAdapterMock: EventStorageAdapter = {
   groupEvent: vi.fn(),
   getEvents: vi.fn(),
   listAggregateIds: vi.fn(),
-  putSnapshot: vi.fn(),
-  getLastSnapshot: vi.fn(),
-  listSnapshots: vi.fn(),
 };
 
 describe('ConnectedEventStore', () => {

diff --git a/packages/core/src/event/eventType.ts b/packages/core/src/event/eventType.ts
@@ -9,6 +9,17 @@ export class EventType<
     detail: EventDetail<TYPE, PAYLOAD, METADATA>;
   };
   type: TYPE;
+  parseEventDetail?: (candidate: unknown) =>
+    | {
+        isValid: true;
+        parsedEventDetail: EventDetail<TYPE, PAYLOAD, METADATA>;
+        parsingErrors?: never;
+      }
+    | {
+        isValid: false;
+        parsedEventDetail?: never;
+        parsingErrors?: [Error, ...Error[]];
+      };
 
   constructor({ type }: { type: TYPE }) {
     this.type = type;

diff --git a/packages/core/src/eventStorageAdapter.ts b/packages/core/src/eventStorageAdapter.ts
@@ -1,4 +1,3 @@
-import type { Aggregate } from '~/aggregate';
 import type { EventDetail, OptionalTimestamp } from '~/event/eventDetail';
 import type { GroupedEvent } from '~/event/groupedEvent';
 
@@ -28,17 +27,6 @@ export type ListAggregateIdsOutput = {
   nextPageToken?: string;
 };
 
-export type GetLastSnapshotOptions = {
-  maxVersion?: number;
-};
-
-export type ListSnapshotsOptions = {
-  minVersion?: number;
-  maxVersion?: number;
-  limit?: number;
-  reverse?: boolean;
-};
-
 export interface EventStorageAdapter {
   getEvents: (
     aggregateId: string,
@@ -57,13 +45,4 @@ export interface EventStorageAdapter {
     context: EventStoreContext,
     options?: ListAggregateIdsOptions,
   ) => Promise<ListAggregateIdsOutput>;
-  putSnapshot: (aggregate: Aggregate) => Promise<void>;
-  getLastSnapshot: (
-    aggregateId: string,
-    options?: GetLastSnapshotOptions,
-  ) => Promise<{ snapshot: Aggregate | undefined }>;
-  listSnapshots: (
-    aggregateId: string,
-    options?: ListSnapshotsOptions,
-  ) => Promise<{ snapshots: Aggregate[] }>;
 }
diff --git a/packages/core/src/eventStore/eventStore.fixtures.test.ts b/packages/core/src/eventStore/eventStore.fixtures.test.ts
@@ -10,19 +10,13 @@ export const pushEventGroupMock = vi.fn();
 export const groupEventMock = vi.fn();
 export const getEventsMock = vi.fn();
 export const listAggregateIdsMock = vi.fn();
-export const putSnapshotMock = vi.fn();
-export const getLastSnapshotMock = vi.fn();
-export const listSnapshotsMock = vi.fn();
 
 export const eventStorageAdapterMock: EventStorageAdapter = {
   pushEvent: pushEventMock,
   pushEventGroup: pushEventGroupMock,
   groupEvent: groupEventMock,
   getEvents: getEventsMock,
   listAggregateIds: listAggregateIdsMock,
-  putSnapshot: putSnapshotMock,
-  getLastSnapshot: getLastSnapshotMock,
-  listSnapshots: listSnapshotsMock,
 };
 
 // Pokemons

diff --git a/packages/core/src/eventStore/eventStore.unit.test.ts b/packages/core/src/eventStore/eventStore.unit.test.ts
@@ -19,8 +19,6 @@ import {
   pushEventMock,
   pushEventGroupMock,
   listAggregateIdsMock,
-  getLastSnapshotMock,
-  putSnapshotMock,
   groupEventMock,
   eventStorageAdapterMock,
   PokemonEventDetails,
@@ -33,9 +31,6 @@ describe('event store', () => {
     pushEventMock.mockClear();
     listAggregateIdsMock.mockClear();
     listAggregateIdsMock.mockReturnValue({ aggregateIds: [pikachuId] });
-    putSnapshotMock.mockClear();
-    getLastSnapshotMock.mockClear();
-    getLastSnapshotMock.mockResolvedValue({ snapshot: undefined });
   });
 
   it('has correct properties', () => {

diff --git a/packages/event-storage-adapter-dynamodb/src/legacyAdapter.ts b/packages/event-storage-adapter-dynamodb/src/legacyAdapter.ts
@@ -132,10 +132,6 @@ export class LegacyDynamoDBEventStorageAdapter implements EventStorageAdapter {
   groupEvent: EventStorageAdapter['groupEvent'];
   listAggregateIds: EventStorageAdapter['listAggregateIds'];
 
-  putSnapshot: EventStorageAdapter['putSnapshot'];
-  getLastSnapshot: EventStorageAdapter['getLastSnapshot'];
-  listSnapshots: EventStorageAdapter['listSnapshots'];
-
   getTableName: () => string;
   tableName: string | (() => string);
   dynamoDBClient: DynamoDBClient;
@@ -430,13 +426,5 @@ export class LegacyDynamoDBEventStorageAdapter implements EventStorageAdapter {
           : {}),
       };
     };
-
-    this.putSnapshot = async () => new Promise(resolve => resolve());
-
-    this.getLastSnapshot = async () =>
-      new Promise(resolve => resolve({ snapshot: undefined }));
-
-    this.listSnapshots = async () =>
-      new Promise(resolve => resolve({ snapshots: [] }));
   }
 }
diff --git a/packages/event-storage-adapter-dynamodb/src/singleTableAdapter.ts b/packages/event-storage-adapter-dynamodb/src/singleTableAdapter.ts
@@ -143,10 +143,6 @@ export class DynamoDBSingleTableEventStorageAdapter
   groupEvent: EventStorageAdapter['groupEvent'];
   listAggregateIds: EventStorageAdapter['listAggregateIds'];
 
-  putSnapshot: EventStorageAdapter['putSnapshot'];
-  getLastSnapshot: EventStorageAdapter['getLastSnapshot'];
-  listSnapshots: EventStorageAdapter['listSnapshots'];
-
   getTableName: () => string;
   tableName: string | (() => string);
   dynamoDBClient: DynamoDBClient;
@@ -445,13 +441,5 @@ export class DynamoDBSingleTableEventStorageAdapter
           : {}),
       };
     };
-
-    this.putSnapshot = async () => new Promise(resolve => resolve());
-
-    this.getLastSnapshot = async () =>
-      new Promise(resolve => resolve({ snapshot: undefined }));
-
-    this.listSnapshots = async () =>
-      new Promise(resolve => resolve({ snapshots: [] }));
   }
 }
diff --git a/packages/event-storage-adapter-in-memory/src/adapter.ts b/packages/event-storage-adapter-in-memory/src/adapter.ts
@@ -119,9 +119,6 @@ export class InMemoryEventStorageAdapter implements EventStorageAdapter {
   pushEventGroup: EventStorageAdapter['pushEventGroup'];
   groupEvent: EventStorageAdapter['groupEvent'];
   listAggregateIds: EventStorageAdapter['listAggregateIds'];
-  putSnapshot: EventStorageAdapter['putSnapshot'];
-  getLastSnapshot: EventStorageAdapter['getLastSnapshot'];
-  listSnapshots: EventStorageAdapter['listSnapshots'];
 
   eventStore: { [aggregateId: string]: EventDetail[] };
 
@@ -342,12 +339,5 @@ export class InMemoryEventStorageAdapter implements EventStorageAdapter {
             : {}),
         });
       });
-
-    // We do not implement snapshots in this adapter
-    this.putSnapshot = () => new Promise(resolve => resolve());
-    this.getLastSnapshot = () =>
-      new Promise(resolve => resolve({ snapshot: undefined }));
-    this.listSnapshots = () =>
-      new Promise(resolve => resolve({ snapshots: [] }));
   }
 }
diff --git a/packages/event-storage-adapter-redux/src/adapter.ts b/packages/event-storage-adapter-redux/src/adapter.ts
@@ -112,9 +112,6 @@ export class ReduxEventStorageAdapter implements EventStorageAdapter {
   pushEventGroup: EventStorageAdapter['pushEventGroup'];
   groupEvent: EventStorageAdapter['groupEvent'];
   listAggregateIds: EventStorageAdapter['listAggregateIds'];
-  putSnapshot: EventStorageAdapter['putSnapshot'];
-  getLastSnapshot: EventStorageAdapter['getLastSnapshot'];
-  listSnapshots: EventStorageAdapter['listSnapshots'];
 
   store: EnhancedStore<EventStoresReduxState>;
   eventStoreId: string;
@@ -326,12 +323,5 @@ export class ReduxEventStorageAdapter implements EventStorageAdapter {
             : {}),
         });
       });
-
-    // We do not implement snapshots in this adapter
-    this.putSnapshot = () => new Promise(resolve => resolve());
-    this.getLastSnapshot = () =>
-      new Promise(resolve => resolve({ snapshot: undefined }));
-    this.listSnapshots = () =>
-      new Promise(resolve => resolve({ snapshots: [] }));
   }
 }