Skip to content

MODEXPW-621. Use GET/PUT /tenant-addresses to work with tenant addresses #726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SerhiiNosko merged 1 commit into from
Feb 24, 2026
Merged

MODEXPW-621. Use GET/PUT /tenant-addresses to work with tenant addresses #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions src/main/java/org/folio/dew/batch/acquisitions/services/ConfigurationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.fasterxml.jackson.databind.JsonNode;

import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.folio.dew.client.TenantAddressesClient;
Expand All @@ -17,8 +16,6 @@
public class ConfigurationService {

private static final Logger logger = LogManager.getLogger();
private static final String ADDRESSES = "addresses";
private static final String ID = "id";
private static final String ADDRESS = "address";

private final TenantAddressesClient tenantAddressesClient;
Expand All @@ -30,28 +27,15 @@ public String getAddressConfig(UUID shipToConfigId) {
return "";
}
try {
JsonNode addressesResponse = tenantAddressesClient.getTenantAddresses();
JsonNode addressResponse = tenantAddressesClient.getById(shipToConfigId.toString());

if (addressesResponse == null || !addressesResponse.has(ADDRESSES)) {
logger.warn("getAddressConfig:: No addresses found in tenant-addresses response");
if (addressResponse == null) {
logger.warn("getAddressConfig:: No address found for id '{}'", shipToConfigId);
return "";
}

JsonNode addressesList = addressesResponse.get(ADDRESSES);
if (!addressesList.isArray() || addressesList.isEmpty()) {
logger.warn("getAddressConfig:: Addresses list is empty");
return "";
}

for (JsonNode addressEntry : addressesList) {
String addressId = addressEntry.path(ID).asText(null);
if (StringUtils.equals(shipToConfigId.toString(), addressId)) {
logger.info("getAddressConfig:: Found address with id '{}'", shipToConfigId);
return addressEntry.path(ADDRESS).asText("");
}
}

return "";
logger.info("getAddressConfig:: Found address with id '{}'", shipToConfigId);
return addressResponse.path(ADDRESS).asText("");
} catch (Exception e) {
logger.warn("getAddressConfig:: Cannot find address by id: '{}'", shipToConfigId, e);
return "";
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/folio/dew/client/TenantAddressesClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;


@FeignClient(name = "tenant-addresses", configuration = FeignClientConfiguration.class)
public interface TenantAddressesClient {

@GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
JsonNode getTenantAddresses();
@GetMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
JsonNode getById(@PathVariable("id") String id);
}
37 changes: 8 additions & 29 deletions src/test/java/org/folio/dew/batch/acquisitions/services/ConfigurationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import java.util.UUID;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;

import org.folio.dew.client.TenantAddressesClient;
Expand Down Expand Up @@ -36,52 +35,32 @@ void getAddressConfig_nullId_returnsEmpty() {

@Test
void getAddressConfig_matchingAddress_returnsAddress() {
when(tenantAddressesClient.getTenantAddresses())
.thenReturn(createResponse(CONFIG_ID.toString(), EXPECTED_ADDRESS));
when(tenantAddressesClient.getById(CONFIG_ID.toString()))
.thenReturn(createAddressNode(EXPECTED_ADDRESS));

assertThat(configurationService.getAddressConfig(CONFIG_ID)).isEqualTo(EXPECTED_ADDRESS);
}

@Test
void getAddressConfig_noMatchingId_returnsEmpty() {
when(tenantAddressesClient.getTenantAddresses())
.thenReturn(createResponse("other-id", "Other Address"));

assertThat(configurationService.getAddressConfig(CONFIG_ID)).isEmpty();
}

@Test
void getAddressConfig_nullResponse_returnsEmpty() {
when(tenantAddressesClient.getTenantAddresses()).thenReturn(null);

assertThat(configurationService.getAddressConfig(CONFIG_ID)).isEmpty();
}

@Test
void getAddressConfig_emptyAddressArray_returnsEmpty() {
ObjectNode response = MAPPER.createObjectNode();
response.putArray("addresses");
when(tenantAddressesClient.getTenantAddresses()).thenReturn(response);
when(tenantAddressesClient.getById(CONFIG_ID.toString())).thenReturn(null);

assertThat(configurationService.getAddressConfig(CONFIG_ID)).isEmpty();
}

@Test
void getAddressConfig_clientThrowsException_returnsEmpty() {
when(tenantAddressesClient.getTenantAddresses())
when(tenantAddressesClient.getById(CONFIG_ID.toString()))
.thenThrow(new RuntimeException("Connection error"));

assertThat(configurationService.getAddressConfig(CONFIG_ID)).isEmpty();
}

// -- Helper --

private static ObjectNode createResponse(String id, String address) {
ObjectNode response = MAPPER.createObjectNode();
ArrayNode addresses = response.putArray("addresses");
ObjectNode entry = addresses.addObject();
entry.put("id", id);
private static ObjectNode createAddressNode(String address) {
ObjectNode entry = MAPPER.createObjectNode();
entry.put("address", address);
return response;
return entry;
}
}
}
Loading