Bind season calendar and confirmed fixture rescheduling to engine (by Codex)
This commit is contained in:
1 parent
7e170a00c7
commit
6119d7f21e
17 files changed
+388
-16
No files matched your search
@@ -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" && 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>");
|
||||
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" && std::string(argv[1]) != "verify-calendar")) throw std::runtime_error("usage: modern_engine_bridge_probe inspect|prepare|verify|verify-lineup|verify-sports|verify-bank|verify-commerce|verify-contracts|verify-calendar <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") {
|
||||
@@ -166,6 +166,22 @@ int main(int argc, char **argv) {
|
||||
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");
|
||||
}
|
||||
|
||||
if(std::string(argv[1])=="verify-calendar") {
|
||||
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 calendar=engine_calendar_projection(before),schedule=engine_scheduling_projection(before);
|
||||
const Json *chosen=nullptr;for(const auto &r:schedule.at("movable"))if(!r.at("targetDates").empty()){chosen=&r;break;}if(!chosen)throw std::runtime_error("no actual movable fixture");
|
||||
const auto row=*chosen;const std::string target=row.at("targetDates")[0];write("chosen.json",{{"source",row},{"target",target}});
|
||||
const auto request=engine_reschedule_command(before,row.at("id"),target,"request:move");run(request,"move");const auto moved=link->snapshot();write("moved.json",moved);
|
||||
bool found=false;for(const auto &f:moved.at("calendar").at("data").at("fixtures"))if(f.at("round")==row.at("round")&&f.at("home").at("id")==row.at("home").at("id")&&f.at("away").at("id")==row.at("away").at("id"))found=f.at("scheduledDate")==target&&f.at("originalDate")==row.at("date")&&f.at("status")=="rescheduled";
|
||||
if(!found)throw std::runtime_error("fixture did not actually move");
|
||||
auto stale=request;stale["requestId"]="request:stale-move";if(link->command(stale).value("code","")!="stale_revision"||link->snapshot()!=moved)throw std::runtime_error("stale move changed state");
|
||||
const auto after_schedule=engine_scheduling_projection(moved);if(!after_schedule.at("movable").empty()){auto bad=request;bad["requestId"]="request:invalid-target";bad["expectedRevision"]=moved.at("desktop").at("meta").at("stateRevision");bad["payload"]={{"matchId",after_schedule.at("movable")[0].at("id")},{"date",after_schedule.at("movable")[0].at("date")}};const auto rejected=link->command(bad);write("invalid-target.json",rejected);if(rejected.value("messageType","")!="error"||link->snapshot()!=moved)throw std::runtime_error("invalid target changed state");}
|
||||
write("moved-saved.json",link->save_copy(out/"moved.obs"));link.reset();link=EngineBridge::open(world,out/"moved.obs");const auto loaded=link->snapshot();write("loaded-move.json",loaded);if(loaded.at("calendar").at("data")!=moved.at("calendar").at("data")||loaded.at("scheduling").at("data")!=moved.at("scheduling").at("data"))throw std::runtime_error("move lost in OBS round trip");
|
||||
run(engine_reschedule_undo(loaded,target,"request:undo"),"undo");const auto undone=link->snapshot();write("undone.json",undone);
|
||||
if(undone.at("calendar").at("data").at("fixtures")!=before.at("calendar").at("data").at("fixtures")||!undone.at("scheduling").at("data").at("moved").empty()||undone.at("desktop").at("data").at("accounts")!=before.at("desktop").at("data").at("accounts"))throw std::runtime_error("undo did not restore fixture/calendar or changed account");
|
||||
write("undone-saved.json",link->save_copy(out/"undone.obs"));link.reset();link=EngineBridge::open(world,out/"undone.obs");const auto final=link->snapshot();write("loaded-undo.json",final);if(final.at("calendar").at("data").at("fixtures")!=before.at("calendar").at("data").at("fixtures")||!final.at("scheduling").at("data").at("moved").empty())throw std::runtime_error("undo not persisted");
|
||||
}
|
||||
std::cout << "engine bridge " << argv[1] << " passed\n"; return 0;
|
||||
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
|
||||
}
|
||||
@@ -246,6 +246,36 @@ int main() {
|
||||
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");
|
||||
|
||||
auto cal=fixture();const Json season={{"startDate","2026-07-01"},{"endDate","2027-06-30"}};
|
||||
for(auto &[kind,row]:cal.items()){row["meta"]["season"]=season;row["meta"]["date"]="2026-07-01";row["meta"]["scope"]["allowedCommands"]={"fixture.reschedule"};}
|
||||
const auto meta_cal=cal.at("desktop").at("meta");
|
||||
const Json home={{"id","club:6"},{"name","Actual home"}},away={{"id","club:7"},{"name","Actual away"}};
|
||||
Json fx={{"id","fixture:real"},{"competition",{{"id","league:real"},{"kind","league"}}},{"round",3},{"scheduledDate","2026-08-05"},{"originalDate","2026-08-05"},{"home",home},{"away",away},{"status","scheduled"},{"result",nullptr}};
|
||||
const Json event={{"date","2026-08-05"},{"seasonDay",35},{"eventKinds",{"league"}},{"fixtureIds",{"fixture:real"}}};
|
||||
cal["calendar"]={{"messageType","snapshot"},{"meta",meta_cal},{"data",{{"kind","calendar"},{"from","2026-07-01"},{"until","2027-06-30"},{"days",{event}},{"fixtures",{fx}}}}};
|
||||
const Json move={{"id","opaque:source-42"},{"date","2026-08-05"},{"round",3},{"home",home},{"away",away},{"targetDates",{"2026-07-21","2027-01-18"}}};
|
||||
cal["scheduling"]={{"messageType","snapshot"},{"meta",meta_cal},{"data",{{"kind","scheduling"},{"movable",{move}},{"moved",Json::array()}}}};
|
||||
const auto initial_cal=cal;auto calendar=engine_calendar_projection(cal);
|
||||
require(calendar.at("count")==365&&calendar.at("today")==0&&calendar.at("fixtures")[0].at("day")==35,"calendar guessed an artificial fixture date");
|
||||
auto schedule=engine_scheduling_projection(cal);require(schedule.at("movable")[0].at("targets")==Json::array({20,201}),"target date mapping wrong");
|
||||
const auto move_cmd=engine_reschedule_command(cal,"opaque:source-42","2026-07-21","r");require(move_cmd.at("payload").at("matchId")=="opaque:source-42"&&move_cmd.at("expectedRevision")==meta_cal.at("stateRevision"),"move ID or revision reconstructed");
|
||||
rejects([&]{engine_reschedule_command(cal,"opaque:source-42","2026-07-22","r");});
|
||||
rejects([&]{engine_reschedule_command(cal,"invented","2026-07-21","r");});
|
||||
rejects([&]{engine_reschedule_undo(cal,"2026-08-05","r");});
|
||||
auto bad_cal=cal;bad_cal["calendar"]["data"]["days"][0]["fixtureIds"]={"ghost"};rejects([&]{engine_calendar_projection(bad_cal);});
|
||||
bad_cal=cal;bad_cal["calendar"]["data"]["from"]="2026-08-01";rejects([&]{engine_calendar_projection(bad_cal);});
|
||||
bad_cal=cal;bad_cal["calendar"]["data"]["fixtures"][0]["home"]["id"]="foreign";rejects([&]{engine_calendar_projection(bad_cal);});
|
||||
bad_cal=cal;bad_cal["scheduling"]["meta"]["scope"]["managerId"]="foreign";rejects([&]{engine_scheduling_projection(bad_cal);});
|
||||
bad_cal=cal;bad_cal["scheduling"]["data"]["movable"][0]["date"]="2026-08-06";rejects([&]{engine_scheduling_projection(bad_cal);});
|
||||
bad_cal=cal;for(auto &[kind,row]:bad_cal.items())row["meta"]["scope"]["allowedCommands"]=Json::array();require(!engine_scheduling_projection(bad_cal).at("allowed").get<bool>(),"calendar enables missing permission");rejects([&]{engine_reschedule_command(bad_cal,"opaque:source-42","2026-07-21","r");});
|
||||
auto moved_cal=cal;auto &moved_data=moved_cal["calendar"]["data"];moved_data["fixtures"][0]["scheduledDate"]="2026-07-21";moved_data["fixtures"][0]["status"]="rescheduled";moved_data["days"][0]["date"]="2026-07-21";moved_data["days"][0]["seasonDay"]=20;
|
||||
moved_cal["scheduling"]["data"]["movable"]=Json::array();moved_cal["scheduling"]["data"]["moved"]={{{"date","2026-07-21"},{"round",3},{"home",home},{"away",away}}};
|
||||
require(engine_reschedule_undo(moved_cal,"2026-07-21","r").at("payload").at("date")=="2026-07-21","undo used original or last-guessed date");
|
||||
require(cal==initial_cal,"calendar projections mutated source");
|
||||
auto leap=cal;for(auto &[kind,row]:leap.items()){row["meta"]["season"]={{"startDate","2027-07-01"},{"endDate","2028-06-30"}};row["meta"]["date"]="2028-02-29";}
|
||||
leap["calendar"]["data"]["from"]="2027-07-01";leap["calendar"]["data"]["until"]="2028-06-30";leap["calendar"]["data"]["fixtures"]=Json::array();leap["calendar"]["data"]["days"]={{{"date","2028-02-29"},{"seasonDay",243},{"eventKinds",{"national"}},{"fixtureIds",Json::array()}}};
|
||||
require(engine_calendar_projection(leap).at("count")==366&&engine_calendar_projection(leap).at("today")==243,"leap day lost in calendar geometry");
|
||||
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; }
|
||||
|
||||
Reference in new issue
Block a user