diff --git a/docker/README.md b/docker/README.md index ff8a5dc2e..1db8581a9 100644 --- a/docker/README.md +++ b/docker/README.md @@ -199,7 +199,7 @@ wget --no-check-certificate \ --header="X-Okapi-Tenant: consortium" \ --header="Content-Type: application/json" \ --header="X-Okapi-Url: http://localhost:9130" \ - --post-data='{"module_to":"mod-inventory-storage-30.1.0-SNAPSHOT","parameters":[{"key":"loadReference","value":"true"}]}' \ + --post-data='{"module_to":"mod-inventory-storage-30.0.0-SNAPSHOT","parameters":[{"key":"loadReference","value":"true"}]}' \ http://localhost:8081/_/tenant ``` @@ -210,7 +210,7 @@ wget --no-check-certificate \ --header="X-Okapi-Tenant: member" \ --header="Content-Type: application/json" \ --header="X-Okapi-Url: http://localhost:9130" \ - --post-data='{"module_to":"mod-inventory-storage-30.1.0-SNAPSHOT","parameters":[{"key":"loadReference","value":"true"}]}' \ + --post-data='{"module_to":"mod-inventory-storage-30.0.0-SNAPSHOT","parameters":[{"key":"loadReference","value":"true"}]}' \ http://localhost:8081/_/tenant ``` diff --git a/mod-inventory-storage-server/src/main/java/org/folio/rest/impl/TenantRefApi.java b/mod-inventory-storage-server/src/main/java/org/folio/rest/impl/TenantRefApi.java index f5a2b17ea..597ac0261 100644 --- a/mod-inventory-storage-server/src/main/java/org/folio/rest/impl/TenantRefApi.java +++ b/mod-inventory-storage-server/src/main/java/org/folio/rest/impl/TenantRefApi.java @@ -61,7 +61,6 @@ public class TenantRefApi extends TenantAPI { "nature-of-content-terms", "statistical-code-types", "statistical-codes", - "service-points", "subject-sources", "subject-types" }; @@ -137,6 +136,7 @@ private void configureReferenceData(TenantLoading tl) { private void configureSampleData(TenantLoading tl) { tl.withKey(SAMPLE_KEY).withLead(SAMPLE_LEAD); tl.withPostIgnore(); + tl.add("service-points"); tl.add("service-points-users"); tl.add("location-units/institutions"); tl.add("location-units/campuses"); diff --git a/mod-inventory-storage-server/src/test/java/org/folio/rest/InstallUpgradeIT.java b/mod-inventory-storage-server/src/test/java/org/folio/rest/InstallUpgradeIT.java index c331be209..b7229978e 100644 --- a/mod-inventory-storage-server/src/test/java/org/folio/rest/InstallUpgradeIT.java +++ b/mod-inventory-storage-server/src/test/java/org/folio/rest/InstallUpgradeIT.java @@ -155,47 +155,6 @@ void health() { .body(is("\"OK\"")); } - @Test - void installWithReferenceDataOnly() { - setTenant("refonly"); - - JsonObject body = new JsonObject() - .put("module_to", "mod-inventory-storage-999999.0.0") - .put("parameters", new JsonArray() - .add(new JsonObject().put("key", "loadReference").put("value", "true"))); - - postTenant(body); - referenceDataSmokeTest(); - } - - private void referenceDataSmokeTest() { - // reference data loaded - when() - .get("/classification-types?limit=1000") - .then() - .statusCode(200) - .body("classificationTypes.size()", is(10)); - - when() - .get("/service-points?limit=1000") - .then() - .statusCode(200) - .body("servicepoints.size()", is(4)); - - // sample data not loaded - when() - .get("/location-units/institutions") - .then() - .statusCode(200) - .body("locinsts.size()", is(0)); - - when() - .get("/locations") - .then() - .statusCode(200) - .body("locations.size()", is(0)); - } - @Test void installAndUpgrade() { when() diff --git a/reference-data/service-points/circulation-desk-1.json b/sample-data/service-points/circulation-desk-1.json similarity index 100% rename from reference-data/service-points/circulation-desk-1.json rename to sample-data/service-points/circulation-desk-1.json diff --git a/reference-data/service-points/circulation-desk-2.json b/sample-data/service-points/circulation-desk-2.json similarity index 100% rename from reference-data/service-points/circulation-desk-2.json rename to sample-data/service-points/circulation-desk-2.json diff --git a/reference-data/service-points/interim-service-point.json b/sample-data/service-points/interim-service-point.json similarity index 100% rename from reference-data/service-points/interim-service-point.json rename to sample-data/service-points/interim-service-point.json diff --git a/reference-data/service-points/online.json b/sample-data/service-points/online.json similarity index 100% rename from reference-data/service-points/online.json rename to sample-data/service-points/online.json