Skip to content

Just one function to get items for patron request #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdickmeiss merged 2 commits into from
Mar 11, 2026
Merged

Just one function to get items for patron request #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0248ae8
Just one function to get items for patron request
adamdickmeiss Mar 11, 2026
8e39cbd
Update broker/patron_request/service/action.go
adamdickmeiss Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions broker/patron_request/service/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,25 +320,12 @@ func (a *PatronRequestActionService) sendBorrowingRequest(ctx common.ExtendedCon
return actionExecutionResult{status: events.EventStatusSuccess, result: &result, outcome: ActionOutcomeSuccess, pr: pr}
}

func (a *PatronRequestActionService) getFirstItem(ctx common.ExtendedContext, pr pr_db.PatronRequest) ([]pr_db.Item, error) {
items, err := a.prRepo.GetItemsByPrId(ctx, pr.ID)
if err != nil {
return nil, err
}
if len(items) == 0 {
return nil, errors.New("no items found for PR ID")
} else if len(items) > 1 {
ctx.Logger().Warn("multiple items found for PR ID, only the first one will be used", "prId", pr.ID, "itemCount", len(items))
}
return items, nil
}

func (a *PatronRequestActionService) receiveBorrowingRequest(ctx common.ExtendedContext, pr pr_db.PatronRequest, lmsAdapter lms.LmsAdapter, illRequest iso18626.Request) actionExecutionResult {
patron := ""
if pr.Patron.Valid {
patron = pr.Patron.String
}
items, err := a.getFirstItem(ctx, pr)
items, err := a.getItems(ctx, pr)
if err != nil {
status, result := events.LogErrorAndReturnResult(ctx, "receiveBorrowingRequest failed to get items by PR ID", err)
return actionExecutionResult{status: status, result: result, outcome: ActionOutcomeFailure, pr: pr}
Expand Down Expand Up @@ -378,7 +365,7 @@ func (a *PatronRequestActionService) checkoutBorrowingRequest(ctx common.Extende
if pr.Patron.Valid {
patron = pr.Patron.String
}
items, err := a.getFirstItem(ctx, pr)
items, err := a.getItems(ctx, pr)
if err != nil {
status, result := events.LogErrorAndReturnResult(ctx, "checkoutBorrowingRequest failed to get items by PR ID", err)
return actionExecutionResult{status: status, result: result, outcome: ActionOutcomeFailure, pr: pr}
Expand All @@ -394,7 +381,7 @@ func (a *PatronRequestActionService) checkoutBorrowingRequest(ctx common.Extende
}

func (a *PatronRequestActionService) checkinBorrowingRequest(ctx common.ExtendedContext, pr pr_db.PatronRequest, lmsAdapter lms.LmsAdapter, illRequest iso18626.Request) actionExecutionResult {
items, err := a.getFirstItem(ctx, pr)
items, err := a.getItems(ctx, pr)
if err != nil {
status, result := events.LogErrorAndReturnResult(ctx, "checkinBorrowingRequest failed to get items by PR ID", err)
return actionExecutionResult{status: status, result: result, outcome: ActionOutcomeFailure, pr: pr}
Expand All @@ -409,7 +396,7 @@ func (a *PatronRequestActionService) checkinBorrowingRequest(ctx common.Extended
}

func (a *PatronRequestActionService) shipReturnBorrowingRequest(ctx common.ExtendedContext, pr pr_db.PatronRequest, lmsAdapter lms.LmsAdapter, illRequest iso18626.Request) actionExecutionResult {
items, err := a.getFirstItem(ctx, pr)
items, err := a.getItems(ctx, pr)
if err != nil {
status, result := events.LogErrorAndReturnResult(ctx, "shipReturnBorrowingRequest failed to get items by PR ID", err)
return actionExecutionResult{status: status, result: result, outcome: ActionOutcomeFailure, pr: pr}
Expand Down Expand Up @@ -560,7 +547,7 @@ func (a *PatronRequestActionService) shipLenderRequest(ctx common.ExtendedContex
userId := lmsAdapter.InstitutionalPatron(pr.RequesterSymbol.String)
externalReferenceValue := ""

items, err := a.getItemsLender(ctx, pr)
items, err := a.getItems(ctx, pr)
if err != nil {
status, result := events.LogErrorAndReturnResult(ctx, "no items for shipping in the request", err)
return actionExecutionResult{status: status, result: result, outcome: ActionOutcomeFailure, pr: pr}
Expand Down Expand Up @@ -595,7 +582,7 @@ func encodeItemsNote(items []pr_db.Item) string {
}

func (a *PatronRequestActionService) markReceivedLenderRequest(ctx common.ExtendedContext, pr pr_db.PatronRequest, lmsAdapter lms.LmsAdapter, illRequest iso18626.Request) actionExecutionResult {
items, err := a.getItemsLender(ctx, pr)
items, err := a.getItems(ctx, pr)
if err != nil {
status, result := events.LogErrorAndReturnResult(ctx, "no items for check-in in the request", err)
return actionExecutionResult{status: status, result: result, outcome: ActionOutcomeFailure, pr: pr}
Expand Down Expand Up @@ -685,13 +672,13 @@ func (rcw *ResponseCaptureWriter) Header() http.Header {
return http.Header{}
}

func (a *PatronRequestActionService) getItemsLender(ctx common.ExtendedContext, pr pr_db.PatronRequest) ([]pr_db.Item, error) {
func (a *PatronRequestActionService) getItems(ctx common.ExtendedContext, pr pr_db.PatronRequest) ([]pr_db.Item, error) {
items, err := a.prRepo.GetItemsByPrId(ctx, pr.ID)
if err != nil {
return nil, fmt.Errorf("failed to get items: %w", err)
}
if len(items) == 0 {
return nil, errors.New("no item found for patron request")
return nil, errors.New("no items found for patron request")
}
if len(items) > 1 {
ctx.Logger().Warn("multiple items found for patron request, using the first one", "itemCount", len(items))
Expand Down
6 changes: 3 additions & 3 deletions broker/patron_request/service/action_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ func TestHandleInvokeActionReceiveNoItem(t *testing.T) {
status, resultData := prAction.handleInvokeAction(appCtx, events.Event{PatronRequestID: patronRequestId, EventData: events.EventData{CommonEventData: events.CommonEventData{Action: &action}}})
assert.Equal(t, events.EventStatusError, status)
assert.Equal(t, "receiveBorrowingRequest failed to get items by PR ID", resultData.EventError.Message)
assert.Equal(t, "no items found for PR ID", resultData.EventError.Cause)
assert.Equal(t, "no items found for patron request", resultData.EventError.Cause)
}

func TestHandleInvokeActionReceiveItemLookupFailure(t *testing.T) {
Expand All @@ -234,7 +234,7 @@ func TestHandleInvokeActionReceiveItemLookupFailure(t *testing.T) {
status, resultData := prAction.handleInvokeAction(appCtx, events.Event{PatronRequestID: patronRequestId, EventData: events.EventData{CommonEventData: events.CommonEventData{Action: &action}}})
assert.Equal(t, events.EventStatusError, status)
assert.Equal(t, "receiveBorrowingRequest failed to get items by PR ID", resultData.EventError.Message)
assert.Equal(t, "assert.AnError general error for testing", resultData.EventError.Cause)
assert.Equal(t, "failed to get items: assert.AnError general error for testing", resultData.EventError.Cause)
}

func TestHandleInvokeActionCheckOutOK(t *testing.T) {
Expand Down Expand Up @@ -689,7 +689,7 @@ func TestHandleInvokeLenderActionShipGetItemsByIdEmpty(t *testing.T) {

assert.Equal(t, events.EventStatusError, status)
assert.Equal(t, "no items for shipping in the request", resultData.EventError.Message)
assert.Equal(t, "no item found for patron request", resultData.EventError.Cause)
assert.Equal(t, "no items found for patron request", resultData.EventError.Cause)
}

func TestHandleInvokeLenderActionShipLmsFailed(t *testing.T) {
Expand Down
Loading