Fixed mapping of optimistic concurrency for PostgreSQL event store

Bumped to 0.12.1
event-driven-io · Jul 11, 2024 · 207b3b6 · 207b3b6
1 parent c6500e2
commit 207b3b6
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 27 deletions.
diff --git a/src/package-lock.json b/src/package-lock.json
diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/core",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Emmett - Event Sourcing development made simple",
   "engines": {
     "node": ">=20.11.1"

diff --git a/src/packages/emmett-esdb/package.json b/src/packages/emmett-esdb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-esdb",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Emmett - EventStoreDB - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",
@@ -50,7 +50,7 @@
     "@event-driven-io/emmett-testcontainers": "^0.5.0"
   },
   "peerDependencies": {
-    "@event-driven-io/emmett": "0.12.0",
+    "@event-driven-io/emmett": "0.12.1",
     "@eventstore/db-client": "^6.1.0"
   }
 }
diff --git a/src/packages/emmett-expressjs/package.json b/src/packages/emmett-expressjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-expressjs",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Emmett - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",
@@ -48,7 +48,7 @@
   "dependencies": {},
   "devDependencies": {},
   "peerDependencies": {
-    "@event-driven-io/emmett": "0.12.0",
+    "@event-driven-io/emmett": "0.12.1",
     "@types/express": "4.17.21",
     "@types/supertest": "6.0.2",
     "express": "4.19.2",

diff --git a/src/packages/emmett-fastify/package.json b/src/packages/emmett-fastify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-fastify",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Emmett - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",
@@ -52,7 +52,7 @@
   "dependencies": {},
   "devDependencies": {},
   "peerDependencies": {
-    "@event-driven-io/emmett": "^0.12.0",
+    "@event-driven-io/emmett": "^0.12.1",
     "fastify": "4.26.2",
     "@fastify/compress": "7.0.0",
     "@fastify/etag": "5.1.0",

diff --git a/src/packages/emmett-postgresql/package.json b/src/packages/emmett-postgresql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-postgresql",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Emmett - PostgreSQL - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",
@@ -52,7 +52,7 @@
     "@event-driven-io/emmett-testcontainers": "^0.5.0"
   },
   "peerDependencies": {
-    "@event-driven-io/emmett": "0.12.0",
+    "@event-driven-io/emmett": "0.12.1",
     "@types/pg": "^8.11.6",
     "@types/pg-format": "^1.0.5",
     "pg": "^8.12.0",

diff --git a/src/packages/emmett-postgresql/src/eventStore/schema/appendToStream.ts b/src/packages/emmett-postgresql/src/eventStore/schema/appendToStream.ts
@@ -1,7 +1,11 @@
 import {
   JSONParser,
+  NO_CONCURRENCY_CHECK,
+  STREAM_DOES_NOT_EXIST,
+  STREAM_EXISTS,
   type AppendToStreamOptions,
   type Event,
+  type ExpectedStreamVersion,
 } from '@event-driven-io/emmett';
 import pg from 'pg';
 import { v4 as uuid } from 'uuid';
@@ -125,7 +129,11 @@ export const appendToStream = (
         streamName,
         streamType,
         events,
-        options,
+        {
+          expectedStreamVersion: toExpectedVersion(
+            options?.expectedStreamVersion,
+          ),
+        },
       );
     } catch (error) {
       if (!isOptimisticConcurrencyError(error)) throw error;
@@ -162,6 +170,22 @@ export const appendToStream = (
     };
   });
 
+const toExpectedVersion = (
+  expected: ExpectedStreamVersion | undefined,
+): bigint | null => {
+  if (expected === undefined) return null;
+
+  if (expected === NO_CONCURRENCY_CHECK) return null;
+
+  // TODO: this needs to be fixed
+  if (expected == STREAM_DOES_NOT_EXIST) return null;
+
+  // TODO: this needs to be fixed
+  if (expected == STREAM_EXISTS) return null;
+
+  return expected as bigint;
+};
+
 const isOptimisticConcurrencyError = (error: unknown): boolean =>
   error instanceof Error && 'code' in error && error.code === '23505';
 
@@ -177,7 +201,8 @@ const appendEventsRaw = (
   streamId: string,
   streamType: string,
   events: Event[],
-  options?: AppendToStreamOptions & {
+  options?: {
+    expectedStreamVersion: bigint | null;
     partition?: string;
   },
 ): Promise<AppendEventSqlResult> =>

diff --git a/src/packages/emmett-testcontainers/package.json b/src/packages/emmett-testcontainers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett-testcontainers",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Emmett - TestContainers - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",
@@ -46,7 +46,7 @@
     "dist"
   ],
   "dependencies": {
-    "@event-driven-io/emmett": "0.12.0",
+    "@event-driven-io/emmett": "0.12.1",
     "testcontainers": "^10.7.2"
   },
   "devDependencies": {

diff --git a/src/packages/emmett/package.json b/src/packages/emmett/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@event-driven-io/emmett",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Emmett - Event Sourcing development made simple",
   "scripts": {
     "build": "tsup",