[MODORSERS-1026] - Improved template request context

folio-org · Apr 2, 2024 · 980c337 · 980c337
1 parent b2a135f
commit 980c337
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/ramls/acq-models b/ramls/acq-models
diff --git a/src/main/java/org/folio/models/TemplateProcessingRequest.java b/src/main/java/org/folio/models/TemplateProcessingRequest.java
@@ -81,23 +81,23 @@ public static class RoutingList {
     @JsonProperty
     private String name;
     @JsonProperty
-    private String note;
+    private String notes;
 
     public String getName() {
       return name;
     }
 
-    public String getNote() {
-      return note;
+    public String getNotes() {
+      return notes;
     }
 
     public RoutingList setName(String name) {
       this.name = name;
       return this;
     }
 
-    public RoutingList setNote(String note) {
-      this.note = note;
+    public RoutingList setNotes(String notes) {
+      this.notes = notes;
       return this;
     }
   }

diff --git a/src/main/java/org/folio/rest/core/RestClient.java b/src/main/java/org/folio/rest/core/RestClient.java
@@ -242,12 +242,14 @@ public Future<JsonObject> getAsJsonObject(RequestEntry requestEntry, RequestCont
 
   public String extractRecordId(HttpResponse<Buffer> response) {
     JsonObject body = response.bodyAsJsonObject();
-    String id;
+    String id = "";
     if (body != null && !body.isEmpty() && body.containsKey(ID)) {
       id = body.getString(ID);
     } else {
       String location = response.getHeader(LOCATION);
-      id = location.substring(location.lastIndexOf('/') + 1);
+      if (location != null) {
+        id = location.substring(location.lastIndexOf('/') + 1);
+      }
     }
     return id;
   }

diff --git a/src/main/java/org/folio/service/RoutingListsService.java b/src/main/java/org/folio/service/RoutingListsService.java
@@ -21,6 +21,8 @@ public class RoutingListsService {
 
   private static final Logger log = LogManager.getLogger();
   private static final UUID TEMPLATE_REQUEST_ID = UUID.fromString("9465105a-e8a1-470c-9817-142d33bc4fcd");
+  private static final String TEMPLATE_REQUEST_LANG = "en";
+  private static final String TEMPLATE_REQUEST_OUTPUT = "text/html";
   private static final String ROUTING_LIST_ENDPOINT = resourcesPath(ROUTING_LISTS);
   private static final String ROUTING_LIST_BY_ID_ENDPOINT = ROUTING_LIST_ENDPOINT + "/{id}";
   private static final String TEMPLATE_REQUEST_ENDPOINT = resourcesPath(TEMPLATE_REQUEST);
@@ -68,8 +70,8 @@ private TemplateProcessingRequest createTemplateRequest(RoutingList routingList,
   private TemplateProcessingRequest createBaseTemplateRequest() {
     return new TemplateProcessingRequest()
       .setTemplateId(TEMPLATE_REQUEST_ID)
-      .setLang("en")
-      .setOutputFormat("text/plain");
+      .setLang(TEMPLATE_REQUEST_LANG)
+      .setOutputFormat(TEMPLATE_REQUEST_OUTPUT);
   }
 
   private List<TemplateProcessingRequest.User> createUsersForContext(JsonObject users) {
@@ -88,7 +90,7 @@ private List<TemplateProcessingRequest.User> createUsersForContext(JsonObject us
   private TemplateProcessingRequest.RoutingList createRoutingListForContext(RoutingList routingList) {
     return new TemplateProcessingRequest.RoutingList()
       .setName(routingList.getName())
-      .setNote(routingList.getNotes());
+      .setNotes(routingList.getNotes());
   }
 
   private Future<JsonObject> postTemplateRequest(TemplateProcessingRequest templateRequest, RequestContext requestContext) {
+0 −0		common/examples/setting_collection.sample
+0 −0		common/examples/setting_get.sample
+0 −0		common/examples/setting_post.sample
+1 −1		common/schemas/setting.json
+0 −0		common/schemas/setting_collection.json
+2 −0		mod-orders-storage/examples/piece_audit_event.sample
+6 −0		mod-orders-storage/examples/piece_collection.sample
+2 −0		mod-orders-storage/examples/piece_get.sample
+2 −0		mod-orders-storage/examples/piece_post.sample
+4 −2		mod-orders-storage/examples/po_line_collection.sample
+4 −2		mod-orders-storage/examples/po_line_get.sample
+4 −2		mod-orders-storage/examples/po_line_post.sample
+7 −3		mod-orders-storage/schemas/location.json
+10 −1		mod-orders-storage/schemas/piece.json
+4 −2		mod-orders/examples/composite_po_line.sample