Preserve user provided ILL request, only force sensitive fields

broker/patron_request/service/action.go

@@ -1,6 +1,7 @@
 package prservice
 
 import (
+	"encoding/json"
 	"encoding/xml"
 	"errors"
 	"fmt"
@@ -301,20 +302,25 @@ func (a *PatronRequestActionService) sendBorrowingRequest(ctx common.ExtendedCon
 		return actionExecutionResult{status: status, result: eventResult, outcome: ActionOutcomeFailure, pr: pr}
 	}
 
-	var illMessage = iso18626.ISO18626Message{
-		Request: &iso18626.Request{
-			Header: iso18626.Header{
-				RequestingAgencyId: iso18626.TypeAgencyId{
-					AgencyIdType: iso18626.TypeSchemeValuePair{
-						Text: requesterSymbol[0],
-					},
-					AgencyIdValue: requesterSymbol[1],
-				},
-				RequestingAgencyRequestId: pr.ID,
-			},
-			PatronInfo:        &iso18626.PatronInfo{PatronId: pr.Patron.String},
-			BibliographicInfo: request.BibliographicInfo,
+	illRequest, err := deepCopyISO18626Request(request)
+	if err != nil {
+		status, eventResult := events.LogErrorAndReturnResult(ctx, "failed to clone outgoing ISO18626 request", err)
+		return actionExecutionResult{status: status, result: eventResult, outcome: ActionOutcomeFailure, pr: pr}
+	}
+	illRequest.Header.RequestingAgencyId = iso18626.TypeAgencyId{
+		AgencyIdType: iso18626.TypeSchemeValuePair{
+			Text: requesterSymbol[0],
 		},
+		AgencyIdValue: requesterSymbol[1],
+	}
+	illRequest.Header.RequestingAgencyRequestId = pr.ID
+	if illRequest.PatronInfo == nil {
+		illRequest.PatronInfo = &iso18626.PatronInfo{}
+	}
+	illRequest.PatronInfo.PatronId = pr.Patron.String
+
+	var illMessage = iso18626.ISO18626Message{
+		Request: &illRequest,
 	}
 	w := NewResponseCaptureWriter()
 	a.iso18626Handler.HandleRequest(ctx, &illMessage, w)
@@ -327,6 +333,18 @@ func (a *PatronRequestActionService) sendBorrowingRequest(ctx common.ExtendedCon
 	return actionExecutionResult{status: events.EventStatusSuccess, result: &result, outcome: ActionOutcomeSuccess, pr: pr}
 }
 
+func deepCopyISO18626Request(request iso18626.Request) (iso18626.Request, error) {
+	requestJSON, err := json.Marshal(request)
+	if err != nil {
+		return iso18626.Request{}, err
+	}
+	var clone iso18626.Request
+	if err = json.Unmarshal(requestJSON, &clone); err != nil {
+		return iso18626.Request{}, err
+	}
+	return clone, nil
+}
+
 func (a *PatronRequestActionService) receiveBorrowingRequest(ctx common.ExtendedContext, pr pr_db.PatronRequest, lmsAdapter lms.LmsAdapter, illRequest iso18626.Request) actionExecutionResult {
 	patron := ""
 	if pr.Patron.Valid {

broker/patron_request/service/action_test.go

@@ -521,6 +521,74 @@ func TestSendBorrowingRequestZeroValueIllRequest(t *testing.T) {
 	assert.Equal(t, iso18626.TypeMessageStatusOK, result.result.IncomingMessage.RequestConfirmation.ConfirmationHeader.MessageStatus)
 }
 
+func TestSendBorrowingRequestPreservesIllRequestFields(t *testing.T) {
+	mockPrRepo := new(MockPrRepo)
+	mockIso18626Handler := new(MockIso18626Handler)
+	prAction := CreatePatronRequestActionService(mockPrRepo, *new(events.EventBus), mockIso18626Handler, nil)
+
+	requestType := iso18626.TypeRequestTypeNew
+	illRequest := iso18626.Request{
+		Header: iso18626.Header{
+			RequestingAgencyId: iso18626.TypeAgencyId{
+				AgencyIdType:  iso18626.TypeSchemeValuePair{Text: "OLD"},
+				AgencyIdValue: "OLD_REQ",
+			},
+			RequestingAgencyRequestId: "old-id",
+		},
+		BibliographicInfo: iso18626.BibliographicInfo{
+			Title: "preserved-title",
+		},
+		ServiceInfo: &iso18626.ServiceInfo{
+			ServiceType: iso18626.TypeServiceTypeCopy,
+			RequestType: &requestType,
+			Note:        "preserve me",
+		},
+		RequestedDeliveryInfo: []iso18626.RequestedDeliveryInfo{
+			{SortOrder: 1},
+		},
+		PatronInfo: &iso18626.PatronInfo{
+			PatronId: "old-patron",
+			Surname:  "Doe",
+		},
+	}
+
+	result := prAction.sendBorrowingRequest(appCtx, pr_db.PatronRequest{
+		ID:              patronRequestId,
+		State:           BorrowerStateValidated,
+		Side:            SideBorrowing,
+		Patron:          pgtype.Text{Valid: true, String: "patron1"},
+		RequesterSymbol: pgtype.Text{Valid: true, String: "ISIL:REC1"},
+	}, illRequest)
+
+	assert.Equal(t, events.EventStatusSuccess, result.status)
+	if assert.NotNil(t, result.result) && assert.NotNil(t, result.result.OutgoingMessage) &&
+		assert.NotNil(t, result.result.OutgoingMessage.Request) {
+		request := result.result.OutgoingMessage.Request
+		assert.Equal(t, "ISIL", request.Header.RequestingAgencyId.AgencyIdType.Text)
+		assert.Equal(t, "REC1", request.Header.RequestingAgencyId.AgencyIdValue)
+		assert.Equal(t, patronRequestId, request.Header.RequestingAgencyRequestId)
+		if assert.NotNil(t, request.PatronInfo) {
+			assert.Equal(t, "patron1", request.PatronInfo.PatronId)
+			assert.Equal(t, "Doe", request.PatronInfo.Surname)
+		}
+		if assert.NotNil(t, request.ServiceInfo) {
+			assert.Equal(t, "preserve me", request.ServiceInfo.Note)
+			assert.Equal(t, iso18626.TypeServiceTypeCopy, request.ServiceInfo.ServiceType)
+		}
+		assert.Equal(t, "preserved-title", request.BibliographicInfo.Title)
+		assert.Len(t, request.RequestedDeliveryInfo, 1)
+		assert.Equal(t, int64(1), request.RequestedDeliveryInfo[0].SortOrder)
+	}
+	assert.Equal(t, "OLD", illRequest.Header.RequestingAgencyId.AgencyIdType.Text)
+	assert.Equal(t, "OLD_REQ", illRequest.Header.RequestingAgencyId.AgencyIdValue)
+	assert.Equal(t, "old-id", illRequest.Header.RequestingAgencyRequestId)
+	if assert.NotNil(t, illRequest.PatronInfo) {
+		assert.Equal(t, "old-patron", illRequest.PatronInfo.PatronId)
+		assert.Equal(t, "Doe", illRequest.PatronInfo.Surname)
+	}
+	assert.Equal(t, iso18626.TypeMessageStatusOK, result.result.IncomingMessage.RequestConfirmation.ConfirmationHeader.MessageStatus)
+}
+
 func TestShipReturnBorrowingRequestMissingSupplierSymbol(t *testing.T) {
 	mockPrRepo := new(MockPrRepo)
 	mockIso18626Handler := new(MockIso18626Handler)