From bb74f551cff7407fd76c1b9d984995e6ac497b38 Mon Sep 17 00:00:00 2001 From: Oleksandr Vidinieiev Date: Thu, 25 Jan 2024 15:37:51 +0200 Subject: [PATCH] MODTLR-10 Revert cosmetic changes --- .../java/org/folio/client/CirculationClient.java | 2 +- .../java/org/folio/controller/EcsTlrController.java | 2 +- .../java/org/folio/domain/mapper/EcsTlrMapper.java | 12 ++++++------ src/main/java/org/folio/service/EcsTlrService.java | 2 +- .../org/folio/service/impl/EcsTlrServiceImpl.java | 4 ++-- .../org/folio/controller/EcsTlrControllerTest.java | 2 +- .../java/org/folio/service/EcsTlrServiceTest.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/folio/client/CirculationClient.java b/src/main/java/org/folio/client/CirculationClient.java index 043dc9df..2c0cb4bc 100644 --- a/src/main/java/org/folio/client/CirculationClient.java +++ b/src/main/java/org/folio/client/CirculationClient.java @@ -9,5 +9,5 @@ public interface CirculationClient { @PostMapping("/circulation/requests") - Request createTitleLevelRequest(Request request); + Request createRequest(Request request); } diff --git a/src/main/java/org/folio/controller/EcsTlrController.java b/src/main/java/org/folio/controller/EcsTlrController.java index 7f461ce5..9fe5e947 100644 --- a/src/main/java/org/folio/controller/EcsTlrController.java +++ b/src/main/java/org/folio/controller/EcsTlrController.java @@ -34,6 +34,6 @@ public ResponseEntity getEcsTlrById(UUID requestId) { public ResponseEntity postEcsTlr(EcsTlr ecsTlr) { log.debug("postEcsTlr:: parameters ecsTlr: {}", ecsTlr); - return ResponseEntity.status(CREATED).body(ecsTlrService.create(ecsTlr)); + return ResponseEntity.status(CREATED).body(ecsTlrService.post(ecsTlr)); } } diff --git a/src/main/java/org/folio/domain/mapper/EcsTlrMapper.java b/src/main/java/org/folio/domain/mapper/EcsTlrMapper.java index cb06de46..96285bb6 100644 --- a/src/main/java/org/folio/domain/mapper/EcsTlrMapper.java +++ b/src/main/java/org/folio/domain/mapper/EcsTlrMapper.java @@ -37,18 +37,18 @@ default EcsTlr.FulfillmentPreferenceEnum mapFulfillmentPreference(String fulfill } @Named("RequestTypeToString") - default String mapRequestType(EcsTlr.RequestTypeEnum requestType) { - return requestType != null ? requestType.getValue() : null; + default String mapRequestTypeToString(EcsTlr.RequestTypeEnum requestTypeEnum) { + return requestTypeEnum != null ? requestTypeEnum.getValue() : null; } @Named("RequestLevelToString") - default String mapRequestLevel(EcsTlr.RequestLevelEnum requestLevel) { - return requestLevel != null ? requestLevel.getValue() : null; + default String mapRequestLevelToString(EcsTlr.RequestLevelEnum requestLevelEnum) { + return requestLevelEnum != null ? requestLevelEnum.getValue() : null; } @Named("FulfillmentPreferenceToString") - default String mapFulfillmentPreference(EcsTlr.FulfillmentPreferenceEnum fulfillmentPreference) { - return fulfillmentPreference != null ? fulfillmentPreference.getValue() : null; + default String mapFulfillmentPreferenceToString(EcsTlr.FulfillmentPreferenceEnum fulfillmentPreferenceEnum) { + return fulfillmentPreferenceEnum != null ? fulfillmentPreferenceEnum.getValue() : null; } Request mapDtoToRequest(EcsTlr ecsTlr); diff --git a/src/main/java/org/folio/service/EcsTlrService.java b/src/main/java/org/folio/service/EcsTlrService.java index bbee5bb8..4d7da52a 100644 --- a/src/main/java/org/folio/service/EcsTlrService.java +++ b/src/main/java/org/folio/service/EcsTlrService.java @@ -7,5 +7,5 @@ public interface EcsTlrService { Optional get(UUID requestId); - EcsTlr create(EcsTlr ecsTlr); + EcsTlr post(EcsTlr ecsTlr); } diff --git a/src/main/java/org/folio/service/impl/EcsTlrServiceImpl.java b/src/main/java/org/folio/service/impl/EcsTlrServiceImpl.java index 2a64bcee..c7c2c162 100644 --- a/src/main/java/org/folio/service/impl/EcsTlrServiceImpl.java +++ b/src/main/java/org/folio/service/impl/EcsTlrServiceImpl.java @@ -34,7 +34,7 @@ public Optional get(UUID id) { } @Override - public EcsTlr create(EcsTlr ecsTlr) { + public EcsTlr post(EcsTlr ecsTlr) { log.debug("create:: parameters ecsTlr: {}", () -> ecsTlr); createRequest(ecsTlr, "university"); // TODO: replace with real tenantId @@ -46,7 +46,7 @@ private Request createRequest(EcsTlr ecsTlr, String tenantId) { log.info("createRequest:: creating request for ECS TLR {} and tenant {}", ecsTlr.getId(), tenantId); Request mappedRequest = requestsMapper.mapDtoToRequest(ecsTlr); Request createdRequest = tenantScopedExecutionService.execute(tenantId, - () -> circulationClient.createTitleLevelRequest(mappedRequest)); + () -> circulationClient.createRequest(mappedRequest)); log.info("createRequest:: request created: {}", createdRequest.getId()); log.debug("createRequest:: request={}", () -> createdRequest); diff --git a/src/test/java/org/folio/controller/EcsTlrControllerTest.java b/src/test/java/org/folio/controller/EcsTlrControllerTest.java index 47e3477f..5d99b86e 100644 --- a/src/test/java/org/folio/controller/EcsTlrControllerTest.java +++ b/src/test/java/org/folio/controller/EcsTlrControllerTest.java @@ -43,7 +43,7 @@ void getById() { @Test void ecsTlrShouldSuccessfullyBeCreated() { var mockRequest = new EcsTlr(); - when(requestsService.create(any(EcsTlr.class))).thenReturn(mockRequest); + when(requestsService.post(any(EcsTlr.class))).thenReturn(mockRequest); var response = requestsController.postEcsTlr(new EcsTlr()); diff --git a/src/test/java/org/folio/service/EcsTlrServiceTest.java b/src/test/java/org/folio/service/EcsTlrServiceTest.java index 657e5f35..f2904003 100644 --- a/src/test/java/org/folio/service/EcsTlrServiceTest.java +++ b/src/test/java/org/folio/service/EcsTlrServiceTest.java @@ -80,7 +80,7 @@ void postEcsTlr() { when(ecsTlrRepository.save(any(EcsTlrEntity.class))).thenReturn(mockEcsTlrEntity); when(tenantScopedExecutionService.execute(any(String.class), any())) .thenReturn(new Request().id(UUID.randomUUID().toString())); - var postEcsTlr = ecsTlrService.create(ecsTlr); + var postEcsTlr = ecsTlrService.post(ecsTlr); assertEquals(id.toString(), postEcsTlr.getId()); assertEquals(instanceId.toString(), postEcsTlr.getInstanceId());