From 9ef1833073ff46cc31016fdd865e3d942d6c13c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=97=D0=B0=D0=B8=D0=B4=20=D0=9E=D0=BC=D0=B0=D1=80=20?=
 =?UTF-8?q?=D0=9C=D0=B5=D0=B4=D1=85=D0=B0=D1=82=20=7C=20Zaid=20Omar=20Medh?=
 =?UTF-8?q?at?= <omar.m.zaid@hotmail.com>
Date: Tue, 16 Dec 2025 18:21:40 +0500
Subject: [PATCH] f

---
 .../pkg/infrastructure/rabbitmq/rabbitmq.go   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/internal/pkg/infrastructure/rabbitmq/rabbitmq.go b/internal/pkg/infrastructure/rabbitmq/rabbitmq.go
index 447c0ef..f73fa2c 100644
--- a/internal/pkg/infrastructure/rabbitmq/rabbitmq.go
+++ b/internal/pkg/infrastructure/rabbitmq/rabbitmq.go
@@ -31,10 +31,25 @@ type RabbitMQClient struct {
 type MessageHandler func([]byte) error
 
 func NewRabbitMQClient() (*RabbitMQClient, error) {
-	// Get RabbitMQ URL from environment or use default
 	rabbitmqURL := os.Getenv("RABBITMQ_URL")
 	if rabbitmqURL == "" {
-		rabbitmqURL = "amqp://guest:guest@localhost:5672/"
+		host := os.Getenv("RABBITMQ_HOST")
+		if host == "" {
+			host = "localhost"
+		}
+		port := os.Getenv("RABBITMQ_PORT")
+		if port == "" {
+			port = "5672"
+		}
+		user := os.Getenv("RABBITMQ_USER")
+		if user == "" {
+			user = "guest"
+		}
+		password := os.Getenv("RABBITMQ_PASSWORD")
+		if password == "" {
+			password = "guest"
+		}
+		rabbitmqURL = fmt.Sprintf("amqp://%s:%s@%s:%s/", user, password, host, port)
 	}
 
 	// Connect to RabbitMQ with retry logic