Bind league fixtures and round navigation to live engine data (by Codex)
This commit is contained in:
1 parent
1c35698dbe
commit
545e16f153
21 files changed
+207
-31
No files matched your search
@@ -11,7 +11,7 @@ using namespace bmh::modern_ui;
|
||||
int main(int argc, char **argv) {
|
||||
try {
|
||||
const std::string mode=argc>1?argv[1]:"";
|
||||
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports"};
|
||||
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures"};
|
||||
if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe <prepare[-two|-national|-almanac]|inspect[-friendlies|-almanac]|verify[-lineup|-sports|-bank|-commerce|-contracts|-calendar|-friendlies|-national|-almanac|-shootouts]> <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)); };
|
||||
@@ -337,6 +337,30 @@ int main(int argc, char **argv) {
|
||||
write("saved.json",link->save_copy(out/"reports.obs"));link.reset();link=EngineBridge::open(world,out/"reports.obs");
|
||||
if(link->read({{"kind","report-index"}}).at("data")!=index_read.at("data"))throw std::runtime_error("report index changed after OBS restart");
|
||||
}
|
||||
if(mode=="verify-fixtures") {
|
||||
const auto ir=link->read({{"kind","report-index"}}),idx=engine_report_index(before,ir);write("fixture-index.json",ir);Json rounds=Json::array();
|
||||
for(const auto &l:idx.at("leagues")) {
|
||||
const auto id=l.at("id").get<std::string>();const int count=l.at("matchdays");
|
||||
const auto next=link->read({{"kind","league-fixtures"},{"leagueId",id}});
|
||||
if(next.at("data").at("round")!=std::min(l.at("played").get<int>()+1,count))throw std::runtime_error("incorrect default fixture round");
|
||||
for(int round=1;round<=count;++round) {
|
||||
const Json request={{"kind","league-fixtures"},{"leagueId",id},{"round",round}};const auto r=link->read(request);(void)engine_fixtures_projection(before,ir,r,id,round);if(link->read(request)!=r)throw std::runtime_error("fixture read not pure/repeatable");rounds.push_back(r);
|
||||
}
|
||||
}
|
||||
write("all-rounds.json",rounds);if(link->snapshot()!=before)throw std::runtime_error("fixture reads changed state");
|
||||
const auto schedule=engine_scheduling_projection(before);
|
||||
if(!schedule.at("movable").empty()) {
|
||||
const auto &m=schedule.at("movable")[0];const auto command=engine_reschedule_command(before,m.at("id"),m.at("targetDates")[0],"request:fixture-move");
|
||||
const auto response=link->command(command);write("move-response.json",response);if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());
|
||||
const auto moved=link->snapshot();write("moved.json",moved);
|
||||
const auto &owner=moved.at("desktop").at("meta").at("scope").at("teamId");
|
||||
std::string league;for(const auto &l:idx.at("leagues"))if(std::find(l.at("members").begin(),l.at("members").end(),owner)!=l.at("members").end())league=l.at("id");
|
||||
const auto read=link->read({{"kind","league-fixtures"},{"leagueId",league},{"round",m.at("round")}});write("moved-fixtures.json",read);
|
||||
bool found=false;for(const auto &r:read.at("data").at("matches"))if(r.at("home").at("id")==m.at("home").at("id")&&r.at("away").at("id")==m.at("away").at("id")){found=true;if(r.at("status")!="rescheduled"||!r.at("result").is_null())throw std::runtime_error("reschedule marker displayed as score");}
|
||||
if(!found)throw std::runtime_error("moved fixture identity missing");write("moved-saved.json",link->save_copy(out/"moved.obs"));
|
||||
}
|
||||
write("saved.json",link->save_copy(out/"fixtures.obs"));
|
||||
}
|
||||
std::cout << "engine bridge " << argv[1] << " passed\n"; return 0;
|
||||
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
|
||||
}
|
||||
@@ -372,6 +372,13 @@ int main() {
|
||||
bad_report=report_read;bad_report["data"]["table"][1]["rank"]=1;rejects([&]{engine_report_projection(report_bundle,report_index_read,bad_report,"league:live",0);});
|
||||
bad_report=report_read;bad_report["data"]["filter"]=3;rejects([&]{engine_report_projection(report_bundle,report_index_read,bad_report,"league:live",0);});
|
||||
auto bad_index=report_index_read;bad_index["data"]["leagues"][0]["members"][1]="club:6";rejects([&]{engine_report_index(report_bundle,bad_index);});
|
||||
const Json fixture_read_data={{"kind","league-fixtures"},{"leagueId","league:live"},{"league",{{"id","league:live"},{"name","Live League"}}},{"round",1},{"rounds",2},{"matches",{{{"id","fixture:one"},{"home",{{"id","club:6"},{"name","Live A"}}},{"away",{{"id","club:7"},{"name","Live B"}}},{"status","open"},{"result",nullptr}}}}};
|
||||
const auto fixture_read=report_wrap("league-fixtures",fixture_read_data);const auto fixture_value=engine_fixtures_projection(report_bundle,report_index_read,fixture_read,"league:live",1);
|
||||
require(fixture_value.at("matches")[0].at("home_goals").is_null()&&fixture_value.at("matches")[0].at("home")=="club:6","fixture adapter invented an open result");
|
||||
auto bad_fixture=fixture_read;bad_fixture["data"]["matches"][0]["result"]={12,14};rejects([&]{engine_fixtures_projection(report_bundle,report_index_read,bad_fixture,"league:live",1);});
|
||||
bad_fixture=fixture_read;bad_fixture["data"]["round"]=2;rejects([&]{engine_fixtures_projection(report_bundle,report_index_read,bad_fixture,"league:live",1);});
|
||||
bad_fixture=fixture_read;bad_fixture["data"]["matches"][0]["away"]["id"]="club:6";rejects([&]{engine_fixtures_projection(report_bundle,report_index_read,bad_fixture,"league:live",1);});
|
||||
bad_fixture=fixture_read;bad_fixture["meta"]["stateRevision"]="42";rejects([&]{engine_fixtures_projection(report_bundle,report_index_read,bad_fixture,"league:live",1);});
|
||||
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; }
|
||||
|
||||
@@ -47,6 +47,18 @@ int main() try {
|
||||
for(const auto &r:*at(at(second,"data"),"table").array()){check(integer(at(r,"played"))==0,"unplayed second half has no invented matches");ranks.push_back(integer(at(r,"rank")));}
|
||||
std::sort(ranks.begin(),ranks.end());for(size_t i=0;i<ranks.size();++i)check(ranks[i]==int(i+1),"unplayed half has unique engine ranks");
|
||||
for(const auto &r:*at(at(all,"data"),"strengths").array())check(std::holds_alternative<std::nullptr_t>(at(r,"strength").value),"absent squads do not receive fake strength");
|
||||
const auto fixtures=[&](int round){return modern::ui_read(g,context,O{{"kind","league-fixtures"},{"leagueId","league:0"},{"round",round}});};
|
||||
const auto played_fixture=fixtures(1);const auto& first_fixture=at(at(played_fixture,"data"),"matches").array()->at(0);
|
||||
check(*at(first_fixture,"status").string()=="played" && integer(at(first_fixture,"result").array()->at(0))==2,"played fixture keeps its actual score");
|
||||
for(const auto marker:{0xcc,0xcd,0xce,0xde,0xee,0xcf}) {
|
||||
g.results[0]=uint8_t(marker);const auto r=fixtures(1);const auto& m=at(at(r,"data"),"matches").array()->at(0);
|
||||
const std::string expected=(marker&0xcf)==0xcc?"open":(marker&0xcf)==0xcd?"postponed":(marker&0xcf)==0xce?"rescheduled":"unavailable";
|
||||
check(*at(m,"status").string()==expected && std::holds_alternative<std::nullptr_t>(at(m,"result").value),"unplayed markers cannot become 12:14 scores");
|
||||
}
|
||||
g.results[0]=0x21;
|
||||
const auto next=modern::ui_read(g,context,O{{"kind","league-fixtures"},{"leagueId","league:0"}});
|
||||
check(integer(at(at(next,"data"),"round"))==3,"default round is the engine's next matchday");
|
||||
check(*at(fixtures(0),"messageType").string()=="error"&&*at(fixtures(35),"messageType").string()=="error","round boundaries enforced");
|
||||
const auto invalid=read(5);check(*at(invalid,"messageType").string()=="error","invalid filter rejected");
|
||||
const auto foreign=modern::ui_read(g,context,O{{"kind","report-index"},{"managerId","manager:not-active"}});check(*at(foreign,"code").string()=="manager_not_active","foreign manager rejected");
|
||||
std::cout<<"report subsets, empty halves, engine parity and scope passed\n";return 0;
|
||||
|
||||
Reference in new issue
Block a user