Revert deleting tenant name from schema (#152)

* MODCON-148. Revert deleting tenant name
folio-org · Apr 8, 2024 · 2c12f3b · 2c12f3b
1 parent 721e1aa
commit 2c12f3b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
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,6 +19,7 @@ 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,6 +310,7 @@ 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,6 +12,8 @@ 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,6 +643,7 @@ 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");