feat: CARITAS-286

* fix current tests

src/test/java/de/caritas/cob/agencyservice/api/admin/service/agency/AgencyAdminSearchServiceIT.java

@@ -5,6 +5,7 @@
 
 import com.google.common.collect.Lists;
 import de.caritas.cob.agencyservice.AgencyServiceApplication;
+import de.caritas.cob.agencyservice.api.service.TopicEnrichmentService;
 import de.caritas.cob.agencyservice.api.util.AuthenticatedUser;
 import de.caritas.cob.agencyservice.api.model.Sort;
 import de.caritas.cob.agencyservice.api.model.Sort.FieldEnum;
@@ -38,6 +39,9 @@ class AgencyAdminSearchServiceIT {
   @Autowired
   private AgencyAdminSearchService agencyAdminSearchService;
 
+  @MockBean
+  private TopicEnrichmentService topicEnrichmentService;
+
   @MockBean
   private AuthenticatedUser authenticatedUser;
 
@@ -160,4 +164,4 @@ private AdminAgencyResponseDTO getAdminAgencies(Long... agencyIds) {
   }
 
 
-}
+}

src/test/java/de/caritas/cob/agencyservice/api/admin/service/agency/AgencyAdminSearchTenantSupportServiceTest.java

@@ -2,6 +2,7 @@
 
 import com.google.common.collect.Lists;
 import de.caritas.cob.agencyservice.AgencyServiceApplication;
+import de.caritas.cob.agencyservice.api.service.TopicEnrichmentService;
 import de.caritas.cob.agencyservice.api.util.AuthenticatedUser;
 import de.caritas.cob.agencyservice.api.model.Sort;
 import de.caritas.cob.agencyservice.api.service.securityheader.SecurityHeaderSupplier;
