fix etag bump

effect-ts-app · Oct 5, 2024 · bd2da9c · bd2da9c
1 parent 2fca2cf
commit bd2da9c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/.changeset/sour-bobcats-double.md b/.changeset/sour-bobcats-double.md
@@ -0,0 +1,6 @@
+---
+"@effect-app/infra-adapters": patch
+"@effect-app/infra": patch
+---
+
+fix
diff --git a/packages/infra-adapters/src/SQL/Model.ts b/packages/infra-adapters/src/SQL/Model.ts
@@ -719,9 +719,11 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${request[idCol
                   Effect.map(([, results]) => results as any)
                 ),
             orElse: () =>
-              sql`update ${sql(options.tableName)} set ${sql.update(request, [idColumn])} where ${sql(idColumn)} = ${
-                request[idColumn]
-              } and ${sql(versionColumn)} = ${request[versionColumn]} returning *`
+              sql`update ${sql(options.tableName)} set ${
+                sql.update({ ...request, [versionColumn]: randomUUID() }, [idColumn])
+              } where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${
+                request[versionColumn]
+              } returning *`
           })
         : (request) =>
           sql.onDialectOrElse({

diff --git a/packages/infra/src/services/QueueMaker/SQLQueue.ts b/packages/infra/src/services/QueueMaker/SQLQueue.ts
@@ -80,7 +80,7 @@ export function makeSQLQueue<
     const q = {
       offer: (body: Evt, meta: typeof QueueMeta.Type) =>
         Effect.gen(function*() {
-          yield* queueRepo.insert(
+          yield* queueRepo.insertVoid(
             Queue.insert.make({
               body,
               meta,
@@ -97,7 +97,7 @@ export function makeSQLQueue<
           if (first) {
             const dec = yield* decodeDrain(first)
             const { createdAt, updatedAt, ...rest } = dec
-            yield* drainRepo.update(
+            yield* drainRepo.updateVoid(
               Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }) // auto in lib , etag: randomUUID()
             )
             return dec
@@ -107,7 +107,7 @@ export function makeSQLQueue<
         }
       }),
       finish: ({ createdAt, updatedAt, ...q }: Drain) =>
-        drainRepo.update(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) })) // auto in lib , etag: randomUUID()
+        drainRepo.updateVoid(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) })) // auto in lib , etag: randomUUID()
     }
     const rcc = yield* RequestContextContainer