improve queue constructor

effect-ts-app · Nov 12, 2023 · 6f44f89 · 6f44f89
1 parent 3eeae96
commit 6f44f89
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/metal-buckets-dance.md b/.changeset/metal-buckets-dance.md
@@ -0,0 +1,5 @@
+---
+"@effect-app/infra": minor
+---
+
+improve queue constructor
diff --git a/packages/infra/_src/services/QueueMaker/memQueue.ts b/packages/infra/_src/services/QueueMaker/memQueue.ts
@@ -18,7 +18,7 @@ export function makeMemQueue<
 >(
   queueName: string,
   queueDrainName: string,
-  encoder: (e: { body: Evt; meta: RequestContext }) => EvtE,
+  encoder: (e: Evt) => EvtE,
   makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>,
   parseDrain: (
     a: unknown,
@@ -41,7 +41,7 @@ export function makeMemQueue<
                 // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
                 Effect(
                   JSON.stringify(
-                    encoder({ body: m, meta: requestContext })
+                    { body: encoder(m), meta: RequestContext.Encoder(requestContext) }
                   )
                 )
                   // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))

diff --git a/packages/infra/_src/services/QueueMaker/sbqueue.ts b/packages/infra/_src/services/QueueMaker/sbqueue.ts
@@ -27,7 +27,7 @@ export function makeServiceBusQueue<
 >(
   _queueName: string,
   queueDrainName: string,
-  encoder: (e: { body: Evt; meta: RequestContext }) => EvtE,
+  encoder: (e: Evt) => EvtE,
   makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>,
   parseDrain: (
     a: unknown,
@@ -87,7 +87,7 @@ export function makeServiceBusQueue<
                 s.sendMessages(
                   messages.map((x) => ({
                     body: JSON.stringify(
-                      encoder({ body: x, meta: requestContext })
+                      { body: encoder(x), meta: RequestContext.Encoder(requestContext) }
                     ),
                     messageId: x.id, /* correllationid: requestId */
                     contentType: "application/json"