From febe0f2378c654d079c5e7b8d90a788d0d27f7ad Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 29 May 2026 13:50:50 +0200
Subject: [PATCH 1/2] CROSSLINK-264 ask-retry action

---
 .../service/statemodels/returnables.json             | 12 ++++++++++++
 misc/returnables.yaml                                |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/broker/patron_request/service/statemodels/returnables.json b/broker/patron_request/service/statemodels/returnables.json
index bb60c057..2e6b03a5 100644
--- a/broker/patron_request/service/statemodels/returnables.json
+++ b/broker/patron_request/service/statemodels/returnables.json
@@ -67,6 +67,11 @@
           "name": "unfilled",
           "desc": "Supplier cannot supply (ISO18626 Unfilled)",
           "transition": "UNFILLED"
+        },
+        {
+          "name": "accept-retry",
+          "desc": "Supplier accepts retry with new metadata",
+          "transition": "NEW"
         }
       ]
     },
@@ -338,6 +343,13 @@
           "transitions": {
             "success": "CONDITION_PENDING"
           }
+        },
+        {
+          "name": "ask-retry",
+          "desc": "Ask requester to retry with new ISO18626 metadata",
+          "transitions": {
+            "success": "NEW"
+          }
         }
       ],
       "events": [
diff --git a/misc/returnables.yaml b/misc/returnables.yaml
index 606d0fd9..3e010e1d 100644
--- a/misc/returnables.yaml
+++ b/misc/returnables.yaml
@@ -48,6 +48,9 @@ states:
       - name: unfilled
         desc: Supplier cannot supply (ISO18626 Unfilled)
         transition: UNFILLED
+      - name: accept-retry
+        desc: Supplier accepts retry with new metadata
+        transition: NEW
 
   - name: SUPPLIER_LOCATED
     display: Supplier Located
@@ -232,6 +235,10 @@ states:
         desc: Indicate will supply with conditions and send ISO18626 WillSupply
         transitions:
           success: CONDITION_PENDING
+      - name: ask-retry
+        desc: Ask requester to retry with new ISO18626 metadata
+        transitions:
+          success: NEW
     events:
       - name: cancel-request
         desc: Requester sent ISO18626 Cancel

From ac9170a0a01b8d2dbb7e5beba08ba5ddaf8cf20a Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 29 May 2026 16:35:00 +0200
Subject: [PATCH 2/2] RETRY_REQUESTED state

(yes, tests do not pass)
---
 .../patron_request/service/statemodels/returnables.json  | 9 ++++++++-
 misc/returnables.yaml                                    | 8 +++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/broker/patron_request/service/statemodels/returnables.json b/broker/patron_request/service/statemodels/returnables.json
index 2e6b03a5..179df8d4 100644
--- a/broker/patron_request/service/statemodels/returnables.json
+++ b/broker/patron_request/service/statemodels/returnables.json
@@ -348,7 +348,7 @@
           "name": "ask-retry",
           "desc": "Ask requester to retry with new ISO18626 metadata",
           "transitions": {
-            "success": "NEW"
+            "success": "RETRY_REQUESTED"
           }
         }
       ],
@@ -559,6 +559,13 @@
       "desc": "After manual cannot-supply or automatically if auto-responder is on",
       "side": "SUPPLIER",
       "terminal": true
+    },
+    {
+      "name": "RETRY_REQUESTED",
+      "display": "Retry Requested",
+      "desc": "After manual retry request",
+      "side": "SUPPLIER",
+      "terminal": true
     }
   ]
 }
diff --git a/misc/returnables.yaml b/misc/returnables.yaml
index 3e010e1d..072ed1e9 100644
--- a/misc/returnables.yaml
+++ b/misc/returnables.yaml
@@ -238,7 +238,7 @@ states:
       - name: ask-retry
         desc: Ask requester to retry with new ISO18626 metadata
         transitions:
-          success: NEW
+          success: RETRY_REQUESTED
     events:
       - name: cancel-request
         desc: Requester sent ISO18626 Cancel
@@ -376,3 +376,9 @@ states:
     desc: After manual cannot-supply or automatically if auto-responder is on
     side: SUPPLIER
     terminal: true
+
+  - name: RETRY_REQUESTED
+    display: Retry Requested
+    desc: After manual retry request
+    side: SUPPLIER
+    terminal: true