From 2d83023825d88bb8561b4ab2162326d2f8b80a7b Mon Sep 17 00:00:00 2001
From: PhilippFruh <philipp.fruh@pm.me>
Date: Wed, 7 Sep 2022 17:33:58 +0200
Subject: [PATCH] fix: user role and topic id resolver

---
 .../userservice/api/helper/RegistrationStatisticsHelper.java | 5 ++++-
 .../statistics/event/RegistrationStatisticsEvent.java        | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/caritas/cob/userservice/api/helper/RegistrationStatisticsHelper.java b/src/main/java/de/caritas/cob/userservice/api/helper/RegistrationStatisticsHelper.java
index f72578233..d465a2856 100644
--- a/src/main/java/de/caritas/cob/userservice/api/helper/RegistrationStatisticsHelper.java
+++ b/src/main/java/de/caritas/cob/userservice/api/helper/RegistrationStatisticsHelper.java
@@ -1,5 +1,6 @@
 package de.caritas.cob.userservice.api.helper;
 
+import de.caritas.cob.userservice.api.service.consultingtype.TopicService;
 import de.caritas.cob.userservice.topicservice.generated.web.model.TopicDTO;
 import java.util.Collection;
 import java.util.List;
@@ -15,7 +16,8 @@
 @Slf4j
 @Component
 public class RegistrationStatisticsHelper {
-  private @NonNull Map<Long, TopicDTO> allTopicsMap;
+
+  private final @NonNull TopicService topicService;
 
   public List<String> findTopicsInternalAttributes(Collection<Integer> topicsList) {
     return topicsList.stream().map(this::findTopicInternalIdentifier).collect(Collectors.toList());
@@ -26,6 +28,7 @@ public String findTopicInternalIdentifier(Integer topicId) {
   }
 
   private Optional<String> findTopicInternalIdentifierInTopicsMap(Integer topicId) {
+    Map<Long, TopicDTO> allTopicsMap = topicService.getAllTopicsMap();
     Long key = Long.valueOf(topicId);
     if (allTopicsMap.containsKey(key)) {
       return Optional.ofNullable(allTopicsMap.get(key).getInternalIdentifier());
diff --git a/src/main/java/de/caritas/cob/userservice/api/service/statistics/event/RegistrationStatisticsEvent.java b/src/main/java/de/caritas/cob/userservice/api/service/statistics/event/RegistrationStatisticsEvent.java
index 71b87f022..422e9de91 100644
--- a/src/main/java/de/caritas/cob/userservice/api/service/statistics/event/RegistrationStatisticsEvent.java
+++ b/src/main/java/de/caritas/cob/userservice/api/service/statistics/event/RegistrationStatisticsEvent.java
@@ -13,6 +13,7 @@
 import de.caritas.cob.userservice.api.model.User;
 import de.caritas.cob.userservice.statisticsservice.generated.web.model.EventType;
 import de.caritas.cob.userservice.statisticsservice.generated.web.model.RegistrationStatisticsEventMessage;
+import de.caritas.cob.userservice.statisticsservice.generated.web.model.UserRole;
 import java.time.OffsetDateTime;
 import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
@@ -59,6 +60,7 @@ public Optional<String> getPayload() {
             .eventType(EVENT_TYPE)
             .sessionId(sessionId)
             .userId(createdUser.getUserId())
+            .userRole(UserRole.ASKER)
             .registrationDate(toIsoTime(createdUser.getCreateDate()))
             .age(registeredUser.getUserAge())
             .gender(registeredUser.getUserGender())