diff --git a/app/mcp/admin_mcp.rb b/app/mcp/admin_mcp.rb index bdca054..8f6de55 100644 --- a/app/mcp/admin_mcp.rb +++ b/app/mcp/admin_mcp.rb @@ -6,7 +6,7 @@ # |---|---|---| # | Read | admin_summary, find_people, get_person, find_projects, get_project, find_ships, get_ship, list_orders, list_extensions, metrics, nudges, public_stats | Tools::Overview, People, Projects, Ships, Orders, Extensions, Numbers | # | Analytics | describe_schema, query_sql, funnel, audit_log | Tools::Analytics, Tools::Audit | -# | Write | save_review_draft, set_lapse_coding, set_reviewer_ai, set_checklist_item, set_hours_start, edit_snapshot, edit_review_text, send_verdict_dm, mark_order_ordered, cancel_order, decide_extension, set_ship_until | The same model methods the admin pages call (Nudge::ChangesNeeded and Nudge::Rejected for send_verdict_dm, Order#ordered!, Order#cancel!, Extension#decide!) | +# | Write | save_review_draft, set_lapse_coding, set_reviewer_ai, set_checklist_item, set_hours_start, edit_snapshot, edit_review_text, send_verdict_dm, mark_order_ordered, cancel_order, reopen_order, decide_extension, set_ship_until | The same model methods the admin pages call (Nudge::ChangesNeeded and Nudge::Rejected for send_verdict_dm, Order#ordered!, Order#cancel!, Order#reopen!, Extension#decide!) | # # Before a tool runs, AdminMcp::Tool writes an AdminAuditEvent. A tool whose audit row fails does not run. module AdminMcp @@ -14,7 +14,7 @@ module AdminMcp Save Point admin tools. Most people in this data are teenagers: share only what the task needs. Start with describe_schema, or a typed finder (find_people, find_projects, find_ships) before query_sql. Every call is written to the admin log, with the tool and the IDs it names. - Write tools (save_review_draft, set_lapse_coding, set_reviewer_ai, set_checklist_item, set_hours_start, edit_snapshot, edit_review_text, send_verdict_dm, mark_order_ordered, cancel_order, decide_extension, set_ship_until) + Write tools (save_review_draft, set_lapse_coding, set_reviewer_ai, set_checklist_item, set_hours_start, edit_snapshot, edit_review_text, send_verdict_dm, mark_order_ordered, cancel_order, reopen_order, decide_extension, set_ship_until) change real data, and ordering, deciding an extension or send_verdict_dm sends the participant a Slack DM: confirm each with the human first. Everything on the ship review page saves through a tool except the verdict and the screenshots: set_lapse_coding and set_reviewer_ai change the limits at once. No tool gives a verdict (D-136): the reviewer presses it on the page. @@ -33,7 +33,7 @@ def self.tools Tools::Ships::FindShips, Tools::Ships::GetShip, Tools::Ships::SaveReviewDraft, Tools::Ships::SetLapseCoding, Tools::Ships::SetReviewerAi, Tools::Ships::SetChecklistItem, Tools::Ships::SetHoursStart, Tools::Ships::EditSnapshot, Tools::Ships::EditReviewText, Tools::Ships::SendVerdictDm, - Tools::Orders::ListOrders, Tools::Orders::MarkOrderOrdered, Tools::Orders::CancelOrder, + Tools::Orders::ListOrders, Tools::Orders::MarkOrderOrdered, Tools::Orders::CancelOrder, Tools::Orders::ReopenOrder, Tools::Extensions::ListExtensions, Tools::Extensions::DecideExtension, Tools::Numbers::Metrics, Tools::Numbers::Nudges, Tools::Numbers::PublicStats, Tools::Analytics::DescribeSchema, Tools::Analytics::QuerySql, Tools::Analytics::Funnel, diff --git a/app/mcp/admin_mcp/tools/orders.rb b/app/mcp/admin_mcp/tools/orders.rb index 8db03f3..f88f1c6 100644 --- a/app/mcp/admin_mcp/tools/orders.rb +++ b/app/mcp/admin_mcp/tools/orders.rb @@ -63,4 +63,30 @@ def self.run(args, _caller) { order_id: order.id, status: order.status, project_id: project.id, hours_to_spend: project.hours_to_spend } end end + + # An ordered order the shop cancelled goes back to waiting, to be bought again. Hours stay spent. No DM. + class ReopenOrder < AdminMcp::Tool + writes "reopen_order", "Put an ordered order back to waiting", + "Puts an ordered prize order back to waiting, for when the shop cancelled it after it was marked ordered, so it shows on the Orders page to buy again. " \ + "Clears who ordered it, when, and its Theseus letter ID. The hours stay spent (it is not cancelled). " \ + "Only an ordered order can be reopened: a waiting or cancelled one is refused and nothing changes. A reason is required and goes in the admin log. " \ + "Sends no DM and posts nothing. Answers { order_id, status, project_id, prize_key }.", + { order_id: { type: "integer", description: "The order ID, from list_orders." }, + reason: { type: "string", description: "Why, in a sentence. Saved in the admin log." } }, + required: %w[order_id reason] + + def self.audit_extra(args) + { "reason" => args[:reason].to_s.strip.first(500) } + end + + def self.run(args, _caller) + reason = args[:reason].to_s.strip + raise AdminMcp::Refused, "Send a reason." if reason.blank? + + order = Order.find(args[:order_id]) + raise AdminMcp::Refused, "Order #{order.id} is #{order.status}, so it can't be reopened. Only an ordered order can be." unless order.reopen! + + { order_id: order.id, status: order.status, project_id: order.project_id, prize_key: order.prize_key } + end + end end diff --git a/app/models/order.rb b/app/models/order.rb index 4e3a5ba..6ba78ce 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -102,6 +102,18 @@ def cancel! end end + # An ordered order goes back to waiting, for when the shop cancelled it after it was marked ordered. It still counts as + # spent, so the hours stay. When it was ordered, who ordered it and the Theseus letter are cleared. Under the row lock. + # Answers false, changing nothing, when it is not ordered. + def reopen! + with_lock do + next false unless ordered? + + update!(status: "waiting", ordered_at: nil, ordered_by: nil, theseus_letter_id: nil) + true + end + end + # A banned person's waiting order is cancelled with the ban (User#ban!, D-148). def cancel_for_ban! cancel! diff --git a/test/controllers/admin/mcp_controller_test.rb b/test/controllers/admin/mcp_controller_test.rb index 6fb6a82..48d74db 100644 --- a/test/controllers/admin/mcp_controller_test.rb +++ b/test/controllers/admin/mcp_controller_test.rb @@ -63,8 +63,8 @@ class Admin::McpControllerTest < ActionDispatch::IntegrationTest tools = response.parsed_body.dig("result", "tools").index_by { it["name"] } assert_equal %w[admin_summary audit_log cancel_order credit_shop_hours decide_extension describe_schema edit_review_text edit_snapshot find_people find_projects find_ships funnel get_person get_project get_ship - list_extensions list_orders mark_order_ordered metrics nudges public_stats query_sql save_review_draft send_verdict_dm set_checklist_item set_hours_start set_lapse_coding set_reviewer_ai set_ship_until set_shop_until], tools.keys.sort - writes = %w[save_review_draft set_lapse_coding set_reviewer_ai set_checklist_item set_hours_start edit_snapshot edit_review_text send_verdict_dm mark_order_ordered cancel_order decide_extension set_ship_until credit_shop_hours set_shop_until] + list_extensions list_orders mark_order_ordered metrics nudges public_stats query_sql reopen_order save_review_draft send_verdict_dm set_checklist_item set_hours_start set_lapse_coding set_reviewer_ai set_ship_until set_shop_until], tools.keys.sort + writes = %w[save_review_draft set_lapse_coding set_reviewer_ai set_checklist_item set_hours_start edit_snapshot edit_review_text send_verdict_dm mark_order_ordered cancel_order reopen_order decide_extension set_ship_until credit_shop_hours set_shop_until] writes.each do |name| assert tools[name]["description"].start_with?("Changes real data: confirm with the human first."), name assert_equal false, tools[name].dig("annotations", "readOnlyHint") @@ -841,6 +841,43 @@ class Admin::McpControllerTest < ActionDispatch::IntegrationTest assert_equal 0, projects(:ana).reload.hours_to_spend end + test "reopen_order puts an ordered order back to waiting, clears who ordered it, and keeps the hours spent" do + travel_to Time.utc(2026, 11, 9, 12) + project = projects(:ana) + order = make_order("micro", "ordered") + order.update!(ordered_at: Time.current, ordered_by: users(:orpheus), theseus_letter_id: "ltr_x") + spent = project.reload.hours_to_spend + + assert_no_enqueued_jobs only: SlackMessageJob do + mcp_tool(@token, "reopen_order", { order_id: order.id }) + assert mcp_error?, "a reason is needed" + assert order.reload.ordered? + + result = mcp_tool(@token, "reopen_order", { order_id: order.id, reason: "Roblox cancelled it" }) + assert_equal({ "order_id" => order.id, "status" => "waiting", "project_id" => project.id, "prize_key" => order.prize_key }, result) + end + order.reload + assert order.waiting? + assert_nil order.ordered_at + assert_nil order.ordered_by_id + assert_nil order.theseus_letter_id + assert_equal spent, project.reload.hours_to_spend + assert_equal({ "order_id" => order.id, "reason" => "Roblox cancelled it" }, AdminAuditEvent.where(tool: "reopen_order").last.ids) + end + + test "reopen_order refuses waiting and cancelled orders and changes nothing" do + travel_to Time.utc(2026, 11, 9, 12) + waiting = make_order("micro", "waiting") + mcp_tool(@token, "reopen_order", { order_id: waiting.id, reason: "x" }) + assert mcp_error? + assert waiting.reload.waiting? + + waiting.cancel! + mcp_tool(@token, "reopen_order", { order_id: waiting.id, reason: "x" }) + assert mcp_error? + assert waiting.reload.cancelled? + end + test "decide_extension decides once, and the bot DMs them" do extension = projects(:ana).create_extension!(reason: "exams") result = mcp_tool(@token, "decide_extension", { extension_id: extension.id, decision: "approved" })