fix(pub-period-migration) fix ItemStorageDereferencedApi

ramls/dereferenceditem.json

@@ -9,8 +9,8 @@
     },
     "instanceRecord":{
       "type": "object",
-      "description" : "Parent instance record without the publicationPeriod.",
-      "$ref": "instance-without-pub-period.json"
+      "description" : "Parent instance record.",
+      "$ref": "instance.json"
     },
     "_version": {
       "type": "integer",

ramls/dereferenceditems-without-pub-period.json

@@ -0,0 +1,24 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "A collection of dereferenced item records",
+  "type": "object",
+  "properties": {
+    "dereferencedItems": {
+      "description": "List of dereferenced item records",
+      "id": "items",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "$ref": "dereferenceditem-without-pub-period.json"
+      }
+    },
+    "totalRecords": {
+      "description": "Estimated or exact total number of records",
+      "type": "integer"
+    }
+  },
+  "required": [
+    "dereferencedItems",
+    "totalRecords"
+  ]
+}

ramls/examples/instance_get.json

@@ -19,10 +19,6 @@
       "value": "1"
     }
   ],
-  "publicationPeriod": {
-    "start": 1999,
-    "end": 2001
-  },
   "instanceTypeId": "2b94c631-fca9-4892-a730-03ee529ffe2c",
   "tags" : {
     "tagList" : [

ramls/examples/instances_get.json

@@ -21,10 +21,6 @@
           "value": "1"
         }
       ],
