Merge pull request #134 from virtualidentityag/develop

merge to staging
virtualidentityag · Mar 21, 2024 · eec65dd · eec65dd
2 parents 0624ed0 + eb38008
commit eec65dd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/...caritas/cob/agencyservice/api/admin/service/agency/AgencyAdminFullResponseDTOBuilder.java b/...caritas/cob/agencyservice/api/admin/service/agency/AgencyAdminFullResponseDTOBuilder.java
@@ -86,7 +86,16 @@ private List<TopicDTO> getTopics() {
   }
 
   private List<TopicDTO> getTopics(List<AgencyTopic> agencyTopics) {
-    return agencyTopics.stream().map(AgencyTopic::getTopicData).toList();
+    return agencyTopics.stream().map(agencyTopic -> createTopicDTO(agencyTopic)).toList();
+  }
+
+  private TopicDTO createTopicDTO(AgencyTopic agencyTopic) {
+    return new TopicDTO().id(agencyTopic.getTopicId())
+        .name(agencyTopic.getTopicData().getName())
+        .description(agencyTopic.getTopicData().getDescription())
+        .status(agencyTopic.getTopicData().getStatus())
+        .internalIdentifier(agencyTopic.getTopicData().getInternalIdentifier());
+
   }
 
   private AgencyLinks createAgencyLinks() {

diff --git a/src/main/java/de/caritas/cob/agencyservice/api/service/TopicService.java b/src/main/java/de/caritas/cob/agencyservice/api/service/TopicService.java
@@ -20,7 +20,6 @@ public class TopicService {
   private final @NonNull SecurityHeaderSupplier securityHeaderSupplier;
   private final @NonNull TenantHeaderSupplier tenantHeaderSupplier;
 
-  @Cacheable(cacheNames = CacheManagerConfig.TOPICS_CACHE)
   public List<TopicDTO> getAllTopics() {
     TopicControllerApi controllerApi = topicServiceApiControllerFactory.createControllerApi();
     addDefaultHeaders(controllerApi.getApiClient());

diff --git a/...tas/cob/agencyservice/api/admin/service/agency/AgencyAdminFullResponseDTOBuilderTest.java b/...tas/cob/agencyservice/api/admin/service/agency/AgencyAdminFullResponseDTOBuilderTest.java
@@ -5,16 +5,20 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.google.common.collect.Lists;
 import de.caritas.cob.agencyservice.api.model.AgencyAdminFullResponseDTO;
 import de.caritas.cob.agencyservice.api.model.AgencyAdminResponseDTO;
 import de.caritas.cob.agencyservice.api.model.AgencyDTO;
 import de.caritas.cob.agencyservice.api.model.AgencyLinks;
 import de.caritas.cob.agencyservice.api.model.DataProtectionContactDTO;
 import de.caritas.cob.agencyservice.api.model.HalLink.MethodEnum;
+import de.caritas.cob.agencyservice.api.model.TopicDTO;
 import de.caritas.cob.agencyservice.api.repository.agency.Agency;
 import de.caritas.cob.agencyservice.api.repository.agency.DataProtectionResponsibleEntity;
 import de.caritas.cob.agencyservice.api.repository.agency.Gender;
+import de.caritas.cob.agencyservice.api.repository.agencytopic.AgencyTopic;
 import de.caritas.cob.agencyservice.api.util.JsonConverter;
+import org.assertj.core.groups.Tuple;
 import org.jeasy.random.EasyRandom;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,6 +37,7 @@ public void init() {
     this.agency.setDataProtectionAgencyResponsibleContactData(JsonConverter.convertToJson(new DataProtectionContactDTO()));
     this.agency.setDataProtectionOfficerContactData(JsonConverter.convertToJson(new DataProtectionContactDTO()));
     this.agency.setDataProtectionAlternativeContactData(JsonConverter.convertToJson(new DataProtectionContactDTO()));
+    this.agency.setAgencyTopics(Lists.newArrayList(AgencyTopic.builder().topicId(1L).topicData(new TopicDTO().id(1L).name("topic name")).build()));
     this.agency.setTenantId(TENANT_ID);
     this.agencyAdminFullResponseDTOBuilder = new AgencyAdminFullResponseDTOBuilder(agency);
     this.agency.setCounsellingRelations(AgencyDTO.CounsellingRelationsEnum.PARENTAL_COUNSELLING.getValue() + "," + AgencyDTO.CounsellingRelationsEnum.RELATIVE_COUNSELLING.getValue());
@@ -62,6 +67,8 @@ private void assertBaseDTOAttributesAreMapped(AgencyAdminFullResponseDTO result)
     assertEquals(String.valueOf(agency.getCreateDate()), result.getEmbedded().getCreateDate());
     assertEquals(String.valueOf(agency.getUpdateDate()), result.getEmbedded().getUpdateDate());
     assertEquals(String.valueOf(agency.getDeleteDate()), result.getEmbedded().getDeleteDate());
+    assertThat(result.getEmbedded().getTopics()).extracting("id", "name").containsExactly(
+        Tuple.tuple(1L, "topic name"));
   }
 
   @Test