@@ -34,6 +35,9 @@ class AgencyAdminSearchTenantSupportServiceTest {
   @Autowired
   private AgencyAdminSearchTenantSupportService agencyAdminSearchTenantSupportService;
 
+  @MockBean
+  private TopicEnrichmentService topicEnrichmentService;
+
   @MockBean
   private AuthenticatedUser authenticatedUser;
 

src/test/java/de/caritas/cob/agencyservice/api/controller/ActuatorControllerIT.java

@@ -1,11 +1,13 @@
 package de.caritas.cob.agencyservice.api.controller;
 
 import de.caritas.cob.agencyservice.AgencyServiceApplication;
+import de.caritas.cob.agencyservice.api.service.TopicEnrichmentService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
@@ -25,6 +27,9 @@ class ActuatorControllerIT {
 
   @Autowired private WebApplicationContext context;
 
+  @MockBean
+  private TopicEnrichmentService topicEnrichmentService;
+
   private MockMvc mockMvc;
 
   @BeforeEach

src/test/java/de/caritas/cob/agencyservice/api/controller/AgencyAdminControllerIT.java

@@ -3,7 +3,6 @@
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.when;
 import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
@@ -18,6 +17,7 @@
 import de.caritas.cob.agencyservice.api.model.DataProtectionContactDTO;
 import de.caritas.cob.agencyservice.api.model.DataProtectionDTO;
 import de.caritas.cob.agencyservice.api.service.TenantService;
+import de.caritas.cob.agencyservice.api.service.TopicEnrichmentService;
 import de.caritas.cob.agencyservice.api.util.AuthenticatedUser;
 import de.caritas.cob.agencyservice.api.manager.consultingtype.ConsultingTypeManager;
 import de.caritas.cob.agencyservice.api.model.AgencyDTO;
@@ -40,7 +40,6 @@
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.WebApplicationContext;
@@ -60,6 +59,9 @@ class AgencyAdminControllerIT {
   @MockBean
   private ConsultingTypeManager consultingTypeManager;
 
+  @MockBean
+  private TopicEnrichmentService topicEnrichmentService;
+
   @Autowired
   private WebApplicationContext context;
 

src/test/java/de/caritas/cob/agencyservice/api/controller/AgencyAdminControllerWithDemographicsIT.java

@@ -13,6 +13,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import de.caritas.cob.agencyservice.api.service.TenantService;
+import de.caritas.cob.agencyservice.api.service.TopicEnrichmentService;
 import de.caritas.cob.agencyservice.api.util.AuthenticatedUser;
 import de.caritas.cob.agencyservice.api.manager.consultingtype.ConsultingTypeManager;
 import de.caritas.cob.agencyservice.api.model.AgencyDTO;
@@ -54,6 +55,9 @@ class AgencyAdminControllerWithDemographicsIT {
   @MockBean
   private ConsultingTypeManager consultingTypeManager;
 
+  @MockBean
+  private TopicEnrichmentService topicEnrichmentService;
+
   @Autowired
   private WebApplicationContext context;
 

src/test/java/de/caritas/cob/agencyservice/api/controller/AgencyControllerIT.java

@@ -12,11 +12,9 @@
 import static de.caritas.cob.agencyservice.testHelper.TestConstants.VALID_AGE_QUERY;
 import static de.caritas.cob.agencyservice.testHelper.TestConstants.VALID_CONSULTING_TYPE_QUERY;
 import static de.caritas.cob.agencyservice.testHelper.TestConstants.VALID_POSTCODE_QUERY;
-import static org.apache.commons.lang3.exception.ExceptionUtils.getStackTrace;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -28,6 +26,7 @@
 import de.caritas.cob.agencyservice.api.model.FullAgencyResponseDTO;
 import de.caritas.cob.agencyservice.api.service.AgencyService;
 import de.caritas.cob.agencyservice.api.service.LogService;
+import de.caritas.cob.agencyservice.api.service.TopicEnrichmentService;
 import de.caritas.cob.agencyservice.config.security.AuthorisationService;
 import de.caritas.cob.agencyservice.config.security.JwtAuthConverter;
 import de.caritas.cob.agencyservice.config.security.JwtAuthConverterProperties;
@@ -56,6 +55,9 @@ class AgencyControllerIT {
   @Autowired
   private MockMvc mvc;
 
+  @MockBean
+  private TopicEnrichmentService topicEnrichmentService;
+
   @MockBean
   private AgencyService agencyService;
 

src/test/java/de/caritas/cob/agencyservice/api/controller/AgencyControllerWithDemographicsIT.java

@@ -15,6 +15,7 @@
 import de.caritas.cob.agencyservice.api.exception.MissingConsultingTypeException;
 import de.caritas.cob.agencyservice.api.manager.consultingtype.ConsultingTypeManager;
 
+import de.caritas.cob.agencyservice.api.service.TopicEnrichmentService;
 import de.caritas.cob.agencyservice.api.tenant.TenantContext;
 
 import jakarta.transaction.Transactional;
@@ -28,7 +29,6 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
@@ -54,6 +54,9 @@ public void setup() {
   @MockBean
   private ConsultingTypeManager consultingTypeManager;
 
+  @MockBean
+  private TopicEnrichmentService topicEnrichmentService;
+
   @Autowired
   private WebApplicationContext context;
 

src/test/java/de/caritas/cob/agencyservice/api/controller/AgencyControllerWithSingleDomainMultitenancyIT.java

@@ -2,8 +2,6 @@
 
 import static de.caritas.cob.agencyservice.testHelper.PathConstants.PATH_GET_AGENCIES_WITH_IDS;
 import static de.caritas.cob.agencyservice.testHelper.PathConstants.PATH_GET_LIST_OF_AGENCIES;
-import static de.caritas.cob.agencyservice.testHelper.TestConstants.VALID_AGE_QUERY;
-import static de.caritas.cob.agencyservice.testHelper.TestConstants.VALID_GENDER_QUERY;
 import static org.hamcrest.Matchers.hasSize;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.when;
@@ -14,6 +12,7 @@
 
 import de.caritas.cob.agencyservice.api.exception.MissingConsultingTypeException;
 import de.caritas.cob.agencyservice.api.manager.consultingtype.ConsultingTypeManager;
+import de.caritas.cob.agencyservice.api.service.TopicEnrichmentService;
 import de.caritas.cob.agencyservice.api.tenant.TenantContext;
 import de.caritas.cob.agencyservice.applicationsettingsservice.generated.ApiClient;
 import de.caritas.cob.agencyservice.applicationsettingsservice.generated.web.model.ApplicationSettingsDTO;
@@ -32,7 +31,6 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +61,9 @@ public void setup() {
   @MockBean
   private ConsultingTypeManager consultingTypeManager;
 
+  @MockBean
+  private TopicEnrichmentService topicEnrichmentService;
+
   @MockBean
   private ApplicationSettingsApiControllerFactory applicationSettingsApiControllerFactory;
   @MockBean

src/test/java/de/caritas/cob/agencyservice/api/service/CentralDataProtectionTemplateServiceTest.java

@@ -38,6 +38,9 @@ class CentralDataProtectionTemplateServiceTest {
   @Autowired
   CentralDataProtectionTemplateService centralDataProtectionTemplateService;
 
+  @MockBean
+  private TopicEnrichmentService topicEnrichmentService;
+
   @MockBean
   TenantService tenantService;
 
@@ -313,4 +316,4 @@ private AgencyContextDTO getAgencyContext() {
   }
 
 
-}
+}