-      "publicationPeriod": {
-        "start": 1999,
-        "end": 2001
-      },
       "instanceTypeId": "2b94c631-fca9-4892-a730-03ee529ffe2c",
       "tags" : {
         "tagList" : [

ramls/instance-storage-batch.raml

@@ -22,7 +22,7 @@ types:
       application/json:
         type: instancesWithoutPubPeriod
         example:
-          value: !include examples/instanceswithoutpubperiod_get.json
+          value: !include examples/instances_get.json
     responses:
       201:
         description: "At least one Instance from the list was created"

ramls/instance-storage.raml

@@ -62,10 +62,10 @@ resourceTypes:
     displayName: Instances
     type:
       collection:
-        exampleCollection: !include  examples/instanceswithoutpubperiod_get.json
+        exampleCollection: !include  examples/instances_get.json
         schemaCollection: instancesWithoutPubPeriod
         schemaItem: instanceWithoutPubPeriod
-        exampleItem: !include  examples/instancewithoutpubperiod_get.json
+        exampleItem: !include  examples/instance_get.json
     get:
       is: [pageable,
           searchable: {description: "by title (using CQL)",
@@ -91,7 +91,7 @@ resourceTypes:
     /{instanceId}:
       type:
         collection-item:
-          exampleItem: !include examples/instancewithoutpubperiod_get.json
+          exampleItem: !include examples/instance_get.json
           schema: instanceWithoutPubPeriod
       get:
         responses:

ramls/item-storage-dereferenced.raml

@@ -11,6 +11,9 @@ documentation:
 types:
   dereferencedItem: !include dereferenceditem.json
   dereferencedItems: !include dereferenceditems.json
+  dereferencedItemWithoutPubPeriod: !include dereferenceditem-without-pub-period.json
+  dereferencedItemsWithoutPubPeriod: !include dereferenceditems-without-pub-period.json
+
   errors: !include raml-util/schemas/errors.schema
 
 traits:
@@ -27,7 +30,7 @@ resourceTypes:
     type:
       collection:
         exampleCollection: !include examples/items_dereferenced_get.json
-        schemaCollection: dereferencedItems
+        schemaCollection: dereferencedItemsWithoutPubPeriod
     get:
       is: [pageable,
          searchable: {description: "using CQL (indexes for item and material type)",
@@ -37,5 +40,5 @@ resourceTypes:
       type:
         collection-item:
           exampleItem: !include examples/item_dereferenced_get.json
-          schema: dereferencedItem
+          schema: dereferencedItemWithoutPubPeriod
       get:

src/main/java/org/folio/rest/impl/ItemStorageDereferencedApi.java

@@ -17,12 +17,15 @@
 import org.folio.cql2pgjson.CQL2PgJSON;
 import org.folio.rest.annotations.Validate;
 import org.folio.rest.jaxrs.model.DereferencedItem;
+import org.folio.rest.jaxrs.model.DereferencedItemWithoutPubPeriod;
 import org.folio.rest.jaxrs.model.DereferencedItems;
+import org.folio.rest.jaxrs.model.DereferencedItemsWithoutPubPeriod;
 import org.folio.rest.jaxrs.resource.ItemStorageDereferenced;
 import org.folio.rest.persist.PgUtil;
 import org.folio.rest.persist.PostgresClient;
 import org.folio.rest.persist.cql.CQLWrapper;
 import org.folio.util.UuidUtil;
+import org.folio.utils.ObjectConverterUtils;
 
 /**
  * CRUD for Dereferenced Items.
@@ -109,8 +112,11 @@ public void getItemStorageDereferencedItems(String totalRecords, int offset, int
       itemCollection.setDereferencedItems(mappedResults);
       itemCollection.setTotalRecords(mappedResults.size());
 
+      var dereferencedItemsWithoutPubPeriod = ObjectConverterUtils.convertObject(
+        itemCollection, DereferencedItemsWithoutPubPeriod.class);
       asyncResultHandler.handle(Future.succeededFuture(
-        GetItemStorageDereferencedItemsResponse.respond200WithApplicationJson(itemCollection)));
+        GetItemStorageDereferencedItemsResponse.respond200WithApplicationJson(
+          dereferencedItemsWithoutPubPeriod)));
     });
   }
 
@@ -138,8 +144,12 @@ public void getItemStorageDereferencedItemsByItemId(
       Row row = asyncResult.result().iterator().next();
 
       DereferencedItem item = mapToDereferencedItem(row);
+      var dereferencedItemWithoutPubPeriod = ObjectConverterUtils.convertObject(
+        item, DereferencedItemWithoutPubPeriod.class);
+
       asyncResultHandler.handle(Future.succeededFuture(
-        GetItemStorageDereferencedItemsByItemIdResponse.respond200WithApplicationJson(item)));
+        GetItemStorageDereferencedItemsByItemIdResponse.respond200WithApplicationJson(
+          dereferencedItemWithoutPubPeriod)));
     });
   }
 

src/main/java/org/folio/rest/support/EndpointHandler.java

@@ -5,7 +5,7 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 import javax.ws.rs.core.Response;
-import org.folio.rest.jaxrs.model.Instances;
+import org.folio.HttpStatus;
 import org.folio.rest.jaxrs.model.InstancesWithoutPubPeriod;
 import org.folio.rest.jaxrs.resource.InstanceStorage;
 import org.folio.utils.ObjectConverterUtils;
@@ -30,17 +30,22 @@ public static Handler<AsyncResult<Response>> handle(Handler<AsyncResult<Response
 
   public static Handler<AsyncResult<Response>> handleInstances(Handler<AsyncResult<Response>> asyncResultHandler) {
     return result -> {
-      if (result.succeeded() && result.result().getStatus() == 200) {
-        Instances instances = (Instances) result.result().getEntity();
-        var instancesWithoutPubPeriod = ObjectConverterUtils.convertObject(instances, InstancesWithoutPubPeriod.class);
-
-        asyncResultHandler.handle(succeededFuture(
-          InstanceStorage.GetInstanceStorageInstancesResponse.respond200WithApplicationJson(
-            instancesWithoutPubPeriod)));
+      if (result.succeeded()) {
+        handleSuccess(asyncResultHandler, result.result());
       } else {
-        asyncResultHandler.handle(succeededFuture(
-          InstanceStorage.GetInstanceStorageInstancesResponse.respond500WithTextPlain(result.cause())));
+        EndpointFailureHandler.handleFailure(asyncResultHandler).handle(result.cause());
       }
     };
   }
+
+  private static void handleSuccess(Handler<AsyncResult<Response>> asyncResultHandler, Response result) {
+    if (result.getStatus() == HttpStatus.HTTP_OK.toInt()) {
+      var instances = result.getEntity();
+      var instancesWithoutPubPeriod = ObjectConverterUtils.convertObject(instances, InstancesWithoutPubPeriod.class);
+      asyncResultHandler.handle(succeededFuture(
+        InstanceStorage.GetInstanceStorageInstancesResponse.respond200WithApplicationJson(instancesWithoutPubPeriod)));
+    } else {
+      asyncResultHandler.handle(succeededFuture(result));
+    }
+  }
 }