Revised request should use HRID not UUID

broker/patron_request/service/action.go

@@ -662,7 +662,16 @@ func (a *PatronRequestActionService) acceptRetryBorrowingRequest(ctx common.Exte
 	}
 	retryPr.State = borrowerInitialState
 	retryPr.TerminalState = actionMapping.IsTerminalState(retryPr)
-	retryPr.ID = uuid.NewString()
+	_, requesterSymbol, err := common.SplitSymbol(pr.RequesterSymbol.String)
+	if err != nil {
+		status, result := logActionErrorAndReturnResult(ctx, "invalid requester symbol for retry", err)
+		return actionExecutionResult{status: status, result: result, pr: pr}
+	}
+	retryPr.ID, err = a.prRepo.GetNextHrid(ctx, requesterSymbol)
+	if err != nil {
+		status, result := logActionErrorAndReturnResult(ctx, "failed to generate requester HRID for retry", err)
+		return actionExecutionResult{status: status, result: result, pr: pr}
+	}
 	retryPr.RequesterReqID = getDbTextPtr(&retryPr.ID)
 	retryPr.CreatedAt = pgtype.Timestamp{Valid: true, Time: time.Now()}
 	retryPr.IllRequest.Header.RequestingAgencyRequestId = retryPr.ID

broker/patron_request/service/action_test.go

@@ -1340,6 +1340,9 @@ func TestHandleInvokeBorrowerActionAcceptRetryAutoActionCreateTaskError(t *testi
 	assert.Equal(t, string(BorrowerActionValidate), mockPrRepo.savedPr.LastAction.String)
 	assert.Equal(t, ActionOutcomeFailure, mockPrRepo.savedPr.LastActionOutcome.String)
 	assert.Equal(t, string(events.EventStatusError), mockPrRepo.savedPr.LastActionResult.String)
+	assert.Equal(t, "REQ1-2", mockPrRepo.createdPr.ID)
+	assert.Equal(t, "REQ1-2", mockPrRepo.createdPr.RequesterReqID.String)
+	assert.Equal(t, "REQ1-2", mockPrRepo.createdPr.IllRequest.Header.RequestingAgencyRequestId)
 }
 
 func TestHandleInvokeLenderActionAddConditionMissingConditionAndCost(t *testing.T) {
@@ -2563,6 +2566,7 @@ type MockPrRepo struct {
 	mock.Mock
 	pr_db.PgPrRepo
 	savedPr                              pr_db.PatronRequest
+	createdPr                            pr_db.PatronRequest
 	savedItems                           []pr_db.Item
 	savedNotifications                   []pr_db.Notification
 	markedConditionNotificationsReceipts []pr_db.MarkConditionNotificationsReceiptParams
@@ -2609,9 +2613,14 @@ func (r *MockPrRepo) CreatePatronRequest(ctx common.ExtendedContext, params pr_d
 		return pr_db.PatronRequest{}, errors.New("db error")
 	}
 	r.savedPr = pr_db.PatronRequest(params)
+	r.createdPr = r.savedPr
 	return r.savedPr, nil
 }
 
+func (r *MockPrRepo) GetNextHrid(ctx common.ExtendedContext, prefix string) (string, error) {
+	return strings.ToUpper(prefix) + "-2", nil
+}
+
 func (r *MockPrRepo) GetLendingRequestBySupplierSymbolAndRequesterReqId(ctx common.ExtendedContext, symbol string, requesterReqId string) (pr_db.PatronRequest, error) {
 	args := r.Called(symbol, requesterReqId)
 	return args.Get(0).(pr_db.PatronRequest), args.Error(1)

broker/test/patron_request/api/api-handler_test.go

@@ -1030,6 +1030,8 @@ func TestAcceptRetry(t *testing.T) {
 	// check cloned request
 	newId := *foundPr.NextReqId
 	assert.NotEqual(t, newId, id)
+	_, requesterHridPrefix := common.SplitAgencySymbol(requesterSymbol)
+	assert.True(t, strings.HasPrefix(newId, strings.ToUpper(requesterHridPrefix)+"-"), "retry request should use requester HRID, got %q", newId)
 
 	thisPrPath = basePath + "/" + newId