From ce5e13f159ef8ba4a89b5c23e78a6683565dca25 Mon Sep 17 00:00:00 2001
From: flaminiaScarciofolo
 <113031535+flaminiaScarciofolo@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:04:15 +0100
Subject: [PATCH] [SELC-5887] Fix: added properties for eventhub in user-ms
 (#209)

---
 .../src/main/resources/application.properties             | 8 ++++++--
 apps/user-ms/src/main/docs/openapi.json                   | 6 ++++++
 apps/user-ms/src/main/docs/openapi.yaml                   | 4 ++++
 apps/user-ms/src/main/resources/application.properties    | 7 ++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/apps/user-group-cdc/src/main/resources/application.properties b/apps/user-group-cdc/src/main/resources/application.properties
index 1026d48b..97af4b93 100644
--- a/apps/user-group-cdc/src/main/resources/application.properties
+++ b/apps/user-group-cdc/src/main/resources/application.properties
@@ -16,6 +16,10 @@ user-group-cdc.retry.min-backoff=${USER_GROUP_CDC-RETRY-MIN-BACKOFF:10}
 user-group-cdc.retry.max-backoff=${USER_GROUP_CDC-RETRY-MAX-BACKOFF:12}
 user-group-cdc.retry=${USER_GROUP_CDC-RETRY:3}
 
-quarkus.rest-client.event-hub.url=${EVENT_HUB_BASE_PATH:test}
+quarkus.rest-client.event-hub.url=${EVENT_HUB_BASE_PATH:test}${EVENT_HUB_SC_USERS_TOPIC:sc-users}
 eventhub.rest-client.keyName=${SHARED_ACCESS_KEY_NAME:test}
-eventhub.rest-client.key=${EVENTHUB-SC-USER-GROUPS-SELFCARE-WO-KEY-LC:test}
\ No newline at end of file
+eventhub.rest-client.key=${EVENTHUB-SC-USERS-SELFCARE-WO-KEY-LC:test}
+
+quarkus.rest-client.event-hub-fd.url=${EVENT_HUB_BASE_PATH:test}${EVENT_HUB_SELFCARE_FD_TOPIC:selfcare-fd}
+eventhubfd.rest-client.keyName=${FD_SHARED_ACCESS_KEY_NAME:test}
+eventhubfd.rest-client.key=${EVENTHUB_SELFCARE_FD_EXTERNAL_KEY_LC:test}
\ No newline at end of file
diff --git a/apps/user-ms/src/main/docs/openapi.json b/apps/user-ms/src/main/docs/openapi.json
index 2f0cac92..29b611bd 100644
--- a/apps/user-ms/src/main/docs/openapi.json
+++ b/apps/user-ms/src/main/docs/openapi.json
@@ -1873,6 +1873,12 @@
           "productRole" : {
             "type" : "string"
           },
+          "roles" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
+          },
           "relationshipStatus" : {
             "$ref" : "#/components/schemas/OnboardedProductState"
           }
diff --git a/apps/user-ms/src/main/docs/openapi.yaml b/apps/user-ms/src/main/docs/openapi.yaml
index f4fa8e7c..e46ae2ea 100644
--- a/apps/user-ms/src/main/docs/openapi.yaml
+++ b/apps/user-ms/src/main/docs/openapi.yaml
@@ -1356,6 +1356,10 @@ components:
           type: string
         productRole:
           type: string
+        roles:
+          type: array
+          items:
+            type: string
         relationshipStatus:
           $ref: "#/components/schemas/OnboardedProductState"
     UsersNotificationResponse:
diff --git a/apps/user-ms/src/main/resources/application.properties b/apps/user-ms/src/main/resources/application.properties
index a6faba35..f646a7ac 100644
--- a/apps/user-ms/src/main/resources/application.properties
+++ b/apps/user-ms/src/main/resources/application.properties
@@ -17,9 +17,14 @@ quarkus.smallrye-openapi.info-title=User API
 quarkus.smallrye-openapi.info-version=1.0.0
 
 ## Eventhub ##
-quarkus.rest-client.event-hub.url=${EVENT_HUB_BASE_PATH:test}
+quarkus.rest-client.event-hub.url=${EVENT_HUB_BASE_PATH:test}${EVENT_HUB_SC_USERS_TOPIC:sc-users}
 eventhub.rest-client.keyName=${SHARED_ACCESS_KEY_NAME:test}
 eventhub.rest-client.key=${EVENTHUB-SC-USERS-SELFCARE-WO-KEY-LC:test}
+
+quarkus.rest-client.event-hub-fd.url=${EVENT_HUB_BASE_PATH:test}${EVENT_HUB_SELFCARE_FD_TOPIC:selfcare-fd}
+eventhubfd.rest-client.keyName=${FD_SHARED_ACCESS_KEY_NAME:test}
+eventhubfd.rest-client.key=${EVENTHUB_SELFCARE_FD_EXTERNAL_KEY_LC:test}
+
 user-ms.eventhub.users.enabled=${USER_MS_EVENTHUB_USERS_ENABLED:false}
 user-ms.eventhub.users.concurrency-level=${USER_MS_EVENTHUB_USERS_CONCURRENCY_LEVEL:1}
 user-ms.eventhub.users.page-size=${USER_MS_EVENTHUB_USERS_PAGE_SIZE:50}