[RABB-911] Always display contract identifiers in tenant logbook

api/api-iam/iam-internal/src/main/java/fr/gouv/vitamui/iam/internal/server/tenant/converter/TenantConverter.java

@@ -83,23 +83,10 @@ public class TenantConverter implements Converter<TenantDto, Tenant> {
         logbookData.put(ENABLED_KEY, LogbookUtils.getValue(tenant.getEnabled()));
         Optional<Owner> owner = ownerRepository.findById(tenant.getOwnerId());
         owner.ifPresent(o -> logbookData.put(OWNER_ID_KEY, o.getIdentifier()));
-        final String accessContractHoldingIdentifier = tenant.getAccessContractHoldingIdentifier();
-        if (StringUtils.isNotBlank(accessContractHoldingIdentifier)) {
-            logbookData.put(ACCESS_CONTRACT_HOLDING_IDENTIFIER_KEY, accessContractHoldingIdentifier);
-        }
-        final String accessContractLogbookIdentifier = tenant.getAccessContractLogbookIdentifier();
-        if (StringUtils.isNotBlank(accessContractLogbookIdentifier)) {
-            logbookData.put(ACCESS_CONTRACT_LOGBOOK_IDENTIFIER_KEY, accessContractLogbookIdentifier);
-        }
-        final String ingestContractHoldingIdentifier = tenant.getIngestContractHoldingIdentifier();
-        if (StringUtils.isNotBlank(ingestContractHoldingIdentifier)) {
-            logbookData.put(INGEST_CONTRACT_HOLDING_IDENTIFIER_KEY, ingestContractHoldingIdentifier);
-        }
-
-        final String itemIngestContractIdentifier = tenant.getItemIngestContractIdentifier();
-        if (StringUtils.isNotBlank(itemIngestContractIdentifier)) {
-            logbookData.put(ITEM_INGEST_CONTRACT_IDENTIFIER_KEY, itemIngestContractIdentifier);
-        }
+        logbookData.put(ACCESS_CONTRACT_HOLDING_IDENTIFIER_KEY, LogbookUtils.getValue(tenant.getAccessContractHoldingIdentifier()));
+        logbookData.put(ACCESS_CONTRACT_LOGBOOK_IDENTIFIER_KEY, LogbookUtils.getValue(tenant.getAccessContractLogbookIdentifier()));
+        logbookData.put(INGEST_CONTRACT_HOLDING_IDENTIFIER_KEY, LogbookUtils.getValue(tenant.getIngestContractHoldingIdentifier()));
+        logbookData.put(ITEM_INGEST_CONTRACT_IDENTIFIER_KEY, LogbookUtils.getValue(tenant.getItemIngestContractIdentifier()));
 
         return ApiUtils.toJson(logbookData);
     }

api/api-iam/iam-internal/src/test/java/fr/gouv/vitamui/iam/internal/server/tenant/converter/TenantConverterTest.java

@@ -13,6 +13,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import fr.gouv.vitam.common.exception.InvalidParseOperationException;
 import fr.gouv.vitam.common.json.JsonHandler;
 import fr.gouv.vitamui.commons.api.domain.TenantDto;
+import fr.gouv.vitamui.commons.logbook.util.LogbookUtils;
 import fr.gouv.vitamui.iam.commons.utils.IamDtoBuilder;
 import fr.gouv.vitamui.iam.internal.server.owner.dao.OwnerRepository;
 import fr.gouv.vitamui.iam.internal.server.owner.domain.Owner;
@@ -68,17 +69,22 @@ public class TenantConverterTest {
         tenantDto.setAccessContractHoldingIdentifier(null);
         json = tenantConverter.convertToLogbook(tenantDto);
         jsonNode = JsonHandler.getFromString(json);
-        assertThat(jsonNode.get(TenantConverter.ACCESS_CONTRACT_HOLDING_IDENTIFIER_KEY)).isNull();
+        assertThat(jsonNode.get(TenantConverter.ACCESS_CONTRACT_HOLDING_IDENTIFIER_KEY)).isNotNull();
 
         tenantDto.setAccessContractLogbookIdentifier(null);;
         json = tenantConverter.convertToLogbook(tenantDto);
         jsonNode = JsonHandler.getFromString(json);
-        assertThat(jsonNode.get(TenantConverter.ACCESS_CONTRACT_LOGBOOK_IDENTIFIER_KEY)).isNull();
+        assertThat(jsonNode.get(TenantConverter.ACCESS_CONTRACT_LOGBOOK_IDENTIFIER_KEY)).isNotNull();
 
         tenantDto.setIngestContractHoldingIdentifier(null);
         json = tenantConverter.convertToLogbook(tenantDto);
         jsonNode = JsonHandler.getFromString(json);
-        assertThat(jsonNode.get(TenantConverter.INGEST_CONTRACT_HOLDING_IDENTIFIER_KEY)).isNull();
+        assertThat(jsonNode.get(TenantConverter.INGEST_CONTRACT_HOLDING_IDENTIFIER_KEY)).isNotNull();
+
+        tenantDto.setItemIngestContractIdentifier(null);
+        json = tenantConverter.convertToLogbook(tenantDto);
+        jsonNode = JsonHandler.getFromString(json);
+        assertThat(jsonNode.get(TenantConverter.ITEM_INGEST_CONTRACT_IDENTIFIER_KEY)).isNotNull();
     }
 
 }