Merge pull request #90 from virtualidentityag/develop

Develop

services/tenantservice.yaml

@@ -26,6 +26,30 @@ paths:
                 $ref: '#/components/schemas/TenantDTO'
         400:
           description: BAD REQUEST - invalid/incomplete request or body object
+        401:
+          description: UNAUTHORIZED - no/invalid Keycloak token
+        500:
+          description: INTERNAL SERVER ERROR - server encountered unexpected condition
+    get:
+      tags:
+        - tenant-controller
+      summary: 'Get all tenants'
+      operationId: getAllTenants
+      responses:
+        200:
+          description: OK - successful operation
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/BasicTenantLicensingDTO'
+        204:
+          description: NO CONTENT - no content found
+        400:
+          description: BAD REQUEST - invalid/incomplete request or body object
+        401:
+          description: UNAUTHORIZED - no/invalid Keycloak token
         500:
           description: INTERNAL SERVER ERROR - server encountered unexpected condition
   /tenant/{id}:
@@ -51,10 +75,12 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/TenantDTO'
-        404:
-          description: Not found
         400:
           description: BAD REQUEST - invalid/incomplete request or body object
+        401:
+          description: UNAUTHORIZED - no/invalid Keycloak token
+        404:
+          description: Not found
         500:
           description: INTERNAL SERVER ERROR - server encountered unexpected condition
     put:
@@ -82,6 +108,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/TenantDTO'
+        401:
+          description: UNAUTHORIZED - no/invalid Keycloak token
         409:
           description: CONFLICT - unique constraint validation fails
         500:
@@ -114,6 +142,55 @@ paths:
           description: BAD REQUEST - invalid/incomplete request or body object
         500:
           description: INTERNAL SERVER ERROR - server encountered unexpected condition
+  /tenant/public/id/{tenantId}:
+    summary: 'Represents a publicly allowed tenant data'
+    description: This resource represents an individual tenant in a system.
+    get:
+      tags:
+        - tenant-controller
+      summary: 'Gets a tenant public information [Authorization: no-auth]'
+      operationId: getRestrictedTenantDataByTenantId
+      parameters:
+        - name: tenantId
+          in: path
+          description: Tenant ID
+          required: true
+          schema:
+            type: long
+      responses:
+        200:
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RestrictedTenantDTO'
+        404:
+          description: Not found
+        400:
+          description: BAD REQUEST - invalid/incomplete request or body object
+        500:
+          description: INTERNAL SERVER ERROR - server encountered unexpected condition
+  /tenant/public/single:
+    summary: 'Represents a publicly allowed tenant data'
+    description: This resource represents the tenant in a single-tenant system.
+    get:
+      tags:
+        - tenant-controller
+      summary: 'Gets a tenant public information [Authorization: no-auth]'
+      operationId: getRestrictedSingleTenantData
+      responses:
+        200:
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RestrictedTenantDTO'
+        404:
+          description: Not found
+        400:
+          description: BAD REQUEST - invalid/incomplete request or body object
+        500:
+          description: INTERNAL SERVER ERROR - server encountered unexpected condition
 components:
   schemas:
     TenantDTO:
@@ -129,7 +206,7 @@ components:
         name:
           type: string
           example: "Company name AG"
-          maxLength: 100
+          maxLength: 40
         subdomain:
           type: string
           example: "companyname"
@@ -146,6 +223,33 @@ components:
         content:
           $ref:
             '#/components/schemas/Content'
+        settings:
+          $ref:
+            '#/components/schemas/Settings'
+    BasicTenantLicensingDTO:
+      type: object
+      required:
+        - id
+        - name
+        - subdomain
+      properties:
+        id:
+          type: long
+          example: 12132
+        name:
+          type: string
+          example: "Company name AG"
+          maxLength: 40
+        subdomain:
+          type: string
+          example: "companyname"
+          maxLength: 100
+        createDate:
+          type: string
+        updateDate:
+          type: string
+        licensing:
+          $ref: '#/components/schemas/Licensing'
     RestrictedTenantDTO:
       type: object
       required:
@@ -158,13 +262,20 @@ components:
         name:
           type: string
           example: "Company name AG"
+          maxLength: 40
+        subdomain:
+          type: string
+          example: "subdomain"
           maxLength: 100
         theming:
           $ref:
             '#/components/schemas/Theming'
         content:
           $ref:
             '#/components/schemas/Content'
