Merge pull request Onlineberatung#488 from Onlineberatung/VIC-1461-fi…

…x-tenant-resolution-in-case-of-direct-consultant-link

fix: fixing no tenant set when attempt to retrieve consultant data

src/main/java/de/caritas/cob/userservice/api/tenant/MultitenancyWithSingleDomainTenantResolver.java

@@ -49,7 +49,10 @@ public Optional<Long> resolve(HttpServletRequest request) {
   }
 
   private Optional<Long> resolveTenantFromConsultantRequestParameter() {
+    // temporarily set technical tenant to be able to run query during tenant determination
+    TenantContext.setCurrentTenant(0L);
     Optional<Consultant> consultant = consultantService.getConsultant(getConsultantId());
+    TenantContext.clear();
     if (consultant.isPresent()) {
       return Optional.of(consultant.get().getTenantId());
     }

src/test/java/de/caritas/cob/userservice/api/tenant/MultitenancyWithSingleDomainTenantResolverTest.java

@@ -14,6 +14,7 @@
 import javax.servlet.http.HttpServletRequest;
 import org.jeasy.random.EasyRandom;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -42,6 +43,11 @@ class MultitenancyWithSingleDomainTenantResolverTest {
 
   @Mock private ServletRequestAttributes requestAttributes;
 
+  @BeforeEach
+  public void initialize() {
+    TenantContext.clear();
+  }
+
   @AfterEach
   public void tearDown() {
     resetRequestAttributes();
@@ -87,6 +93,7 @@ void resolve_Should_ResolveToEmpty_When_FeatureMultitenancyWithSingleDomainIsDis
     assertThat(multitenancyWithSingleDomainTenantResolver.canResolve(request)).isTrue();
     assertThat(multitenancyWithSingleDomainTenantResolver.resolve(request))
         .isEqualTo(Optional.of(ANOTHER_TENANT));
+    assertThat(TenantContext.getCurrentTenant()).isNull();
   }
 
   @Test
@@ -106,6 +113,7 @@ void resolve_Should_ResolveToEmpty_When_FeatureMultitenancyWithSingleDomainIsDis
     // when
     assertThat(multitenancyWithSingleDomainTenantResolver.canResolve(request)).isFalse();
     assertThat(multitenancyWithSingleDomainTenantResolver.resolve(request)).isEmpty();
+    assertThat(TenantContext.getCurrentTenant()).isNull();
   }
 
   @Test