MCBFF-5 BFF for allowed service points functionality

folio-org · Sep 24, 2024 · 52da6e2 · 52da6e2
1 parent b013d64
commit 52da6e2
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 16 deletions.
diff --git a/src/main/java/org/folio/circulationbff/client/feign/CirculationClient.java b/src/main/java/org/folio/circulationbff/client/feign/CirculationClient.java
@@ -14,8 +14,9 @@ public interface CirculationClient {
 
   @GetMapping("/requests/allowed-service-points")
   AllowedServicePoints allowedServicePoints (
-    @RequestParam("patronGroupId") UUID patronGroupId, @RequestParam("instanceId") UUID instanceId,
-    @RequestParam("operation") String operation, @RequestParam("requestId") UUID requestId);
+    @RequestParam("operation") String operation, @RequestParam("requesterId") UUID requesterId,
+    @RequestParam("instanceId") UUID instanceId, @RequestParam("itemId") UUID itemId,
+    @RequestParam("requestId") UUID requestId, @RequestParam("patronGroupId") UUID patronGroupId);
 
   @GetMapping("/settings?query=name=ecsTlrFeature")
   CirculationSettingsResponse getEcsTlrCirculationSettings();

diff --git a/src/main/java/org/folio/circulationbff/client/feign/EcsTlrClient.java b/src/main/java/org/folio/circulationbff/client/feign/EcsTlrClient.java
@@ -13,8 +13,8 @@
 public interface EcsTlrClient {
 
   @GetMapping("/allowed-service-points")
-  AllowedServicePoints getAllowedServicePoints(
-    @RequestParam("operation") String operation, @RequestParam("instanceId") UUID instanceId,
+  AllowedServicePoints getAllowedServicePoints(@RequestParam("operation") String operation,
+    @RequestParam("requesterId") UUID requesterId, @RequestParam("instanceId") UUID instanceId,
     @RequestParam("requestId") UUID requestId);
 
   @GetMapping("/settings")

diff --git a/src/main/java/org/folio/circulationbff/controller/CirculationBffController.java b/src/main/java/org/folio/circulationbff/controller/CirculationBffController.java
@@ -21,9 +21,12 @@ public class CirculationBffController implements CirculationBffApi {
   private final CirculationBffService circulationBffService;
 
   @Override
-  public ResponseEntity<AllowedServicePoints> circulationBffRequestsAllowedServicePointsGet(UUID patronGroupId, String operation, UUID instanceId, UUID requestId) {
-    log.info("circulationBffRequestsAllowedServicePointsGet:: params: patronGroupId={}, operation={}, instanceId={}, requestId={}", patronGroupId, operation, instanceId, requestId);
-    return ResponseEntity.status(HttpStatus.OK).body(circulationBffService.getAllowedServicePoints(patronGroupId, operation, instanceId, requestId));
+  public ResponseEntity<AllowedServicePoints> circulationBffRequestsAllowedServicePointsGet(
+    UUID patronGroupId, String operation, UUID instanceId, UUID requestId, UUID requesterId, UUID itemId) {
+    log.info("circulationBffRequestsAllowedServicePointsGet:: params: " +
+      "patronGroupId={}, operation={}, instanceId={}, requestId={}, requesterId={}, itemId={}",
+      patronGroupId, operation, instanceId, requestId, requesterId, itemId);
+    return ResponseEntity.status(HttpStatus.OK).body(circulationBffService.getAllowedServicePoints(patronGroupId, operation, instanceId, requestId, requesterId, itemId));
   }
 
   @Override

diff --git a/src/main/java/org/folio/circulationbff/service/CirculationBffService.java b/src/main/java/org/folio/circulationbff/service/CirculationBffService.java
@@ -6,5 +6,5 @@
 
 public interface CirculationBffService {
   AllowedServicePoints getAllowedServicePoints(UUID patronGroupId, String operation,
-    UUID instanceId, UUID requestId);
+    UUID instanceId, UUID requestId, UUID requesterId, UUID itemId);
 }
diff --git a/src/main/java/org/folio/circulationbff/service/impl/CirculationBffServiceImpl.java b/src/main/java/org/folio/circulationbff/service/impl/CirculationBffServiceImpl.java
@@ -22,19 +22,21 @@ public class CirculationBffServiceImpl implements CirculationBffService {
   private final SettingsService settingsService;
 
   @Override
-  public AllowedServicePoints getAllowedServicePoints(UUID patronGroupId, String operation, UUID instanceId, UUID requestId) {
-    log.info("getAllowedServicePoints:: patronGroupId={}, operation={}, instanceId={}, requestId={}",
-      patronGroupId, operation, instanceId, requestId);
+  public AllowedServicePoints getAllowedServicePoints(UUID patronGroupId, String operation,
+                                                      UUID instanceId, UUID requestId,
+                                                      UUID requesterId, UUID itemId) {
+    log.info("getAllowedServicePoints:: params: patronGroupId={}, operation={}, instanceId={}, " +
+      "requestId={}, requesterId={}, itemId={}", patronGroupId, operation, instanceId, requestId,
+      requesterId, itemId);
     if (settingsService.isEcsTlrFeatureEnabled()) {
       log.info("getAllowedServicePoints:: Ecs TLR Feature is enabled. Getting allowed service " +
         "points from mod-tlr module");
-      return ecsTlrClient.getAllowedServicePoints(operation, instanceId,
-        requestId);
+      return ecsTlrClient.getAllowedServicePoints(operation, requesterId, instanceId, requestId);
     } else {
       log.info("getAllowedServicePoints:: Ecs TLR Feature is disabled. Getting allowed service " +
         "points from mod-circulation module");
-      return circulationClient.allowedServicePoints(patronGroupId, instanceId,
-        operation, requestId);
+      return circulationClient.allowedServicePoints(operation, requesterId,
+        instanceId, itemId, requestId, patronGroupId);
     }
   }
 }
diff --git a/src/main/resources/swagger.api/parameters/itemId.yaml b/src/main/resources/swagger.api/parameters/itemId.yaml
@@ -0,0 +1,6 @@
+name: itemId
+in: query
+required: false
+schema:
+  type: string
+  format: uuid
diff --git a/src/main/resources/swagger.api/parameters/requesterId.yaml b/src/main/resources/swagger.api/parameters/requesterId.yaml
@@ -0,0 +1,6 @@
+name: requesterId
+in: query
+required: false
+schema:
+  type: string
+  format: uuid
diff --git a/src/main/resources/swagger.api/paths/allowedServicePoints/allowedServicePoints.yaml b/src/main/resources/swagger.api/paths/allowedServicePoints/allowedServicePoints.yaml
@@ -5,6 +5,9 @@ get:
     - $ref: '../../parameters/patronGroupId.yaml'
     - $ref: '../../parameters/instanceId.yaml'
     - $ref: '../../parameters/requestId.yaml'
+    - $ref: '../../parameters/requesterId.yaml'
+    - $ref: '../../parameters/itemId.yaml'
+
   tags:
     - getAllowedServicePoints
   responses:
@@ -19,4 +22,4 @@ get:
     '422':
       $ref: '../../responses/unprocessableEntityResponse.yaml'
     '500':
-      $ref: '../../responses/internalServerErrorResponse.yaml'
+      $ref: '../../responses/internalServerErrorResponse.yaml'