From c485d37b6b0979f1c3db744e19aa2764449f69ff Mon Sep 17 00:00:00 2001
From: HaimKortovich <haimkortovich88@gmail.com>
Date: Thu, 16 Apr 2026 14:55:34 -0500
Subject: [PATCH] fix exchanges

---
 lib/policy_service/consumers/policy_issued.ex |  3 +-
 .../consumers/quote_received.ex               |  4 +--
 ops/chart/values.yaml                         | 28 +++++++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/lib/policy_service/consumers/policy_issued.ex b/lib/policy_service/consumers/policy_issued.ex
index 5dc3f45..08b55fd 100644
--- a/lib/policy_service/consumers/policy_issued.ex
+++ b/lib/policy_service/consumers/policy_issued.ex
@@ -6,7 +6,7 @@ defmodule PolicyService.Consumers.PolicyIssuedConsumer do
   alias PolicyService.Commands.CarPolicy
   alias PolicyService.Aggregates.PolicyId
 
-  @exchange "carrier_inbox.events"
+  @exchange "policy_service.events.policy_issued"
   @queue "policy_service.policy_issued"
   @routing_key "policy.issued"
 
@@ -16,7 +16,6 @@ defmodule PolicyService.Consumers.PolicyIssuedConsumer do
     {:ok, conn} = AMQP.Connection.open(amqp_url())
     {:ok, channel} = AMQP.Channel.open(conn)
 
-    AMQP.Exchange.topic(channel, @exchange, durable: true)
     AMQP.Queue.declare(channel, @queue, durable: true)
     AMQP.Queue.bind(channel, @queue, @exchange, routing_key: @routing_key)
     AMQP.Basic.qos(channel, prefetch_count: 10)
diff --git a/lib/policy_service/consumers/quote_received.ex b/lib/policy_service/consumers/quote_received.ex
index 8b23804..d16fdfb 100644
--- a/lib/policy_service/consumers/quote_received.ex
+++ b/lib/policy_service/consumers/quote_received.ex
@@ -7,7 +7,7 @@ defmodule PolicyService.Consumers.QuoteReceivedConsumer do
   alias PolicyService.Commands.CarPolicy
   alias PolicyService.Aggregates.PolicyId
 
-  @exchange "carrier_inbox.events"
+  @exchange "policy_service.events.quote_received"
   @queue "policy_service.quote_received"
   @routing_key "quote.received"
 
@@ -21,8 +21,6 @@ defmodule PolicyService.Consumers.QuoteReceivedConsumer do
     {:ok, conn} = AMQP.Connection.open(amqp_url)
     {:ok, channel} = AMQP.Channel.open(conn)
 
-    AMQP.Exchange.declare(channel, @exchange, :topic, durable: true)
-
     AMQP.Queue.declare(channel, @queue, durable: true)
     AMQP.Queue.bind(channel, @queue, @exchange, routing_key: @routing_key)
 
diff --git a/ops/chart/values.yaml b/ops/chart/values.yaml
index c5f2aef..949ecb8 100644
--- a/ops/chart/values.yaml
+++ b/ops/chart/values.yaml
@@ -138,6 +138,34 @@ rawResources:
           configure: ".*"
           read: ".*"
 
+  exchange-quote-received:
+    enabled: true
+    apiVersion: rabbitmq.com/v1beta1
+    kind: Exchange
+    suffix: exchange-quote-received
+    spec:
+      spec:
+        name: policy_service.events.quote_received
+        type: topic
+        durable: true
+        rabbitmqClusterReference:
+          name: rabbitmq
+          namespace: rabbitmq
+
+  exchange-policy-issued:
+    enabled: true
+    apiVersion: rabbitmq.com/v1beta1
+    kind: Exchange
+    suffix: exchange-policy-issued
+    spec:
+      spec:
+        name: policy_service.events.policy_issued
+        type: topic
+        durable: true
+        rabbitmqClusterReference:
+          name: rabbitmq
+          namespace: rabbitmq
+
   password-generator:
     enabled: true
     apiVersion: generators.external-secrets.io/v1alpha1