From 6f44f892605d930a5b61d29dec11d5042f984749 Mon Sep 17 00:00:00 2001
From: Patrick Roza <contact@patrickroza.com>
Date: Sun, 12 Nov 2023 11:59:14 +0100
Subject: [PATCH] improve queue constructor

---
 .changeset/metal-buckets-dance.md                   | 5 +++++
 packages/infra/_src/services/QueueMaker/memQueue.ts | 4 ++--
 packages/infra/_src/services/QueueMaker/sbqueue.ts  | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/metal-buckets-dance.md

diff --git a/.changeset/metal-buckets-dance.md b/.changeset/metal-buckets-dance.md
new file mode 100644
index 000000000..82e5bc133
--- /dev/null
+++ 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
index b4855b220..986acedf5 100644
--- 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
index 7ae618603..90fc4428a 100644
--- 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"