[MODCON-148] - removed tenantName from userTenant dto & change serial…

…ization inclusing from NON_EMPTY to NON_NULL (#151) * [MODCON-148] - removed tenantName from userTenant dto * [MODCON-148] - removed tenantName from userTenant dto
folio-org · Apr 5, 2024 · 721e1aa · 721e1aa
1 parent 8e335a3
commit 721e1aa
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/src/main/java/org/folio/consortia/config/AppConfig.java b/src/main/java/org/folio/consortia/config/AppConfig.java
@@ -13,6 +13,7 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -45,7 +46,8 @@ public ObjectMapper objectMapper() {
     final ObjectMapper objectMapper = new ObjectMapper();
     objectMapper.findAndRegisterModules()
       .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-      .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+      .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
+      .setSerializationInclusion(JsonInclude.Include.NON_NULL);
     return objectMapper;
   }
 

diff --git a/src/main/java/org/folio/consortia/domain/converter/UserTenantConverter.java b/src/main/java/org/folio/consortia/domain/converter/UserTenantConverter.java
@@ -19,7 +19,6 @@ public UserTenant convert(UserTenantEntity source) {
     userTenant.setIsPrimary(source.getIsPrimary());
     if (Objects.nonNull(source.getTenant())) {
       userTenant.setTenantId(source.getTenant().getId());
-      userTenant.setTenantName(source.getTenant().getName());
     }
     return userTenant;
   }

diff --git a/src/main/java/org/folio/consortia/service/impl/UserTenantServiceImpl.java b/src/main/java/org/folio/consortia/service/impl/UserTenantServiceImpl.java
@@ -310,7 +310,6 @@ private UserTenantEntity toEntity(UserTenant userTenantDto, UUID consortiumId, U
     UserTenantEntity entity = new UserTenantEntity();
     TenantEntity tenant = new TenantEntity();
     tenant.setId(userTenantDto.getTenantId());
-    tenant.setName(userTenantDto.getTenantName());
     tenant.setConsortiumId(consortiumId);
 
     if (Objects.nonNull(userTenantDto.getId())) {

diff --git a/src/main/resources/swagger.api/schemas/userTenant.yaml b/src/main/resources/swagger.api/schemas/userTenant.yaml
@@ -12,8 +12,6 @@ UserTenant:
       type: string
     tenantId:
       type: string
-    tenantName:
-      type: string
     isPrimary:
       type: boolean
     centralTenantId:

diff --git a/src/test/java/org/folio/consortia/service/UserTenantServiceTest.java b/src/test/java/org/folio/consortia/service/UserTenantServiceTest.java
@@ -643,7 +643,6 @@ private ConsortiumEntity createConsortiumEntity() {
   private UserTenant createUserTenantDtoEntity() {
     UserTenant tenant = new UserTenant();
     tenant.setTenantId("diku");
-    tenant.setTenantName("diku");
     tenant.setUserId(UUID.randomUUID());
     tenant.setId(UUID.randomUUID());
     tenant.setUsername("Test");