Updated exchange and routing key

Also updated Makefile and deployment file.

Makefile

@@ -61,3 +61,8 @@ develop:
 
 	@go run cmd/query-service/main.go
 
+docker:
+	make linux
+	@docker build -t query-service:latest .
+	@docker tag query-service:latest datastropheregistry.azurecr.io/query-service\:latest
+	@docker push datastropheregistry.azurecr.io/query-service\:latest
\ No newline at end of file

deployments/deployment.yml

@@ -38,5 +38,9 @@ spec:
           value: redis.redis.svc.cluster.local:6379
         - name: LOG_MESSAGES
           value: "true"
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
       imagePullSecrets:
       - name: docker-regcred
\ No newline at end of file

internal/drivers/brokerdriver/broker.go

@@ -37,8 +37,8 @@ func CreateAliceBroker(gateway brokeradapter.GatewayInterface) *Driver {
 
 // CreateConsumer creates an AliceConsumer on a certain exchange and queue
 func (d *Driver) CreateConsumer() Consumer {
-	exchangeID := "query-requests"
-	routingKey := "aql-user-request"
+	exchangeID := "requests-exchange"
+	routingKey := "aql-query-request"
 
 	// Declare the exchange we want to bind to
 	exchange, err := alice.CreateDefaultExchange(exchangeID, alice.Direct)

internal/usecases/consume/consume.go

 package consume
 
 import (
+	"os"
 	"query-service/internal/drivers/brokerdriver"
 	"query-service/internal/usecases/convertquery"
 	"query-service/internal/usecases/produce"
@@ -26,8 +27,13 @@ func NewService(broker brokerdriver.Broker, produceService produce.UseCase, conv
 	}
 }
 
+var podName string
+
 // Start starts consuming
 func (s *Service) Start() {
+
+	podName = os.Getenv("POD_NAME")
+
 	// Create consumer
 	consumer := s.broker.CreateConsumer()
 

internal/usecases/consume/handlemessage.go

@@ -37,6 +37,7 @@ func (s *Service) HandleMessage(msg *brokeradapter.Message) {
 	// Add type indicator to result from database
 	querymap := make(map[string]interface{})
 	querymap["type"] = "query_result"
+	querymap["pod"] = podName
 	querymap["values"] = *result
 	querybyte, err := json.Marshal(querymap)
 	//fmt.Println(querymap)