From 1b186cbb3d3697483be86594c22c052410e19e10 Mon Sep 17 00:00:00 2001 From: azizbekxm Date: Mon, 9 Oct 2023 16:30:33 +0500 Subject: [PATCH] [MODCON-api] - instanceIdentifier changed to instanceId --- .../controller/SharingInstanceController.java | 4 +-- .../converter/SharingInstanceConverter.java | 2 +- .../repository/SharingInstanceRepository.java | 6 ++-- .../service/SharingInstanceService.java | 6 ++-- .../impl/SharingInstanceServiceImpl.java | 30 ++++++++-------- .../swagger.api/schemas/sharingInstance.yaml | 4 +-- .../swagger.api/sharing_instances.yaml | 6 ++-- ...ingInstanceControllerIntegrationTests.java | 8 ++--- .../SharingInstanceControllerTest.java | 4 +-- .../service/SharingInstanceServiceTest.java | 34 +++++++++---------- .../folio/consortia/utils/EntityUtils.java | 16 ++++----- ...ium_instance_sharing_complete_request.json | 2 +- 12 files changed, 61 insertions(+), 61 deletions(-) diff --git a/src/main/java/org/folio/consortia/controller/SharingInstanceController.java b/src/main/java/org/folio/consortia/controller/SharingInstanceController.java index 79927a8e..40add57d 100644 --- a/src/main/java/org/folio/consortia/controller/SharingInstanceController.java +++ b/src/main/java/org/folio/consortia/controller/SharingInstanceController.java @@ -51,11 +51,11 @@ public ResponseEntity getSharingInstanceById(UUID consortiumId, } @Override - public ResponseEntity getSharingInstances(UUID consortiumId, UUID instanceIdentifier, + public ResponseEntity getSharingInstances(UUID consortiumId, UUID instanceId, String sourceTenantId, String targetTenantId, Status status, Integer offset, Integer limit) { var centralTenantId = configurationService.getCentralTenantId(folioExecutionContext.getTenantId()); try (var ignored = new FolioExecutionContextSetter(prepareContextForTenant(centralTenantId, folioModuleMetadata, folioExecutionContext))) { - return ResponseEntity.ok(sharingInstanceService.getSharingInstances(consortiumId, instanceIdentifier, sourceTenantId, + return ResponseEntity.ok(sharingInstanceService.getSharingInstances(consortiumId, instanceId, sourceTenantId, targetTenantId, status, offset, limit)); } } diff --git a/src/main/java/org/folio/consortia/domain/converter/SharingInstanceConverter.java b/src/main/java/org/folio/consortia/domain/converter/SharingInstanceConverter.java index f1b3f827..248ad26e 100644 --- a/src/main/java/org/folio/consortia/domain/converter/SharingInstanceConverter.java +++ b/src/main/java/org/folio/consortia/domain/converter/SharingInstanceConverter.java @@ -15,7 +15,7 @@ public class SharingInstanceConverter implements Converter, JpaSpecificationExecutor { interface Specifications { - static Specification constructSpecification(UUID instanceIdentifier, String sourceTenantId, + static Specification constructSpecification(UUID instanceId, String sourceTenantId, String targetTenantId, Status status) { var list = new ArrayList>(); - if (Objects.nonNull(instanceIdentifier)) { - list.add(by("instanceId", instanceIdentifier)); + if (Objects.nonNull(instanceId)) { + list.add(by("instanceId", instanceId)); } if (StringUtils.isNotEmpty(sourceTenantId)) { list.add(by("sourceTenantId", sourceTenantId)); diff --git a/src/main/java/org/folio/consortia/service/SharingInstanceService.java b/src/main/java/org/folio/consortia/service/SharingInstanceService.java index f57a41f3..4c5a1b14 100644 --- a/src/main/java/org/folio/consortia/service/SharingInstanceService.java +++ b/src/main/java/org/folio/consortia/service/SharingInstanceService.java @@ -27,7 +27,7 @@ public interface SharingInstanceService { /** * Get a sharing instance collection * @param consortiumId the UUID of the consortium - * @param instanceIdentifier the UUID of the instance + * @param instanceId the UUID of the instance * @param sourceTenantId the ID of the source tenant * @param targetTenantId the ID of the target tenant * @param status the status of the sharing instance @@ -35,12 +35,12 @@ public interface SharingInstanceService { * @param limit the limit * @return the sharing instance collection */ - SharingInstanceCollection getSharingInstances(UUID consortiumId, UUID instanceIdentifier, String sourceTenantId, + SharingInstanceCollection getSharingInstances(UUID consortiumId, UUID instanceId, String sourceTenantId, String targetTenantId, Status status, Integer offset, Integer limit); /** * Update 'status' and 'error' fields of sharingInstance according to Kafka message payload - * @param promotingEvent contains 'instanceIdentifier', 'sourceTenantId', 'targetTenantId', and 'error' + * @param promotingEvent contains 'instanceId', 'sourceTenantId', 'targetTenantId', and 'error' */ void completePromotingLocalInstance(String promotingEvent); } diff --git a/src/main/java/org/folio/consortia/service/impl/SharingInstanceServiceImpl.java b/src/main/java/org/folio/consortia/service/impl/SharingInstanceServiceImpl.java index 5d2c4fb6..87c0b645 100644 --- a/src/main/java/org/folio/consortia/service/impl/SharingInstanceServiceImpl.java +++ b/src/main/java/org/folio/consortia/service/impl/SharingInstanceServiceImpl.java @@ -67,7 +67,7 @@ public SharingInstance getById(UUID consortiumId, UUID actionId) { @SneakyThrows @Transactional public SharingInstance start(UUID consortiumId, SharingInstance sharingInstance) { - log.debug("start:: Trying to start instance sharing with instanceIdentifier: {}, consortiumId: {}", sharingInstance.getInstanceIdentifier(), consortiumId); + log.debug("start:: Trying to start instance sharing with instanceId: {}, consortiumId: {}", sharingInstance.getInstanceId(), consortiumId); consortiumService.checkConsortiumExistsOrThrow(consortiumId); String centralTenantId = tenantService.getCentralTenantId(); @@ -78,14 +78,14 @@ public SharingInstance start(UUID consortiumId, SharingInstance sharingInstance) if (Objects.equals(centralTenantId, sourceTenantId)) { JsonNode inventoryInstance; - try (var context = new FolioExecutionContextSetter(prepareContextForTenant(sourceTenantId, folioModuleMetadata, folioExecutionContext))) { - inventoryInstance = inventoryService.getById(sharingInstance.getInstanceIdentifier()); + try (var ignored = new FolioExecutionContextSetter(prepareContextForTenant(sourceTenantId, folioModuleMetadata, folioExecutionContext))) { + inventoryInstance = inventoryService.getById(sharingInstance.getInstanceId()); } catch (Exception ex) { - log.error("start:: error when getting instance by id: {}", sharingInstance.getInstanceIdentifier(), ex); + log.error("start:: error when getting instance by id: {}", sharingInstance.getInstanceId(), ex); return updateFieldsAndSaveInCaseOfException(sharingInstance, GET_INSTANCE_EXCEPTION_MSG, ex); } - try (var context = new FolioExecutionContextSetter(prepareContextForTenant(targetTenantId, folioModuleMetadata, folioExecutionContext))) { + try (var ignored = new FolioExecutionContextSetter(prepareContextForTenant(targetTenantId, folioModuleMetadata, folioExecutionContext))) { String source = switch (inventoryInstance.get("source").asText().toLowerCase()) { case "folio" -> CONSORTIUM_FOLIO_INSTANCE_SOURCE; case "marc" -> CONSORTIUM_MARC_INSTANCE_SOURCE; @@ -94,7 +94,7 @@ public SharingInstance start(UUID consortiumId, SharingInstance sharingInstance) var updatedInventoryInstance = ((ObjectNode) inventoryInstance).set("source", new TextNode(source)); inventoryService.saveInstance(updatedInventoryInstance); } catch (Exception ex) { - log.error("start:: error when posting instance with id: {}", sharingInstance.getInstanceIdentifier(), ex); + log.error("start:: error when posting instance with id: {}", sharingInstance.getInstanceId(), ex); return updateFieldsAndSaveInCaseOfException(sharingInstance, POST_INSTANCE_EXCEPTION_MSG, ex); } @@ -112,12 +112,12 @@ public SharingInstance start(UUID consortiumId, SharingInstance sharingInstance) } @Override - public SharingInstanceCollection getSharingInstances(UUID consortiumId, UUID instanceIdentifier, String sourceTenantId, + public SharingInstanceCollection getSharingInstances(UUID consortiumId, UUID instanceId, String sourceTenantId, String targetTenantId, Status status, Integer offset, Integer limit) { - log.debug("getSharingInstances:: parameters consortiumId: {}, instanceIdentifier: {}, sourceTenantId: {}, targetTenantId: {}, status: {}.", - consortiumId, instanceIdentifier, sourceTenantId, targetTenantId, status); + log.debug("getSharingInstances:: parameters consortiumId: {}, instanceId: {}, sourceTenantId: {}, targetTenantId: {}, status: {}.", + consortiumId, instanceId, sourceTenantId, targetTenantId, status); consortiumService.checkConsortiumExistsOrThrow(consortiumId); - var specification = constructSpecification(instanceIdentifier, sourceTenantId, targetTenantId, status); + var specification = constructSpecification(instanceId, sourceTenantId, targetTenantId, status); var sharingInstancePage = sharingInstanceRepository.findAll(specification, PageRequest.of(offset, limit)); var result = new SharingInstanceCollection(); @@ -144,12 +144,12 @@ public void completePromotingLocalInstance(String eventPayload) { return; } - var specification = constructSpecification(promotingEvent.getInstanceIdentifier(), sourceTenantId, targetTenantId, null); + var specification = constructSpecification(promotingEvent.getInstanceId(), sourceTenantId, targetTenantId, null); var optionalSharingInstance = sharingInstanceRepository.findOne(specification); if (optionalSharingInstance.isEmpty()) { - log.warn("completePromotingLocalInstance:: sharingInstance with instanceIdentifier: {}, sourceTenantId: {}, targetTenantId: {} does not exist", - promotingEvent.getInstanceIdentifier(), sourceTenantId, targetTenantId); + log.warn("completePromotingLocalInstance:: sharingInstance with instanceId: {}, sourceTenantId: {}, targetTenantId: {} does not exist", + promotingEvent.getInstanceId(), sourceTenantId, targetTenantId); return; } @@ -162,7 +162,7 @@ public void completePromotingLocalInstance(String eventPayload) { } sharingInstanceRepository.save(promotedSharingInstance); - log.info("completePromotingLocalInstance:: status of sharingInstance with instanceIdentifier: {}, sourceTenantId: {}, targetTenantId: {} " + + log.info("completePromotingLocalInstance:: status of sharingInstance with instanceId: {}, sourceTenantId: {}, targetTenantId: {} " + "has been updated to: {}", promotedSharingInstance.getInstanceId(), sourceTenantId, targetTenantId, promotedSharingInstance.getStatus()); } catch (Exception e) { log.error("completePromotingLocalInstance:: exception occurred while promoting local sharing instance", e); @@ -185,7 +185,7 @@ private void checkTenantsExistAndContainCentralTenantOrThrow(String sourceTenant private SharingInstanceEntity toEntity(SharingInstance dto) { SharingInstanceEntity entity = new SharingInstanceEntity(); entity.setId(UUID.randomUUID()); - entity.setInstanceId(dto.getInstanceIdentifier()); + entity.setInstanceId(dto.getInstanceId()); entity.setSourceTenantId(dto.getSourceTenantId()); entity.setTargetTenantId(dto.getTargetTenantId()); entity.setStatus(dto.getStatus()); diff --git a/src/main/resources/swagger.api/schemas/sharingInstance.yaml b/src/main/resources/swagger.api/schemas/sharingInstance.yaml index 5dce8a6e..aac6687a 100644 --- a/src/main/resources/swagger.api/schemas/sharingInstance.yaml +++ b/src/main/resources/swagger.api/schemas/sharingInstance.yaml @@ -5,7 +5,7 @@ SharingInstance: id: type: string format: uuid - instanceIdentifier: + instanceId: type: string format: uuid sourceTenantId: @@ -22,7 +22,7 @@ SharingInstance: $ref: "common.yaml#/Metadata" additionalProperties: false required: - - instanceIdentifier + - instanceId - sourceTenantId - targetTenantId diff --git a/src/main/resources/swagger.api/sharing_instances.yaml b/src/main/resources/swagger.api/sharing_instances.yaml index d8fbfbc2..ae41a121 100644 --- a/src/main/resources/swagger.api/sharing_instances.yaml +++ b/src/main/resources/swagger.api/sharing_instances.yaml @@ -13,7 +13,7 @@ paths: operationId: getSharingInstances parameters: - $ref: "#/components/parameters/consortiumId" - - $ref: "#/components/parameters/instanceIdentifier" + - $ref: "#/components/parameters/instanceId" - $ref: "#/components/parameters/sourceTenantId" - $ref: "#/components/parameters/targetTenantId" - $ref: "#/components/parameters/status" @@ -138,9 +138,9 @@ components: $ref: "schemas/common.yaml#/uuid" required: true description: The ID of sharing instance - instanceIdentifier: + instanceId: in: query - name: instanceIdentifier + name: instanceId schema: $ref: "schemas/common.yaml#/uuid" description: The UUID of the instance diff --git a/src/test/java/org/folio/consortia/controller/SharingInstanceControllerIntegrationTests.java b/src/test/java/org/folio/consortia/controller/SharingInstanceControllerIntegrationTests.java index 208ef71e..1e525fd0 100644 --- a/src/test/java/org/folio/consortia/controller/SharingInstanceControllerIntegrationTests.java +++ b/src/test/java/org/folio/consortia/controller/SharingInstanceControllerIntegrationTests.java @@ -97,7 +97,7 @@ private void postAndVerifyResponseBody(String[][] instances) { // create payload String body = new JSONObject() - .appendField("instanceIdentifier", fields[0]) + .appendField("instanceId", fields[0]) .appendField("sourceTenantId", fields[1]) .appendField("targetTenantId", fields[2]) .appendField("status", fields[3]) @@ -112,7 +112,7 @@ private void postAndVerifyResponseBody(String[][] instances) { .accept(MediaType.APPLICATION_JSON)) .andExpect(status().isCreated()) .andExpect(jsonPath("$.id").isNotEmpty()) - .andExpect(jsonPath("$.instanceIdentifier").value(fields[0])) + .andExpect(jsonPath("$.instanceId").value(fields[0])) .andExpect(jsonPath("$.sourceTenantId").value(fields[1])) .andExpect(jsonPath("$.targetTenantId").value(fields[2])) .andExpect(jsonPath("$.status").value(fields[3])); @@ -121,7 +121,7 @@ private void postAndVerifyResponseBody(String[][] instances) { private String params(String instanceId, String sourceTenantId, String targetTenantId, String status) { Map parameters = new HashMap<>(); - parameters.put("instanceIdentifier", instanceId); + parameters.put("instanceId", instanceId); parameters.put("sourceTenantId", sourceTenantId); parameters.put("targetTenantId", targetTenantId); parameters.put("status", status); @@ -131,7 +131,7 @@ private String params(String instanceId, String sourceTenantId, String targetTen .map(k -> k + "=" + parameters.get(k)) .collect(Collectors.joining("&")); - return query.length() == 0 ? "" : "?" + query; + return query.isEmpty() ? "" : "?" + query; } private static class ParameterArgumentsProvider implements ArgumentsProvider { diff --git a/src/test/java/org/folio/consortia/controller/SharingInstanceControllerTest.java b/src/test/java/org/folio/consortia/controller/SharingInstanceControllerTest.java index 544b8453..fd073efa 100644 --- a/src/test/java/org/folio/consortia/controller/SharingInstanceControllerTest.java +++ b/src/test/java/org/folio/consortia/controller/SharingInstanceControllerTest.java @@ -62,7 +62,7 @@ void shouldGetSharingInstanceByActionId() throws Exception { @ParameterizedTest @ValueSource(strings = { - "{\"instanceIdentifier\":\"111841e3-e6fb-4191-8fd8-5674a5107c33\",\"sourceTenantId\":\"college\", \"targetTenantId\":\"mobius\"}" + "{\"instanceId\":\"111841e3-e6fb-4191-8fd8-5674a5107c33\",\"sourceTenantId\":\"college\", \"targetTenantId\":\"mobius\"}" }) void shouldSaveSharingInstance(String body) throws Exception { SharingInstance sharingInstance = createSharingInstance(INSTANCE_ID, "college", "mobius"); @@ -80,7 +80,7 @@ void shouldSaveSharingInstance(String body) throws Exception { .accept(MediaType.APPLICATION_JSON)) .andDo(print()) .andExpect(status().isCreated()) - .andExpect(jsonPath("$.instanceIdentifier").value(String.valueOf(INSTANCE_ID))) + .andExpect(jsonPath("$.instanceId").value(String.valueOf(INSTANCE_ID))) .andExpect(jsonPath("$.sourceTenantId").value("college")) .andExpect(jsonPath("$.targetTenantId").value("mobius")); } diff --git a/src/test/java/org/folio/consortia/service/SharingInstanceServiceTest.java b/src/test/java/org/folio/consortia/service/SharingInstanceServiceTest.java index a96bb936..ae7bbf4d 100644 --- a/src/test/java/org/folio/consortia/service/SharingInstanceServiceTest.java +++ b/src/test/java/org/folio/consortia/service/SharingInstanceServiceTest.java @@ -49,8 +49,8 @@ @EnableAutoConfiguration(exclude = BatchAutoConfiguration.class) class SharingInstanceServiceTest { - private static final UUID instanceIdentifier = UUID.fromString("5b157ec2-8134-4363-a7b1-c9531a7c6a54"); - private static final String EVENT_PAYLOAD = "{\"instanceIdentifier\":\"5b157ec2-8134-4363-a7b1-c9531a7c6a54\",\"sourceTenantId\":\"college\",\"targetTenantId\":\"mobius\"}"; + private static final UUID instanceId = UUID.fromString("5b157ec2-8134-4363-a7b1-c9531a7c6a54"); + private static final String EVENT_PAYLOAD = "{\"instanceId\":\"5b157ec2-8134-4363-a7b1-c9531a7c6a54\",\"sourceTenantId\":\"college\",\"targetTenantId\":\"mobius\"}"; private static final Map> headers = new HashMap<>(); @InjectMocks private SharingInstanceServiceImpl sharingInstanceService; @@ -79,8 +79,8 @@ class SharingInstanceServiceTest { @Test void shouldGetSharingInstanceById() { - SharingInstance expectedSharingInstance = createSharingInstance(ACTION_ID, instanceIdentifier, "college", "mobius"); - SharingInstanceEntity savedSharingInstance = createSharingInstanceEntity(ACTION_ID, instanceIdentifier, "college", "mobius"); + SharingInstance expectedSharingInstance = createSharingInstance(ACTION_ID, instanceId, "college", "mobius"); + SharingInstanceEntity savedSharingInstance = createSharingInstanceEntity(ACTION_ID, instanceId, "college", "mobius"); when(consortiumRepository.existsById(any())).thenReturn(true); when(conversionService.convert(any(), any())).thenReturn(toDto(savedSharingInstance)); @@ -96,8 +96,8 @@ void shouldGetSharingInstanceById() { @Test void shouldSaveSharingInstanceWhenSourceTenantNotEqualCentralTenant() throws Exception{ - SharingInstance sharingInstance = createSharingInstance(instanceIdentifier, "college", "mobius"); - SharingInstanceEntity savedSharingInstance = createSharingInstanceEntity(instanceIdentifier, "college", "mobius"); + SharingInstance sharingInstance = createSharingInstance(instanceId, "college", "mobius"); + SharingInstanceEntity savedSharingInstance = createSharingInstanceEntity(instanceId, "college", "mobius"); String event = objectMapper.writeValueAsString(sharingInstance); when(consortiumRepository.existsById(any())).thenReturn(true); @@ -107,10 +107,10 @@ void shouldSaveSharingInstanceWhenSourceTenantNotEqualCentralTenant() throws Exc when(sharingInstanceRepository.save(any())).thenReturn(savedSharingInstance); when(objectMapper.writeValueAsString(any())).thenReturn(event); - var expectedSharingInstance = createSharingInstance(instanceIdentifier, "college", "mobius"); + var expectedSharingInstance = createSharingInstance(instanceId, "college", "mobius"); var actualSharingInstance = sharingInstanceService.start(UUID.randomUUID(), sharingInstance); - assertThat(actualSharingInstance.getInstanceIdentifier()).isEqualTo(expectedSharingInstance.getInstanceIdentifier()); + assertThat(actualSharingInstance.getInstanceId()).isEqualTo(expectedSharingInstance.getInstanceId()); assertThat(actualSharingInstance.getSourceTenantId()).isEqualTo(expectedSharingInstance.getSourceTenantId()); assertThat(actualSharingInstance.getTargetTenantId()).isEqualTo(expectedSharingInstance.getTargetTenantId()); @@ -120,7 +120,7 @@ void shouldSaveSharingInstanceWhenSourceTenantNotEqualCentralTenant() throws Exc @Test void shouldSaveSharingInstanceWhenSourceTenantEqualsCentralTenantAndGetInstanceThrowsException() { - SharingInstance sharingInstance = createSharingInstance(instanceIdentifier, "mobius", "college"); + SharingInstance sharingInstance = createSharingInstance(instanceId, "mobius", "college"); SharingInstanceEntity sharingInstanceEntity = new SharingInstanceEntity(); // skip validation part @@ -144,7 +144,7 @@ void shouldSaveSharingInstanceWhenSourceTenantEqualsCentralTenantAndGetInstanceT @Test void shouldSaveSharingInstanceWhenSourceTenantEqualsCentralTenantAndPostInstanceThrowsException() throws JsonProcessingException { - SharingInstance sharingInstance = createSharingInstance(instanceIdentifier, "mobius", "college"); + SharingInstance sharingInstance = createSharingInstance(instanceId, "mobius", "college"); SharingInstanceEntity sharingInstanceEntity = new SharingInstanceEntity(); // skip validation part @@ -174,7 +174,7 @@ void shouldSaveSharingInstanceWhenSourceTenantEqualsCentralTenantAndPostInstance @Test void shouldSaveSharingInstanceWhenSourceTenantEqualsCentralTenantAndAllRequestsSuccessful() throws JsonProcessingException { - SharingInstance sharingInstance = createSharingInstance(instanceIdentifier, "mobius", "college"); + SharingInstance sharingInstance = createSharingInstance(instanceId, "mobius", "college"); SharingInstanceEntity sharingInstanceEntity = new SharingInstanceEntity(); // skip validation part @@ -205,7 +205,7 @@ void shouldSaveSharingInstanceWhenSourceTenantEqualsCentralTenantAndAllRequestsS @Test void shouldPromoteSharingInstanceWithCompleteStatus() throws JsonProcessingException { - SharingInstance sharingInstance = createSharingInstance(instanceIdentifier, "college", "mobius"); + SharingInstance sharingInstance = createSharingInstance(instanceId, "college", "mobius"); SharingInstanceEntity sharingInstanceEntity = new SharingInstanceEntity(); when(tenantService.getCentralTenantId()).thenReturn("mobius"); @@ -222,7 +222,7 @@ void shouldPromoteSharingInstanceWithCompleteStatus() throws JsonProcessingExcep @Test void shouldPromoteSharingInstanceWithErrorStatus() throws JsonProcessingException { - SharingInstance sharingInstance = createSharingInstance(instanceIdentifier, "college", "mobius"); + SharingInstance sharingInstance = createSharingInstance(instanceId, "college", "mobius"); sharingInstance.setError("Promotion failed"); SharingInstanceEntity sharingInstanceEntity = new SharingInstanceEntity(); @@ -250,7 +250,7 @@ void shouldThrowResourceNotFoundExceptionWhenTryingToGetSharingInstanceById() { @Test void shouldThrowExceptionWhenTryingToPostSharingInstanceWithMemberTenants() { - SharingInstance sharingInstance = createSharingInstance(instanceIdentifier, "university", "college"); + SharingInstance sharingInstance = createSharingInstance(instanceId, "university", "college"); when(consortiumRepository.existsById(any())).thenReturn(true); doNothing().when(tenantService).checkTenantExistsOrThrow(anyString()); when(tenantService.getCentralTenantId()).thenReturn("mobius"); @@ -261,7 +261,7 @@ void shouldThrowExceptionWhenTryingToPostSharingInstanceWithMemberTenants() { @Test void shouldNotPromoteSharingInstanceWhenTargetTenantDoesNotEqualCentralTenant() throws JsonProcessingException { - SharingInstance sharingInstance = createSharingInstance(instanceIdentifier, "college", "mobius"); + SharingInstance sharingInstance = createSharingInstance(instanceId, "college", "mobius"); when(tenantService.getCentralTenantId()).thenReturn("college"); doNothing().when(tenantService).checkTenantExistsOrThrow(anyString()); @@ -275,7 +275,7 @@ void shouldNotPromoteSharingInstanceWhenTargetTenantDoesNotEqualCentralTenant() @Test void shouldNotPromoteSharingInstanceWhenSharingInstanceDoesNotExist() throws JsonProcessingException { - SharingInstance sharingInstance = createSharingInstance(instanceIdentifier, "college", "mobius"); + SharingInstance sharingInstance = createSharingInstance(instanceId, "college", "mobius"); when(tenantService.getCentralTenantId()).thenReturn("mobius"); doNothing().when(tenantService).checkTenantExistsOrThrow(anyString()); @@ -291,7 +291,7 @@ void shouldNotPromoteSharingInstanceWhenSharingInstanceDoesNotExist() throws Jso private SharingInstance toDto(SharingInstanceEntity entity) { SharingInstance sharingInstance = new SharingInstance(); sharingInstance.setId(entity.getId()); - sharingInstance.setInstanceIdentifier(entity.getInstanceId()); + sharingInstance.setInstanceId(entity.getInstanceId()); sharingInstance.setSourceTenantId(entity.getSourceTenantId()); sharingInstance.setTargetTenantId(entity.getTargetTenantId()); sharingInstance.setStatus(entity.getStatus()); diff --git a/src/test/java/org/folio/consortia/utils/EntityUtils.java b/src/test/java/org/folio/consortia/utils/EntityUtils.java index 89389c0e..4665ea1e 100644 --- a/src/test/java/org/folio/consortia/utils/EntityUtils.java +++ b/src/test/java/org/folio/consortia/utils/EntityUtils.java @@ -164,29 +164,29 @@ public static ConsortiaConfiguration createConsortiaConfiguration(String central return configuration; } - public static SharingInstance createSharingInstance(UUID instanceIdentifier, String sourceTenantId, String targetTenantId) { + public static SharingInstance createSharingInstance(UUID instanceId, String sourceTenantId, String targetTenantId) { SharingInstance sharingInstance = new SharingInstance(); sharingInstance.setId(ACTION_ID); - sharingInstance.setInstanceIdentifier(instanceIdentifier); + sharingInstance.setInstanceId(instanceId); sharingInstance.setSourceTenantId(sourceTenantId); sharingInstance.setTargetTenantId(targetTenantId); return sharingInstance; } - public static SharingInstance createSharingInstance(UUID actionId, UUID instanceIdentifier, String sourceTenantId, + public static SharingInstance createSharingInstance(UUID actionId, UUID instanceId, String sourceTenantId, String targetTenantId) { SharingInstance sharingInstance = new SharingInstance(); sharingInstance.setId(actionId); - sharingInstance.setInstanceIdentifier(instanceIdentifier); + sharingInstance.setInstanceId(instanceId); sharingInstance.setSourceTenantId(sourceTenantId); sharingInstance.setTargetTenantId(targetTenantId); return sharingInstance; } - public static SharingInstanceEntity createSharingInstanceEntity(UUID instanceIdentifier, String sourceTenantId, String targetTenantId) { + public static SharingInstanceEntity createSharingInstanceEntity(UUID instanceId, String sourceTenantId, String targetTenantId) { SharingInstanceEntity sharingInstance = new SharingInstanceEntity(); sharingInstance.setId(ACTION_ID); - sharingInstance.setInstanceId(instanceIdentifier); + sharingInstance.setInstanceId(instanceId); sharingInstance.setSourceTenantId(sourceTenantId); sharingInstance.setTargetTenantId(targetTenantId); sharingInstance.setCreatedDate(LocalDateTime.now()); @@ -194,10 +194,10 @@ public static SharingInstanceEntity createSharingInstanceEntity(UUID instanceIde return sharingInstance; } - public static SharingInstanceEntity createSharingInstanceEntity(UUID actionId, UUID instanceIdentifier, String sourceTenantId, String targetTenantId) { + public static SharingInstanceEntity createSharingInstanceEntity(UUID actionId, UUID instanceId, String sourceTenantId, String targetTenantId) { SharingInstanceEntity sharingInstance = new SharingInstanceEntity(); sharingInstance.setId(actionId); - sharingInstance.setInstanceId(instanceIdentifier); + sharingInstance.setInstanceId(instanceId); sharingInstance.setSourceTenantId(sourceTenantId); sharingInstance.setTargetTenantId(targetTenantId); sharingInstance.setCreatedDate(LocalDateTime.now()); diff --git a/src/test/resources/mockdata/kafka/consortium_instance_sharing_complete_request.json b/src/test/resources/mockdata/kafka/consortium_instance_sharing_complete_request.json index 0a1a6599..6ec52bc2 100644 --- a/src/test/resources/mockdata/kafka/consortium_instance_sharing_complete_request.json +++ b/src/test/resources/mockdata/kafka/consortium_instance_sharing_complete_request.json @@ -1,5 +1,5 @@ { - "instanceIdentifier": "03670ef4-3fcc-41d9-98a2-4375b2420f65", + "instanceId": "03670ef4-3fcc-41d9-98a2-4375b2420f65", "sourceTenantId": "university", "targetTenantId": "mobius" }