From 31a805e3e782a6a604acf8f952a8c004c7b2d265 Mon Sep 17 00:00:00 2001 From: Volodymyr Rohach Date: Tue, 28 May 2024 13:10:47 +0300 Subject: [PATCH] MODSOURCE-773: MARC Search omits suppressed from discovery records in default search. (#624) * MODSOURCE-773: MARC Search omits suppressed from discovery records in default search. * MODSOURCE-773: Useless condition removed. * MODSOURCE-773: NEWS updated. * MODSOURCE-773: TEMPORARY SCHEMA CHANGE. REMOVE AFTER TESTING ON RANCHER! * MODSOURCE-773: REVERTING CHANGE. * MODSOURCE-773: Updating raml-storage. * MODSOURCE-773: Updating raml-storage. * MODSOURCE-773: Compilation errors due to schema profile wrappers changes - fixed. * MODSOURCE-773: Compilation errors due to schema profile wrappers changes in tests - fixed . * MODSOURCE-773: Schema updated. --- NEWS.md | 1 + mod-source-record-storage-server/pom.xml | 2 +- .../services/RecordSearchParameters.java | 6 +-- .../AbstractPostProcessingEventHandler.java | 2 +- .../actions/AbstractDeleteEventHandler.java | 2 +- .../AbstractUpdateModifyEventHandler.java | 2 +- .../match/AbstractMarcMatchEventHandler.java | 3 +- .../rest/impl/SourceStorageStreamApiTest.java | 39 ++++++++++++++++++- .../MarcAuthorityDeleteEventHandlerTest.java | 2 +- .../MarcAuthorityMatchEventHandlerTest.java | 4 +- ...AuthorityUpdateModifyEventHandlerTest.java | 7 ++-- .../MarcBibUpdateModifyEventHandlerTest.java | 7 ++-- .../MarcHoldingsMatchEventHandlerTest.java | 4 +- ...cHoldingsUpdateModifyEventHandlerTest.java | 7 ++-- .../caches/JobProfileSnapshotCacheTest.java | 5 ++- ...thorityPostProcessingEventHandlerTest.java | 4 +- ...oldingsPostProcessingEventHandlerTest.java | 4 +- ...nstancePostProcessingEventHandlerTest.java | 7 +--- .../DataImportConsumersVerticleTest.java | 6 +-- ramls/raml-storage | 2 +- 20 files changed, 74 insertions(+), 42 deletions(-) diff --git a/NEWS.md b/NEWS.md index a0d53cba8..cd1dbeba7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,7 @@ * [MODSOURCE-767](https://folio-org.atlassian.net/browse/MODSOURCE-767) Single record overlay creates duplicate OCLC#/035 * [MODSOURCE-756](https://issues.folio.org/browse/MODSOURCE-756) After setting an instance as marked for deletion it is no longer editable in quickmarc * [MODSOURCE-753](https://folio-org.atlassian.net/browse/MODSOURCE-753) Change SQL query parameters for MARC Search +* [MODSOURCE-773](https://folio-org.atlassian.net/browse/MODSOURCE-773) MARC Search omits suppressed from discovery records in default search ## 2024-03-20 5.8.0 * [MODSOURCE-733](https://issues.folio.org/browse/MODSOURCE-733) Reduce Memory Allocation of Strings diff --git a/mod-source-record-storage-server/pom.xml b/mod-source-record-storage-server/pom.xml index 10153217c..b9329db0b 100644 --- a/mod-source-record-storage-server/pom.xml +++ b/mod-source-record-storage-server/pom.xml @@ -182,7 +182,7 @@ org.folio data-import-processing-core - 4.2.0 + 4.3.0-SNAPSHOT io.vertx diff --git a/mod-source-record-storage-server/src/main/java/org/folio/services/RecordSearchParameters.java b/mod-source-record-storage-server/src/main/java/org/folio/services/RecordSearchParameters.java index c112d1570..fdcc45af2 100644 --- a/mod-source-record-storage-server/src/main/java/org/folio/services/RecordSearchParameters.java +++ b/mod-source-record-storage-server/src/main/java/org/folio/services/RecordSearchParameters.java @@ -13,7 +13,7 @@ public class RecordSearchParameters { private String fieldsSearchExpression; private Record.RecordType recordType; private boolean deleted; - private boolean suppressedFromDiscovery; + private Boolean suppressedFromDiscovery; private Integer limit; private Integer offset; @@ -65,11 +65,11 @@ public void setDeleted(boolean deleted) { this.deleted = deleted; } - public boolean isSuppressedFromDiscovery() { + public Boolean isSuppressedFromDiscovery() { return suppressedFromDiscovery; } - public void setSuppressedFromDiscovery(boolean suppressedFromDiscovery) { + public void setSuppressedFromDiscovery(Boolean suppressedFromDiscovery) { this.suppressedFromDiscovery = suppressedFromDiscovery; } diff --git a/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/AbstractPostProcessingEventHandler.java b/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/AbstractPostProcessingEventHandler.java index 61e54f77a..6c550f296 100644 --- a/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/AbstractPostProcessingEventHandler.java +++ b/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/AbstractPostProcessingEventHandler.java @@ -44,7 +44,7 @@ import static org.folio.dao.util.RecordDaoUtil.filterRecordByExternalId; import static org.folio.dao.util.RecordDaoUtil.filterRecordByNotSnapshotId; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_INVENTORY_INSTANCE_UPDATED_READY_FOR_POST_PROCESSING; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; import static org.folio.rest.util.OkapiConnectionParams.OKAPI_TENANT_HEADER; import static org.folio.rest.util.OkapiConnectionParams.OKAPI_TOKEN_HEADER; import static org.folio.rest.util.OkapiConnectionParams.OKAPI_URL_HEADER; diff --git a/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/actions/AbstractDeleteEventHandler.java b/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/actions/AbstractDeleteEventHandler.java index 0aa802749..7cd92d8bc 100644 --- a/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/actions/AbstractDeleteEventHandler.java +++ b/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/actions/AbstractDeleteEventHandler.java @@ -10,6 +10,7 @@ import org.folio.processing.events.services.handler.EventHandler; import org.folio.processing.exceptions.EventProcessingException; import org.folio.rest.jaxrs.model.ExternalIdsHolder; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper; import org.folio.rest.jaxrs.model.Record; import org.folio.rest.jooq.enums.RecordState; @@ -21,7 +22,6 @@ import static java.util.Objects.isNull; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.folio.ActionProfile.Action.DELETE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; /** * The abstraction handles the DELETE action diff --git a/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/actions/AbstractUpdateModifyEventHandler.java b/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/actions/AbstractUpdateModifyEventHandler.java index aa0b30cb6..fa37481c7 100644 --- a/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/actions/AbstractUpdateModifyEventHandler.java +++ b/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/actions/AbstractUpdateModifyEventHandler.java @@ -38,7 +38,7 @@ import static java.util.Objects.nonNull; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.folio.ActionProfile.Action.UPDATE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; import static org.folio.services.handlers.match.AbstractMarcMatchEventHandler.CENTRAL_TENANT_ID; import static org.folio.services.util.AdditionalFieldsUtil.HR_ID_FROM_FIELD; import static org.folio.services.util.AdditionalFieldsUtil.addControlledFieldToMarcRecord; diff --git a/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/match/AbstractMarcMatchEventHandler.java b/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/match/AbstractMarcMatchEventHandler.java index d7b222c46..ac9c86db6 100644 --- a/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/match/AbstractMarcMatchEventHandler.java +++ b/mod-source-record-storage-server/src/main/java/org/folio/services/handlers/match/AbstractMarcMatchEventHandler.java @@ -43,8 +43,7 @@ import static org.folio.dao.util.RecordDaoUtil.filterRecordByRecordId; import static org.folio.dao.util.RecordDaoUtil.filterRecordByState; import static org.folio.rest.jaxrs.model.MatchExpression.DataValueType.VALUE_FROM_RECORD; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE; - +import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE; /** * Abstract handler for MARC-MARC matching/not-matching of Marc record by specific fields */ diff --git a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageStreamApiTest.java b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageStreamApiTest.java index fc84e4a7a..5510b7da7 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageStreamApiTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageStreamApiTest.java @@ -1124,7 +1124,7 @@ public void shouldReturnEmptyResponseOnSearchMarcRecordIdsWhenRecordWasSuppresse } @Test - public void shouldReturnIdOnResponseOnSearchMarcRecordIdsWhenRecordWasSuppressed(TestContext testContext) { + public void shouldReturnRecordOnSearchMarcRecordWhenRecordWasSuppressedAndSetSuppressFromDiscoveryNotSetInRequest(TestContext testContext) { // given Async async = testContext.async(); Record suppressedRecord = new Record() @@ -1143,7 +1143,42 @@ public void shouldReturnIdOnResponseOnSearchMarcRecordIdsWhenRecordWasSuppressed MarcRecordSearchRequest searchRequest = new MarcRecordSearchRequest(); searchRequest.setLeaderSearchExpression("p_05 = 'c' and p_06 = 'c' and p_07 = 'm'"); searchRequest.setFieldsSearchExpression("001.value = '393893' and 005.value ^= '2014110' and 035.ind1 = '#'"); - searchRequest.setSuppressFromDiscovery(true); + // when + ExtractableResponse response = RestAssured.given() + .spec(spec) + .body(searchRequest) + .when() + .post("/source-storage/stream/marc-record-identifiers") + .then() + .extract(); + JsonObject responseBody = new JsonObject(response.body().asString()); + // then + assertEquals(HttpStatus.SC_OK, response.statusCode()); + assertEquals(1, responseBody.getJsonArray("records").size()); + assertEquals(1, responseBody.getInteger("totalCount").intValue()); + async.complete(); + } + + @Test + public void shouldReturnRecordOnSearchMarcRecordWhenRecordWasNotSuppressedAndSetSuppressFromDiscoveryNotSetInRequest(TestContext testContext) { + // given + Async async = testContext.async(); + Record suppressedRecord = new Record() + .withId(marc_bib_record_2.getId()) + .withSnapshotId(snapshot_2.getJobExecutionId()) + .withRecordType(Record.RecordType.MARC_BIB) + .withRawRecord(marc_bib_record_2.getRawRecord()) + .withParsedRecord(marc_bib_record_2.getParsedRecord()) + .withMatchedId(marc_bib_record_2.getMatchedId()) + .withState(Record.State.ACTUAL) + .withAdditionalInfo(new AdditionalInfo().withSuppressDiscovery(false)) + .withExternalIdsHolder(marc_bib_record_2.getExternalIdsHolder()); + postSnapshots(testContext, snapshot_2); + postRecords(testContext, suppressedRecord); + + MarcRecordSearchRequest searchRequest = new MarcRecordSearchRequest(); + searchRequest.setLeaderSearchExpression("p_05 = 'c' and p_06 = 'c' and p_07 = 'm'"); + searchRequest.setFieldsSearchExpression("001.value = '393893' and 005.value ^= '2014110' and 035.ind1 = '#'"); // when ExtractableResponse response = RestAssured.given() .spec(spec) diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityDeleteEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityDeleteEventHandlerTest.java index 656cccc04..03fcd78fe 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityDeleteEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityDeleteEventHandlerTest.java @@ -31,7 +31,7 @@ import static org.folio.ActionProfile.Action.DELETE; import static org.folio.ActionProfile.Action.UPDATE; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_AUTHORITY_RECORD_DELETED; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_AUTHORITY; @RunWith(VertxUnitRunner.class) diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityMatchEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityMatchEventHandlerTest.java index 86b9c126b..811d3d210 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityMatchEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityMatchEventHandlerTest.java @@ -47,8 +47,8 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_AUTHORITY_RECORD_MATCHED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_AUTHORITY_RECORD_NOT_MATCHED; import static org.folio.rest.jaxrs.model.MatchExpression.DataValueType.VALUE_FROM_RECORD; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_AUTHORITY; @RunWith(VertxUnitRunner.class) diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityUpdateModifyEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityUpdateModifyEventHandlerTest.java index dfd6e55fb..2452c0ec6 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityUpdateModifyEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcAuthorityUpdateModifyEventHandlerTest.java @@ -2,14 +2,13 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static org.folio.ActionProfile.Action.MODIFY; import static org.folio.DataImportEventTypes.DI_SRS_MARC_BIB_RECORD_CREATED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_AUTHORITY_RECORD_UPDATED; import static org.folio.rest.jaxrs.model.EntityType.MARC_AUTHORITY; import static org.folio.rest.jaxrs.model.MappingDetail.MarcMappingOption.UPDATE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_BIB; import static org.folio.services.MarcBibUpdateModifyEventHandlerTest.getParsedContentWithoutLeaderAndDate; diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcBibUpdateModifyEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcBibUpdateModifyEventHandlerTest.java index 0ee9d76d3..a0c57ce07 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcBibUpdateModifyEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcBibUpdateModifyEventHandlerTest.java @@ -14,9 +14,10 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_BIB_RECORD_UPDATED; import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC; import static org.folio.rest.jaxrs.model.MappingDetail.MarcMappingOption.UPDATE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; + +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_BIB; import static org.folio.services.util.AdditionalFieldsUtil.TAG_005; diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcHoldingsMatchEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcHoldingsMatchEventHandlerTest.java index 388f82f94..596ec23b1 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcHoldingsMatchEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcHoldingsMatchEventHandlerTest.java @@ -7,8 +7,8 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_HOLDINGS_RECORD_NOT_MATCHED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_HOLDING_RECORD_CREATED; import static org.folio.rest.jaxrs.model.MatchExpression.DataValueType.VALUE_FROM_RECORD; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_HOLDING; import java.io.IOException; diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcHoldingsUpdateModifyEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcHoldingsUpdateModifyEventHandlerTest.java index a76da101d..9e0bee052 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/MarcHoldingsUpdateModifyEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/MarcHoldingsUpdateModifyEventHandlerTest.java @@ -2,15 +2,14 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static org.folio.ActionProfile.Action.MODIFY; import static org.folio.DataImportEventTypes.DI_SRS_MARC_BIB_RECORD_CREATED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_HOLDINGS_RECORD_MODIFIED_READY_FOR_POST_PROCESSING; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_HOLDINGS_RECORD_UPDATED; import static org.folio.rest.jaxrs.model.EntityType.MARC_HOLDINGS; import static org.folio.rest.jaxrs.model.MappingDetail.MarcMappingOption.UPDATE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_BIB; import static org.folio.services.MarcBibUpdateModifyEventHandlerTest.getParsedContentWithoutLeaderAndDate; diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/caches/JobProfileSnapshotCacheTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/caches/JobProfileSnapshotCacheTest.java index 52836053c..47ad85c06 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/caches/JobProfileSnapshotCacheTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/caches/JobProfileSnapshotCacheTest.java @@ -27,8 +27,9 @@ import java.util.UUID; import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; + @RunWith(VertxUnitRunner.class) public class JobProfileSnapshotCacheTest { diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AuthorityPostProcessingEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AuthorityPostProcessingEventHandlerTest.java index 88d23f72f..1f1b0510e 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AuthorityPostProcessingEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AuthorityPostProcessingEventHandlerTest.java @@ -6,8 +6,8 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_INVENTORY_AUTHORITY_UPDATED_READY_FOR_POST_PROCESSING; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_AUTHORITY_RECORD_CREATED; import static org.folio.rest.jaxrs.model.EntityType.AUTHORITY; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_AUTHORITY; import static org.folio.services.util.AdditionalFieldsUtil.TAG_005; diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/HoldingsPostProcessingEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/HoldingsPostProcessingEventHandlerTest.java index ec677b18d..bfa9a5be8 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/HoldingsPostProcessingEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/HoldingsPostProcessingEventHandlerTest.java @@ -5,8 +5,8 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_HOLDING_RECORD_CREATED; import static org.folio.rest.jaxrs.model.EntityType.HOLDINGS; import static org.folio.rest.jaxrs.model.EntityType.MARC_HOLDINGS; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_HOLDING; import static org.folio.services.util.AdditionalFieldsUtil.TAG_005; diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/InstancePostProcessingEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/InstancePostProcessingEventHandlerTest.java index 86152115f..6625fe1a4 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/InstancePostProcessingEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/InstancePostProcessingEventHandlerTest.java @@ -42,9 +42,6 @@ import org.mockito.MockitoAnnotations; import java.io.IOException; -import java.time.Instant; -import java.time.ZoneId; -import java.time.ZonedDateTime; import java.util.HashMap; import java.util.List; import java.util.Optional; @@ -58,8 +55,8 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_ORDER_CREATED_READY_FOR_POST_PROCESSING; import static org.folio.rest.jaxrs.model.EntityType.INSTANCE; import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_BIB; import static org.folio.services.handlers.InstancePostProcessingEventHandler.POST_PROCESSING_RESULT_EVENT; import static org.folio.services.util.AdditionalFieldsUtil.TAG_005; diff --git a/mod-source-record-storage-server/src/test/java/org/folio/verticle/consumers/DataImportConsumersVerticleTest.java b/mod-source-record-storage-server/src/test/java/org/folio/verticle/consumers/DataImportConsumersVerticleTest.java index 7e58349be..53ffd9e32 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/verticle/consumers/DataImportConsumersVerticleTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/verticle/consumers/DataImportConsumersVerticleTest.java @@ -7,7 +7,7 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_BIB_RECORD_CREATED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_BIB_RECORD_MODIFIED_READY_FOR_POST_PROCESSING; import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; import static org.folio.services.MarcBibUpdateModifyEventHandlerTest.getParsedContentWithoutLeaderAndDate; import static org.junit.Assert.assertEquals; @@ -17,8 +17,8 @@ import static org.folio.kafka.KafkaTopicNameHelper.getDefaultNameSpace; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_MARC_FOR_DELETE_RECEIVED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_SRS_MARC_AUTHORITY_RECORD_DELETED; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_BIB; import static org.junit.Assert.assertNotNull; diff --git a/ramls/raml-storage b/ramls/raml-storage index d9a129bbf..8f35e1fa5 160000 --- a/ramls/raml-storage +++ b/ramls/raml-storage @@ -1 +1 @@ -Subproject commit d9a129bbf6d5e39d3cc4dc2cb2a2a3824b6a0a0a +Subproject commit 8f35e1fa5902bab4792a2b4a5511e9eb2a860aef