Bind environment and advertising to confirmed engine actions (by Codex)

This commit is contained in:
Codex committed 2026-10-28 11:58:57 +01:00
1 parent dcf42f2da7
commit e9483048f4
19 files changed
+395 -23

No files matched your search

+29 -1
View File
@@ -4,11 +4,12 @@
#include "modern/app/modern_session.hpp"
#include "modern/content/world_package.hpp"
#include <iostream>
#include <algorithm>
using namespace bmh;
using namespace bmh::modern_ui;
int main(int argc, char **argv) {
try {
if (argc != 4 || (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")) throw std::runtime_error("usage: modern_engine_bridge_probe prepare|verify|verify-lineup|verify-sports|verify-bank <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")) 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>");
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") {
@@ -115,6 +116,33 @@ int main(int argc, char **argv) {
link = EngineBridge::open(world,out / "bank.obs"); const auto loaded = link->snapshot(); write("bank-loaded.json",loaded);
for (const auto *kind : {"bank","credit","stadium"}) if (loaded.at(kind).at("data") != after.at(kind).at("data")) throw std::runtime_error("finance lost during OBS round trip");
}
if (std::string(argv[1]) == "verify-commerce") {
const auto run = [&](const Json &request, const std::string &name) {
const 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());
};
run(engine_environment_command(before,"environment:doctor",3,"request:environment"),"environment");
const auto env=link->snapshot();write("environment-after.json",env);
if(env.at("desktop").at("data").at("accounts")!=before.at("desktop").at("data").at("accounts"))throw std::runtime_error("monthly environment budget debited immediately");
for(int slot:{0,14,15}) {
const auto now=link->snapshot(),view=engine_advertising_projection(now);
const auto &choices=view.at("slots")[size_t(slot)].at("choices");
auto chosen=std::find_if(choices.begin(),choices.end(),[](const auto &q){return q.at("can_accept")==true;});
if(chosen==choices.end())throw std::runtime_error("no test advertising offer");
run(engine_advertising_command(now,chosen->at("offer_id"),"request:ad-"+std::to_string(slot)),"ad-"+std::to_string(slot));
}
for(const auto *id:{"budget:press","budget:fans","budget:merchandise"}) {
run(engine_budget_command(link->snapshot(),id,1000,std::string("request:")+id),std::string(id).substr(7));
}
const auto after=link->snapshot();write("commerce-after.json",after);
auto stale=engine_environment_command(before,"environment:doctor",4,"request:commerce-stale");
const auto rejected=link->command(stale);write("stale-rejected.json",rejected);
if(rejected.value("code","")!="stale_revision" || link->snapshot()!=after)throw std::runtime_error("stale commerce command mutated state");
write("commerce-saved.json",link->save_copy(out/"commerce.obs"));link.reset();link=EngineBridge::open(world,out/"commerce.obs");
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");
}
std::cout << "engine bridge " << argv[1] << " passed\n"; return 0;
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
}
+49
View File
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/engine_bridge.hpp"
#include <iostream>
#include <algorithm>
#include <array>
#include <limits>
#include <stdexcept>
@@ -171,6 +172,54 @@ int main() {
broken_bank = bank; broken_bank["desktop"]["meta"]["scope"]["allowedCommands"] = Json::array();
for (auto &[kind,row] : broken_bank.items()) row["meta"]["scope"]["allowedCommands"] = Json::array();
rejects([&] { engine_ticket_command(broken_bank,10,"r"); });
auto commerce = fixture();
for (auto &[kind,row] : commerce.items()) row["meta"]["scope"]["allowedCommands"] = {"environment.commit","advertising.accept","budget.commit"};
const auto cm = commerce.at("desktop").at("meta");
Json items = Json::array(), youth = Json::array();
const std::array<std::string,6> ek{"youth_youngest","youth_academy","youth_oldest","co_trainer","doctor","physio"};
for (int i=0;i<6;++i) {
items.push_back({{"id","environment:"+ek[i]},{"level",1},{"maxLevel",6},{"monthly",M(1000000+i)},{"stepCost",M(200000+i)}});
if(i<3) youth.push_back({{"id","youth:"+ek[i]},{"place",i},{"league",i},{"strength",80}});
}
commerce["environment"]={{"messageType","snapshot"},{"meta",cm},{"data",{{"kind","environment"},{"items",items},{"youth",youth},{"academyActive",true}}}};
auto ep = engine_environment_projection(commerce);
require(ep.at("rows")[1].at("cost")==1000001 && ep.at("rows")[2].at("rank")==3 && ep.at("rows")[2].at("league")==3,"environment replaced actual budgets or used zero-based display positions");
std::reverse(commerce["environment"]["data"]["items"].begin(),commerce["environment"]["data"]["items"].end());
require(engine_environment_projection(commerce)==ep,"environment IDs depend on transport order");
require(engine_environment_command(commerce,"environment:doctor",6,"r").at("payload").at("level")==6,"environment level wrong");
rejects([&]{engine_environment_command(commerce,"environment:unknown",1,"r");});
rejects([&]{engine_environment_command(commerce,"environment:doctor",7,"r");});
Json boards=Json::array();
auto contract=[&](const std::string &id) {return Json{{"id",id},{"active",false},{"sponsor",nullptr},{"monthly",M(0)},{"monthsRemaining",0},{"offers",Json::array()}};};
for(int i=0;i<14;++i)boards.push_back(contract("ad:board/"+std::to_string(i)));
boards[0]["offers"]={{{"id","offer:ad-0-7"},{"sponsor","Synthetic & Co"},{"monthly",M(123400)},{"months",18},{"boards",2},{"allowed",true}},{{"id","offer:ad-0-9"},{"sponsor","Unavailable"},{"monthly",M(120000)},{"months",12},{"boards",1},{"allowed",false}}};
auto shirt=contract("ad:shirt"),tv=contract("ad:tv");shirt["active"]=true;shirt["sponsor"]="Existing";shirt["monthly"]=M(200000);shirt["monthsRemaining"]=5;
shirt["offers"]={{{"id","offer:ad-14-4"},{"sponsor","Extension"},{"monthly",M(220000)},{"months",12},{"boards",1},{"allowed",true}}};
Json budgets=Json::array();for(const auto *id:{"budget:merchandise","budget:press","budget:fans"})budgets.push_back({{"id",id},{"current",M(1000)},{"maximum",M(50000)},{"available",true},{"deliveryWeeks",0}});
commerce["advertising"]={{"messageType","snapshot"},{"meta",cm},{"data",{{"kind","advertising"},{"teamId","club:6"},{"boards",boards},{"shirt",shirt},{"television",tv},{"budgets",budgets},{"preview",{{"income",M(11)},{"expenses",M(99)},{"balance",M(-88)}}}}}};
const auto unchanged_commerce=commerce,ap=engine_advertising_projection(commerce);
require(ap.at("balance")==-88 && ap.at("slots")[0].at("choices").size()==2,"advertising invented preview or offers");
require(engine_advertising_quote(commerce,0,0).at("boards")==2 && engine_advertising_quote(commerce,0,1).at("can_accept")==false,"bundle size or offer restriction lost");
require(engine_advertising_quote(commerce,14,0).at("active")==true && engine_advertising_quote(commerce,14,1).at("can_accept")==true,"existing contract hides valid extension");
require(engine_advertising_quote(commerce,15,0).at("can_accept")==false,"empty TV offer fabricated");
require(engine_advertising_command(commerce,"offer:ad-0-7","r").at("payload").at("offerId")=="offer:ad-0-7","sparse offer ID replaced by index");
rejects([&]{engine_advertising_command(commerce,"offer:ad-0-9","r");});
rejects([&]{engine_advertising_command(commerce,"offer:ad-0-0","r");});
require(engine_budget_command(commerce,"budget:press",500,"r").at("payload").at("amount")==M(50000),"budget money converted twice");
rejects([&]{engine_budget_command(commerce,"budget:press",501,"r");});
auto blocked=commerce;blocked["advertising"]["data"]["budgets"][0]["deliveryWeeks"]=2;
rejects([&]{engine_budget_command(blocked,"budget:merchandise",1,"r");});
blocked=commerce;blocked["advertising"]["meta"]["scope"]["managerId"]="foreign";
rejects([&]{engine_advertising_projection(blocked);});
blocked=commerce;blocked["environment"]["meta"]["stateRevision"]="1";
rejects([&]{engine_environment_projection(blocked);});
blocked=commerce;
for (auto &[kind,row] : blocked.items()) row["meta"]["scope"]["allowedCommands"]=Json::array();
require(engine_advertising_quote(blocked,0,0).at("can_accept")==false && engine_advertising_projection(blocked).at("spending")[0].at("available")==false,"missing capabilities remain interactively enabled");
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");
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; }