CROSSLINK-277 GVI

broker/README.md

@@ -101,9 +101,12 @@ Configuration is provided via environment variables:
 | `CLIENT_DELAY`            | Delay duration for outgoing ISO18626 messages                                         | `0ms`                                     |
 | `SHUTDOWN_DELAY`          | Delay duration for graceful shutdown (in-flight connections)                          | `15s`                                     |
 | `MAX_MESSAGE_SIZE`        | Max accepted ISO18626 message size                                                    | `100KB`                                   |
-| `HOLDINGS_ADAPTER`        | Holdings lookup method: `mock` or `sru`                                               | `mock`                                    |
+| `HOLDINGS_ADAPTER`        | Holdings lookup method: `mock`, `sru` or `consortia`                                  | `mock`                                    |
 | `HOLDINGS_SRU_URL`        | Comma separated list of URLs when `HOLDINGS_ADAPTER` is `sru`                         | `http://localhost:8081/sru`               |
 | `HOLDINGS_ISXN_LOOKUP`    | Whether to use ISBN/ISSN lookup for `sru` method                                      | `false`                                   |
+| `HOLDINGS_FORMAT`         | Parser for SRU holdings: `reservoir`, `marc`, `opac` or `MARC-21plus-1`               | `reservoir`                               |
+| `CONSORTIA_SYMBOL`        | Designates peer for which configuration is used for consortia. At this time, it is    |  (empty value)                            |
+|                           | used when `HOLDINGS_ADAPTER` = `consortia`.                                           |                                           |
 | `DIRECTORY_ADAPTER`       | Directory lookup method: `mock` or `api`                                              | `mock`                                    |
 | `DIRECTORY_API_URL`       | Comma separated list of URLs when `DIRECTORY_ADAPTER` is `api`                        | `http://localhost:8081/directory/entries` |
 | `AVAILABILITY_ADAPTER`    | Availability adapter: `mock` , `zoom`, `metaproxy`.                                   | `zoom`                                    |

broker/app/app.go

@@ -13,7 +13,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/indexdata/crosslink/broker/availability"
+	"github.com/indexdata/crosslink/broker/holdings"
 	prapi "github.com/indexdata/crosslink/broker/patron_request/api"
 	pr_db "github.com/indexdata/crosslink/broker/patron_request/db"
 	"github.com/indexdata/crosslink/broker/patron_request/proapi"
@@ -64,6 +64,8 @@ var LOG_LEVEL = utils.GetEnv("LOG_LEVEL", "INFO")
 var HOLDINGS_ADAPTER = utils.GetEnv("HOLDINGS_ADAPTER", "mock")
 var HOLDINGS_SRU_URL = common.GetEnvWithDeprecated("HOLDINGS_SRU_URL", "SRU_URL", "http://localhost:8081/sru")
 var HOLDINGS_ISXN_LOOKUP, _ = utils.GetEnvBool("HOLDINGS_ISXN_LOOKUP", false)
+var HOLDINGS_FORMAT = utils.GetEnv("HOLDINGS_FORMAT", "reservoir")
+var CONSORTIA_SYMBOL = utils.GetEnv("CONSORTIA_SYMBOL", "")
 var DIRECTORY_ADAPTER = utils.GetEnv("DIRECTORY_ADAPTER", "mock")
 var AVAILABILITY_ADAPTER = utils.GetEnv("AVAILABILITY_ADAPTER", "zoom")
 var DIRECTORY_API_URL = utils.GetEnv("DIRECTORY_API_URL", "http://localhost:8081/directory/entries")
