Add add-condition action to CONDITION_PENDING

broker/patron_request/service/action_mapping_test.go

@@ -28,7 +28,7 @@ func TestNewReturnableActionMapping(t *testing.T) {
 		LenderStateNew:               {{actionName: LenderActionValidate, auto: true}},
 		LenderStateValidated:         {{actionName: LenderActionWillSupply, auto: true}, {actionName: LenderActionCannotSupply}, {actionName: LenderActionAddCondition}},
 		LenderStateWillSupply:        {{actionName: LenderActionAddCondition}, {actionName: LenderActionShip}, {actionName: LenderActionCannotSupply}},
-		LenderStateConditionPending:  {{actionName: LenderActionCannotSupply}},
+		LenderStateConditionPending:  {{actionName: LenderActionAddCondition}, {actionName: LenderActionCannotSupply}},
 		LenderStateConditionAccepted: {{actionName: LenderActionShip}, {actionName: LenderActionCannotSupply}},
 		LenderStateShippedReturn:     {{actionName: LenderActionMarkReceived}},
 		LenderStateCancelRequested:   {{actionName: LenderActionAcceptCancel}, {actionName: LenderActionRejectCancel}},
@@ -63,6 +63,7 @@ func TestIsActionAvailable(t *testing.T) {
 
 	// Lender
 	assert.True(t, mapping.IsActionAvailable(pr_db.PatronRequest{Side: SideLending, State: LenderStateWillSupply}, LenderActionShip))
+	assert.True(t, mapping.IsActionAvailable(pr_db.PatronRequest{Side: SideLending, State: LenderStateConditionPending}, LenderActionAddCondition))
 	assert.False(t, mapping.IsActionAvailable(pr_db.PatronRequest{Side: SideLending, State: LenderStateWillSupply}, BorrowerActionRejectCondition))
 }
 
@@ -90,6 +91,7 @@ func TestGetActionsForPatronRequest(t *testing.T) {
 
 	// Lender
 	listCompare(t, []pr_db.PatronRequestAction{LenderActionAddCondition, LenderActionCannotSupply, LenderActionShip}, mapping.GetActionsForPatronRequest(pr_db.PatronRequest{Side: SideLending, State: LenderStateWillSupply}))
+	listCompare(t, []pr_db.PatronRequestAction{LenderActionAddCondition, LenderActionCannotSupply}, mapping.GetActionsForPatronRequest(pr_db.PatronRequest{Side: SideLending, State: LenderStateConditionPending}))
 	listCompare(t, []pr_db.PatronRequestAction{}, mapping.GetActionsForPatronRequest(pr_db.PatronRequest{Side: SideLending, State: LenderStateShipped}))
 }
 
@@ -138,6 +140,18 @@ func TestGetActionTransitionMissingCases(t *testing.T) {
 	assert.False(t, ok)
 }
 
+func TestGetActionTransitionConditionPendingSelfTransition(t *testing.T) {
+	mapping := mustActionMapping(t)
+
+	transition, ok := mapping.GetActionTransition(
+		pr_db.PatronRequest{Side: SideLending, State: LenderStateConditionPending},
+		LenderActionAddCondition,
+		ActionOutcomeSuccess,
+	)
+	assert.True(t, ok)
+	assert.Equal(t, LenderStateConditionPending, transition)
+}
+
 func listCompare(t *testing.T, list1 []pr_db.PatronRequestAction, list2 []pr_db.PatronRequestAction) {
 	assert.Equal(t, len(list1), len(list2))
 	for i := range list1 {

broker/patron_request/service/statemodels/returnables.json

@@ -369,6 +369,13 @@
       "side": "SUPPLIER",
       "primaryAction": "cannot-supply",
       "actions": [
+        {
+          "name": "add-condition",
+          "desc": "Add additional conditions and notify requester",
+          "transitions": {
+            "success": "CONDITION_PENDING"
+          }
+        },
         {
           "name": "cannot-supply",
           "desc": "Indicate cannot supply",

misc/returnables.yaml

@@ -252,6 +252,10 @@ states:
     side: SUPPLIER
     primaryAction: cannot-supply
     actions:
+      - name: add-condition
+        desc: Add additional conditions and notify requester
+        transitions:
+          success: CONDITION_PENDING
       - name: cannot-supply
         desc: Indicate cannot supply
         transitions:
@@ -294,7 +298,7 @@ states:
       - name: received
         desc: Requester sends ISO Received
         transition: RECEIVED
-    
+
   - name: RECEIVED
     display: Received
     desc: Requester has received the shipped item