+        settings:
+          $ref:
+            '#/components/schemas/Settings'
     Licensing:
       type: object
       required:
@@ -199,3 +310,18 @@ components:
         claim:
           type: string
           example: "Llorem ipsum..."
+          maxLength: 40
+        privacy:
+          type: string
+          example: "Llorem ipsum..."
+        termsAndConditions:
+          type: string
+          example: "Llorem ipsum..."
+    Settings:
+      type: object
+      required:
+        - impressum
+      properties:
+        topicsInRegistrationEnabled:
+          type: boolean
+          example: "false"

src/main/java/de/caritas/cob/agencyservice/api/admin/service/agency/AgencyTopicEnrichmentService.java

@@ -1,5 +1,6 @@
 package de.caritas.cob.agencyservice.api.admin.service.agency;
 
+import com.google.common.collect.Maps;
 import de.caritas.cob.agencyservice.api.model.TopicDTO;
 import de.caritas.cob.agencyservice.api.repository.agency.Agency;
 import de.caritas.cob.agencyservice.api.repository.agencytopic.AgencyTopic;
@@ -26,7 +27,7 @@ public Agency enrichAgencyWithTopics(Agency agency) {
     var availableTopics = getAvailableTopicsMap();
     var agencyTopics = agency.getAgencyTopics();
     log.debug("Enriching agency with {} with information about the topics", agency.getId());
-    log.debug("Available topics list has size: {} ", agencyTopics.size());
+    log.debug("Available topics list has size: {} ", availableTopics.size());
     for (AgencyTopic agencyTopic : agencyTopics) {
       enrichSingleAgencyTopic(availableTopics, agencyTopic);
     }
@@ -47,12 +48,22 @@ private void enrichSingleAgencyTopic(Map<Long, TopicDTO> availableTopics,
 
   private Map<Long, TopicDTO> getAvailableTopicsMap() {
     var allTopics = topicService.getAllTopics();
+    return isEmptyOrNull(allTopics) ? Maps.newHashMap() : getAvailableTopicsMap(allTopics);
+  }
+
+  private Map<Long, TopicDTO> getAvailableTopicsMap(
+      List<de.caritas.cob.agencyservice.topicservice.generated.web.model.TopicDTO> allTopics) {
     return allTopics.stream()
         .collect(Collectors.toMap(
             de.caritas.cob.agencyservice.topicservice.generated.web.model.TopicDTO::getId,
             this::convertToAgencyServiceTopicViewDTO));
   }
 
+  private boolean isEmptyOrNull(
+      List<de.caritas.cob.agencyservice.topicservice.generated.web.model.TopicDTO> allTopics) {
+    return allTopics == null || allTopics.isEmpty();
+  }
+
   private TopicDTO convertToAgencyServiceTopicViewDTO(
       de.caritas.cob.agencyservice.topicservice.generated.web.model.TopicDTO source) {
     return new TopicDTO().id(source.getId())

src/main/java/de/caritas/cob/agencyservice/api/controller/AgencyController.java

@@ -32,6 +32,7 @@ public class AgencyController implements AgenciesApi {
    *
    * @param postcode       the postcode for regarding agencies
    * @param consultingType the type used to filter the agencies
+   * @param topicId        the (optional) main topicId to filter the agencies
    * @return the List of agencies with information
    */
   @Override

src/main/java/de/caritas/cob/agencyservice/api/service/AgencyService.java

@@ -13,8 +13,9 @@
 import de.caritas.cob.agencyservice.api.model.FullAgencyResponseDTO;
 import de.caritas.cob.agencyservice.api.repository.agency.Agency;
 import de.caritas.cob.agencyservice.api.repository.agency.AgencyRepository;
-import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.ExtendedConsultingTypeResponseDTO;
 import de.caritas.cob.agencyservice.api.tenant.TenantContext;
+import de.caritas.cob.agencyservice.consultingtypeservice.generated.web.model.ExtendedConsultingTypeResponseDTO;
+import de.caritas.cob.agencyservice.tenantservice.generated.web.model.RestrictedTenantDTO;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Collections;
@@ -36,10 +37,14 @@ public class AgencyService {
 
   private final @NonNull ConsultingTypeManager consultingTypeManager;
   private final @NonNull AgencyRepository agencyRepository;
+  private final @NonNull TenantService tenantService;
 
   @Value("${feature.topics.enabled}")
   private boolean topicsFeatureEnabled;
 
+  @Value("${multitenancy.enabled}")
+  private boolean multitenancy;
+
   /**
    * Returns a list of {@link AgencyResponseDTO} which match the provided agencyIds.
    *
@@ -125,8 +130,21 @@ private boolean isTopicFeatureEnabledAndActivatedInRegistration() {
   }
 
   private boolean isTopicFeatureActivatedInRegistration() {
-    // TODO get this flag from the tenant service,  implement within VIC-797
-    return true;
+    RestrictedTenantDTO restrictedTenantDTO = getRestrictedTenantData();
+    if (nonNull(restrictedTenantDTO) && nonNull(restrictedTenantDTO.getSettings())) {
+      return Boolean.TRUE.equals(
+          restrictedTenantDTO.getSettings().getTopicsInRegistrationEnabled());
+    }
+    return false;
+  }
+
+  private RestrictedTenantDTO getRestrictedTenantData() {
+    if (multitenancy) {
+      Long tenantId = TenantContext.getCurrentTenant();
+      return tenantService.getRestrictedTenantDataByTenantId(tenantId);
+    } else {
+      return tenantService.getRestrictedTenantDataForSingleTenant();
+    }
   }
 
   private void verifyConsultingTypeExists(int consultingTypeId)

src/main/java/de/caritas/cob/agencyservice/api/service/TenantService.java

@@ -5,6 +5,7 @@
 import de.caritas.cob.agencyservice.tenantservice.generated.web.model.RestrictedTenantDTO;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -14,10 +15,21 @@ public class TenantService {
 
   private final @NonNull TenantControllerApi tenantControllerApi;
 
+  @Value("${multitenancy.enabled}")
+  private boolean multitenancy;
+
   @Cacheable(cacheNames = CacheManagerConfig.TENANT_CACHE, key = "#subdomain")
   public RestrictedTenantDTO getRestrictedTenantDataBySubdomain(String subdomain) {
     return tenantControllerApi.getRestrictedTenantDataBySubdomainWithHttpInfo(subdomain).getBody();
   }
 
+  @Cacheable(cacheNames = CacheManagerConfig.TENANT_CACHE, key = "#tenantId")
+  public RestrictedTenantDTO getRestrictedTenantDataByTenantId(Long tenantId) {
+    return tenantControllerApi.getRestrictedTenantDataByTenantId(tenantId);
+  }
 
+  @Cacheable(cacheNames = CacheManagerConfig.TENANT_CACHE)
+  public RestrictedTenantDTO getRestrictedTenantDataForSingleTenant() {
+    return tenantControllerApi.getRestrictedSingleTenantData();
+  }
 }

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

@@ -43,6 +43,44 @@ void enrichAgencyWithTopics_Should_EnrichAgencyWithTopicDataFromTopicService() {
         .contains("first topic", "second topic");
   }
 
+
+  @Test
+  void enrichAgencyWithTopics_Should_NotEnrichIfNoTopicsAreDefined() {
+    // given
+    when(topicService.getAllTopics()).thenReturn(
+        newArrayList());
+    var agencyTopics = newArrayList(
+        createAgencyTopic(new Agency(), 1L), createAgencyTopic(new Agency(), 2L));
+
+    // when
+    var agency = newAgencyWithTopics(agencyTopics);
+    agencyTopicEnrichmentService.enrichAgencyWithTopics(agency);
+
+    // then
+    assertThat(agency.getAgencyTopics())
+        .extracting(agencyTopic -> agencyTopic.getTopicData().getName())
+        .containsOnlyNulls();
+  }
+
+
+  @Test
+  void enrichAgencyWithTopics_Should_NotEnrichIfTopicsListIsNull() {
+    // given
+    when(topicService.getAllTopics()).thenReturn(
+        null);
+    var agencyTopics = newArrayList(
+        createAgencyTopic(new Agency(), 1L), createAgencyTopic(new Agency(), 2L));
+
+    // when
+    var agency = newAgencyWithTopics(agencyTopics);
+    agencyTopicEnrichmentService.enrichAgencyWithTopics(agency);
+
+    // then
+    assertThat(agency.getAgencyTopics())
+        .extracting(agencyTopic -> agencyTopic.getTopicData().getName())
+        .containsOnlyNulls();
+  }
+
   @Test
   void enrichAgencyWithTopics_Should_NotEnrichWithTopicDataIfTopicIdDoNotMatch() {
     // given