@@ -132,10 +134,11 @@ func configLog() slog.Handler {
 
 func Init(ctx context.Context) (Context, error) {
 	appCtx.Logger().Info("starting " + vcs.GetSignature())
-	holdingsAdapter, err := adapter.CreateHoldingsLookupAdapter(map[string]any{
-		adapter.HoldingsAdapter:    HOLDINGS_ADAPTER,
-		adapter.HoldingsSruURL:     HOLDINGS_SRU_URL,
-		adapter.HoldingsIsxnLookup: HOLDINGS_ISXN_LOOKUP,
+	holdingsAdapter, err := holdings.CreateHoldingsLookupShared(map[string]any{
+		holdings.HoldingsAdapter:    HOLDINGS_ADAPTER,
+		holdings.HoldingsSruURL:     HOLDINGS_SRU_URL,
+		holdings.HoldingsIsxnLookup: HOLDINGS_ISXN_LOOKUP,
+		holdings.HoldingsFormat:     HOLDINGS_FORMAT,
 	})
 	if err != nil {
 		return Context{}, err
@@ -174,11 +177,11 @@ func Init(ctx context.Context) (Context, error) {
 	prMessageHandler := prservice.CreatePatronRequestMessageHandler(prRepo, eventRepo, illRepo, eventBus)
 	iso18626Handler := handler.CreateIso18626Handler(eventBus, eventRepo, illRepo, dirAdapter)
 	lmsCreator := lms.NewLmsCreator(illRepo, dirAdapter)
-	availabilityCreator := availability.NewAvailabilityCreator(AVAILABILITY_ADAPTER, METAPROXY_URL)
+	availabilityCreator := holdings.NewAvailabilityCreator(AVAILABILITY_ADAPTER, METAPROXY_URL)
 	prActionService := prservice.CreatePatronRequestActionService(prRepo, eventBus, &iso18626Handler, lmsCreator)
 	prMessageHandler.SetAutoActionRunner(prActionService)
 	iso18626Client := client.CreateIso18626Client(eventBus, illRepo, prMessageHandler, MAX_MESSAGE_SIZE, delay)
-	supplierLocator := service.CreateSupplierLocator(eventBus, illRepo, dirAdapter, holdingsAdapter, availabilityCreator)
+	supplierLocator := service.CreateSupplierLocator(eventBus, illRepo, dirAdapter, holdingsAdapter, availabilityCreator, CONSORTIA_SYMBOL)
 	workflowManager := service.CreateWorkflowManager(eventBus, illRepo, service.WorkflowConfig{})
 	tenantResolver := tenant.NewResolver().WithIllRepo(illRepo).WithLookupAdapter(dirAdapter).WithTenantToSymbol(TENANT_TO_SYMBOL)
 	apiHandler := api.NewApiHandler(eventRepo, illRepo, *tenantResolver, API_PAGE_SIZE)

broker/holdings/adapter_metaproxy.go

@@ -0,0 +1,22 @@
+package holdings
+
+import (
+	"net/http"
+
+	"github.com/indexdata/crosslink/directory"
+)
+
+type MetaproxyAvailabilityAdapter struct {
+	holdingsLookupAdapter LookupAdapter
+}
+
+func NewMetaproxyAvailabilityAdapter(config directory.ZoomConfig, metaproxyUrl string, queryBuilder LookupQueryBuilder, holdingsParser HoldingsParser) (LookupAdapter, error) {
+	a := &MetaproxyAvailabilityAdapter{
+		holdingsLookupAdapter: CreateSruHoldingsLookupAdapter(http.DefaultClient, []string{metaproxyUrl}, config.Address, queryBuilder, holdingsParser, "marcxml"),
+	}
+	return a, nil
+}
+
+func (a *MetaproxyAvailabilityAdapter) Lookup(params LookupParams) ([]Holding, string, error) {
+	return a.holdingsLookupAdapter.Lookup(params)
+}

broker/availability/availability_mock.go → broker/holdings/adapter_mock.go

@@ -1,21 +1,20 @@
-package availability
+package holdings
 
 import (
 	"fmt"
 	"strings"
 
-	"github.com/indexdata/crosslink/broker/adapter"
 	"github.com/indexdata/crosslink/directory"
 )
 
 type MockAvailabilityAdapter struct {
 	Err      error
-	Holdings []adapter.Holding
+	Holdings []Holding
 }
 
-func NewMockAvailabilityAdapter(config directory.AvailabilityConfig) (adapter.LookupAdapter, error) {
-	if config.Z3950 != nil && config.Z3950.Options != nil {
-		options := *config.Z3950.Options
+func NewMockAvailabilityAdapter(config directory.AvailabilityConfig) (LookupAdapter, error) {
+	if config.Zoom != nil && config.Zoom.Options != nil {
+		options := *config.Zoom.Options
 		// For testing purposes, we can use the presence of "adapter-error" in options to trigger an error response
 		if val, ok := options["adapter-error"]; ok && strings.ToLower(val) == "true" {
 			return nil, fmt.Errorf("mock error triggered by config")
@@ -28,7 +27,7 @@ func NewMockAvailabilityAdapter(config directory.AvailabilityConfig) (adapter.Lo
 		}
 		if val, ok := options["location"]; ok {
 			return &MockAvailabilityAdapter{
-				Holdings: []adapter.Holding{
+				Holdings: []Holding{
 					{
 						Location: val,
 					},
@@ -39,7 +38,7 @@ func NewMockAvailabilityAdapter(config directory.AvailabilityConfig) (adapter.Lo
 	return &MockAvailabilityAdapter{}, nil
 }
 
-func (a *MockAvailabilityAdapter) Lookup(params adapter.LookupParams) ([]adapter.Holding, string, error) {
+func (a *MockAvailabilityAdapter) Lookup(params LookupParams) ([]Holding, string, error) {
 	if a.Err != nil {
 		return nil, "", a.Err
 	}

broker/adapter/mock_holdings.go → broker/holdings/adapter_mock_shared.go

@@ -1,4 +1,4 @@
-package adapter
+package holdings
 
 import (
 	"errors"
@@ -10,6 +10,7 @@ import (
 type MockHoldingsLookupAdapter struct {
 }
 
+// the original mock holdings adapter that we used for shared index testing
 func (m *MockHoldingsLookupAdapter) Lookup(params LookupParams) ([]Holding, string, error) {
 	ids := strings.Split(params.Identifier, ";")
 	i := 1