Bind player negotiations and release cancelled contract quotes (by Codex)

This commit is contained in:
Codex committed 2026-10-28 12:57:40 +01:00
1 parent e9483048f4
commit 622973c2cf
18 files changed
+381 -28

No files matched your search

+24 -1
View File
@@ -9,7 +9,7 @@ using namespace bmh;
using namespace bmh::modern_ui;
int main(int argc, char **argv) {
try {
if (argc != 4 || (std::string(argv[1]) != "inspect" && std::string(argv[1]) != "prepare" && std::string(argv[1]) != "verify" && std::string(argv[1]) != "verify-lineup" && std::string(argv[1]) != "verify-sports" && std::string(argv[1]) != "verify-bank" && std::string(argv[1]) != "verify-commerce")) throw std::runtime_error("usage: modern_engine_bridge_probe inspect|prepare|verify|verify-lineup|verify-sports|verify-bank|verify-commerce <world.obw> <new-output-directory>");
if (argc != 4 || (std::string(argv[1]) != "inspect" && std::string(argv[1]) != "prepare" && std::string(argv[1]) != "verify" && std::string(argv[1]) != "verify-lineup" && std::string(argv[1]) != "verify-sports" && std::string(argv[1]) != "verify-bank" && std::string(argv[1]) != "verify-commerce" && std::string(argv[1]) != "verify-contracts")) throw std::runtime_error("usage: modern_engine_bridge_probe inspect|prepare|verify|verify-lineup|verify-sports|verify-bank|verify-commerce|verify-contracts <world.obw> <new-output-directory>");
const fs::path world = argv[2], out = argv[3]; fs::create_directories(out);
const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
if (std::string(argv[1]) == "prepare") {
@@ -143,6 +143,29 @@ int main(int argc, char **argv) {
const auto loaded=link->snapshot();write("commerce-loaded.json",loaded);
for(const auto *kind:{"environment","advertising","bank"})if(loaded.at(kind).at("data")!=after.at(kind).at("data"))throw std::runtime_error("commerce OBS round trip lost state");
}
if(std::string(argv[1])=="verify-contracts") {
const auto run=[&](const Json &request,const std::string &name){auto response=link->command(request);write((name+"-response.json").c_str(),response);if(response.value("messageType","")!="command_result"||link->command(request)!=response)throw std::runtime_error(response.dump());return response;};
const auto players=engine_contracts_projection(before).at("rows");const auto first=players[0].at("id").get<std::string>(),second=players[1].at("id").get<std::string>();
run(engine_contract_request(before,first,"request:quote-one"),"quote-one");const auto queried=link->snapshot();write("queried.json",queried);
if(queried!=link->snapshot() || queried.at("contracts").at("data").at("players")!=before.at("contracts").at("data").at("players"))throw std::runtime_error("pure reads/demands changed actual contracts");
write("queried-saved.json",link->save_copy(out/"queried.obs"));
const auto q=engine_contracts_projection(queried).at("quote");auto cancel=engine_contract_cancel(queried,q.at("id"),"request:cancel");
auto bad=cancel;bad["payload"]["quoteId"]="quote:contract-999999";bad["requestId"]="request:wrong-quote";if(link->command(bad).value("code","")!="stale_quote"||link->snapshot()!=queried)throw std::runtime_error("wrong quote cancellation changed owner");
bad=cancel;bad["owner"]["managerId"]="manager:foreign";bad["requestId"]="request:wrong-owner";if(link->command(bad).value("messageType","")!="error"||link->snapshot()!=queried)throw std::runtime_error("foreign owner closed quote");
run(cancel,"cancel");const auto cancelled=link->snapshot();write("cancelled.json",cancelled);if(!cancelled.at("contracts").at("data").at("quote").is_null()||cancelled.at("contracts").at("data").at("players")!=before.at("contracts").at("data").at("players"))throw std::runtime_error("cancel did not clear quote or edited salaries");
write("cancelled-saved.json",link->save_copy(out/"cancelled.obs"));
bad=cancel;bad["requestId"]="request:old-revision";if(link->command(bad).value("code","")!="stale_revision"||link->snapshot()!=cancelled)throw std::runtime_error("stale cancel changed state");
run(engine_ticket_command(cancelled,21,"request:owner-released"),"owner-released");
run(engine_contract_request(link->snapshot(),first,"request:quote-reject"),"quote-reject");auto now=link->snapshot();auto q2=engine_contracts_projection(now).at("quote");int year=1;while(year<=4&&q2.at("demands")[size_t(year-1)].is_null())++year;if(year>4)throw std::runtime_error("no available rejection term");
const auto refused=run(engine_contract_offer(now,first,q2.at("id"),year,0,"request:offer-reject"),"offer-reject");if(refused.value("outcome","")!="offer_rejected")throw std::runtime_error("zero offer not actually rejected");
run(engine_contract_request(link->snapshot(),second,"request:quote-accept"),"quote-accept");now=link->snapshot();q2=engine_contracts_projection(now).at("quote");year=2;while(year<=4&&q2.at("demands")[size_t(year-1)].is_null())++year;if(year>4)year=1;
const int64_t salary=q2.at("max_salary").get<int64_t>()/100;
const auto accepted=run(engine_contract_offer(now,second,q2.at("id"),year,salary,"request:offer-accept"),"offer-accept");if(accepted.value("outcome","")=="offer_rejected")throw std::runtime_error("maximum salary unexpectedly rejected");
const auto after=link->snapshot();write("contracts-after.json",after);bool found=false;const auto final_contracts=engine_contracts_projection(after);for(const auto &p:final_contracts.at("rows"))if(p.at("id")==second)found=p.at("salary")==salary*100&&p.at("months")==year*12;
if(!found||!after.at("contracts").at("data").at("quote").is_null())throw std::runtime_error("actual accepted contract wrong or quote retained");
write("saved.json",link->save_copy(out/"contracts.obs"));link.reset();link=EngineBridge::open(world,out/"contracts.obs");auto loaded=link->snapshot();write("loaded.json",loaded);if(loaded.at("contracts").at("data")!=after.at("contracts").at("data"))throw std::runtime_error("contract OBS round trip lost state");
}
std::cout << "engine bridge " << argv[1] << " passed\n"; return 0;
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
}
+26
View File
@@ -220,6 +220,32 @@ int main() {
rejects([&]{engine_environment_command(blocked,"environment:doctor",2,"r");});
rejects([&]{engine_budget_command(blocked,"budget:press",0,"r");});
require(commerce==unchanged_commerce,"commerce projections mutated source data");
auto contracts = sports;
for(auto &[kind,row]:contracts.items())row["meta"]["scope"]["allowedCommands"]={"quote.request","contract.offer","contract.cancel"};
const auto contract_squad=engine_lineup_projection(contracts);
Json cp=Json::array();for(const auto &row:contract_squad.at("rows"))cp.push_back({{"playerId",row.at("id")},{"name",row.at("name")},{"age",20},{"position","mid"},{"contractRemaining",{{"value",17},{"unit","months"}}},{"salaryMonthly",M(123400)},{"insuranceMonths",3},{"insuranceFee",M(50000)},{"offerBlocked",false},{"bonuses",{0,1,2,3,4,5,6}}});
contracts["contracts"]={{"messageType","snapshot"},{"meta",contracts.at("desktop").at("meta")},{"data",{{"kind","contracts"},{"teamId","club:6"},{"players",cp},{"quote",nullptr}}}};
const auto contract_before=contracts;const auto cv=engine_contracts_projection(contracts);
require(cv.at("salary_total")==int64_t(cp.size())*123400 && cv.at("rows")[0].at("months")==17 && cv.at("rows")[0].at("games").is_null(),"contract salaries/terms guessed or absent stats fabricated");
const auto pid=cp[0].at("playerId").get<std::string>();
require(engine_contract_request(contracts,pid,"r").at("payload").at("playerId")==pid,"contract request lost player identity");
rejects([&]{engine_contract_request(contracts,"foreign","r");});
auto cb=contracts;cb["contracts"]["data"]["players"][0]["offerBlocked"]=true;rejects([&]{engine_contract_request(cb,pid,"r");});
cb=contracts;cb["contracts"]["data"]["players"][1]["playerId"]=pid;rejects([&]{engine_contracts_projection(cb);});
Json cd=Json::array();const std::array<int64_t,4> demands{123400,0,429496729500LL,999900};
for(int i=0;i<4;++i)cd.push_back({{"years",i+1},{"monthlyDemand",M(demands[size_t(i)])}});
contracts["contracts"]["data"]["quote"]={{"id","quote:contract-9"},{"playerId",pid},{"maxMonthlySalary",M(20000000)},{"demands",cd}};
const auto quoted=engine_contracts_projection(contracts).at("quote");require(quoted.at("demands")[1].is_null()&&quoted.at("demands")[2].is_null(),"unavailable term shown as free salary");
require(engine_contract_offer(contracts,pid,"quote:contract-9",1,1234,"r").at("payload").at("monthlySalary")==M(123400),"salary conversion rounded or repeated");
rejects([&]{engine_contract_offer(contracts,pid,"quote:contract-9",2,1234,"r");});
rejects([&]{engine_contract_offer(contracts,pid,"quote:contract-9",1,200001,"r");});
rejects([&]{engine_contract_offer(contracts,"foreign","quote:contract-9",1,1234,"r");});
rejects([&]{engine_contract_request(contracts,pid,"r");});
require(engine_contract_cancel(contracts,"quote:contract-9","r").at("payload").at("quoteId")=="quote:contract-9","cancel lost exact quote binding");
rejects([&]{engine_contract_cancel(contracts,"quote:contract-8","r");});
cb=contracts;cb["contracts"]["meta"]["scope"]["managerId"]="foreign";rejects([&]{engine_contracts_projection(cb);});
cb=contract_before;for(auto &[kind,row]:cb.items())row["meta"]["scope"]["allowedCommands"]={"quote.request","contract.offer"};require(!engine_contracts_projection(cb).at("rows")[0].at("can_request").get<bool>(),"quote opened without cancellation capability");
std::cout << "engine DTO, exact money, scope and booking tests passed\n";
return 0;
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }