diff --git a/assets/modern/contracts.rcss b/assets/modern/contracts.rcss index 048f28f..4cb957d 100644 --- a/assets/modern/contracts.rcss +++ b/assets/modern/contracts.rcss @@ -115,3 +115,10 @@ body.midnight .contract-insurance-options .contract-insurance-caption {color:#a4 body.midnight .contract-bonus-row {border-color:#c5d9e71f;color:#cadde9;} body.silver .contract-control {decorator:linear-gradient(180deg,#ffffffb0,#bfd0e259);} body.matchday .contract-control {decorator:linear-gradient(180deg,#e8d6dc12,#a1a0aa0d);} + +/* Positive salary totals use money semantics rather than the skin accent. */ +body .contracts-total-value.money-amount {color:var(--money);} + +/* Give the right-aligned total a real box and room for the currency glyph. */ +.contracts-salary-total {right:26dp;width:620dp;} +.contracts-salary-total span {width:100%;max-width:100%;text-align:right;} diff --git a/docs/new_ui/NATIVE_STATUS.md b/docs/new_ui/NATIVE_STATUS.md index 2d5c427..075590f 100644 --- a/docs/new_ui/NATIVE_STATUS.md +++ b/docs/new_ui/NATIVE_STATUS.md @@ -6,7 +6,7 @@ Die normale Classic-Konfiguration bleibt unverändert; die neue Oberfläche wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut. Der [opt-in Engine-Einstieg](integration/ENGINE_ENTRY.md) lädt inzwischen eine -echte Modern-OBS-Karriere und bindet Schreibtisch, Trainingslager, Aufstellung, Taktik, Training, Bank, Eintrittspreis, Umfeld und Werbung an die +echte Modern-OBS-Karriere und bindet Schreibtisch, Trainingslager, Aufstellung, Taktik, Training, Bank, Eintrittspreis, Umfeld, Werbung und Spielerverträge an die Session. Kader und Profile zeigen die tatsächlichen Sessionwerte; Spielertausch verwendet die bestätigte Engineaktion. Preisbestätigung, Buchung und Speichern als neue OBS-Datei sind echte Engineoperationen. Dieser Einstieg ist auf diesen Umfang begrenzt; die übrigen diff --git a/docs/new_ui/desktop/contracts/README.md b/docs/new_ui/desktop/contracts/README.md index 7bb9174..f450ffe 100644 --- a/docs/new_ui/desktop/contracts/README.md +++ b/docs/new_ui/desktop/contracts/README.md @@ -1,5 +1,49 @@ # Verträge +## Echter Engine-Einstieg · 28. Oktober 2026 + +Mit `--ui-career` verwenden die bestehenden drei Tabellen den Read `contracts` +und die aktuellen Kaderwerte. Gehälter und Restlaufzeiten werden weder aus dem +Weltkatalog geschätzt noch aus Saisongehältern abgeleitet. Nicht gelieferte +Spiele/Noten bleiben unbekannt. Monatsgehälter werden einmal exakt in Minor +Units gelesen und für die Summe addiert. Die rechte Summe hat ausdrücklich +bemessene Textfelder; Betrag und Währungszeichen bleiben im Fenster. + +Das Öffnen eines Spielers, Tabwechsel und Details sind lesend. Erst +**Forderungen abfragen** sendet `quote.request {kind: contract, playerId}`. +Die vier Forderungen, verfügbare Laufzeiten und Gehaltsgrenze kommen aus der +Engine. Nicht angebotene Laufzeiten erscheinen gesperrt. Im tatsächlichen +Modern-Datensatz der Prüfung benötigte diese Abfrage keinen Zufallszug; der +Client setzt dies nicht voraus und erzeugt selbst keinen. + +Gehalts- und Laufzeitänderungen bleiben lokal. Der Zahleneditor bestätigt nur +den Entwurf; danach fragt **Angebot machen** nach einer eigenen verbindlichen +Bestätigung. `contract.offer` verwendet die genaue Quote-ID, Spieler, Manager, +Karriere und aktuelle Revision. Annahme oder Ablehnung folgen ausschließlich +der Engineantwort. Ein abgelehntes Angebot kann den Spieler nach Originalregel +für weitere Gespräche sperren; dies wird beim erneuten Öffnen berücksichtigt. +Es gibt keine 110-%-Demoforderung und keinen garantierten Verhandlungserfolg. + +Schließen einer angefragten Verhandlung sendet den neu ergänzten +`contract.cancel {quoteId}`. Der Adapter prüft aktuelle Revision, Manager, +Verein und genaue Quote-ID. Er schließt nur den zugehörigen Owner und ändert +weder Gehalt noch Laufzeit oder Zufallsgeneratoren. Eine Wiederholung derselben +requestId ist idempotent; fremde oder alte Anfragen ändern nichts. Die folgende +Schreibtischaktion bleibt damit bedienbar. Forderungsabfrage/Abbruch verändern +die Sessionrevision und werden vorsichtshalber als ungespeichert markiert. + +Versicherungsrestlaufzeit und die sieben gespeicherten Prämienstufen sind über +**Details** lesbar. Neue Versicherungen und Prämienänderungen sind bis zu einem +entsprechenden Engine-Schreibvertrag gesperrt. Die vorhandenen Rohstufen werden +nicht als erfundene Eurobeträge oder gemeinsame Teamwerte ausgegeben. + +Neue OBS-Dateien erhalten tatsächliche Verträge und Ablehnungssperren; ein +vollständiger Prozessneustart öffnet keine alte Verhandlung. Private Nachweise: +`bmh_4k_ui/docs/qa/engine-contracts-2026-10-28/`. +Siehe [Engine-Einstieg](../../integration/ENGINE_ENTRY.md). + +## Getrennte Präsentationsdemo + Stand: 24. Oktober 2026. HTML-Gold: `bmh_4k_ui`, Revision `ea6c8d97`, `management-menus.js`, `career-menus.css` und `poc-menus.css`. Die native Ansicht bietet Daten A, Daten B und Gehalt sowie Verhandlung, diff --git a/docs/new_ui/integration/ENGINE_ENTRY.md b/docs/new_ui/integration/ENGINE_ENTRY.md index c87104c..3d305f8 100644 --- a/docs/new_ui/integration/ENGINE_ENTRY.md +++ b/docs/new_ui/integration/ENGINE_ENTRY.md @@ -17,7 +17,7 @@ werden. Die Quelle wird nicht in DemoSource überführt. ## Gebundener Umfang -- `ModernSession::ui_read`: `session`, `desktop`, `camps`, `squad`, `lineup`, `tactics`, `training`, `bank`, `stadium`, `credit`, `environment`, `advertising`. Karriere, Manager, +- `ModernSession::ui_read`: `session`, `desktop`, `camps`, `squad`, `lineup`, `tactics`, `training`, `bank`, `stadium`, `credit`, `environment`, `advertising`, `contracts`. Karriere, Manager, Mannschaft, Datum, Saison, Geld, Lagerqualitäten und Angebote kommen aus der Engine. Katalog und Engine müssen dieselbe Welt-ID und Datenrevision haben. - Der bestehende RmlUI-Schreibtisch verwendet die gemeinsamen App-Buttons und @@ -135,6 +135,42 @@ Native Tests bestätigen acht echte Änderungen, schreibgeschützte Abbrüche, einen sauberen bestätigten No-op, bestehende Liefersperren und OBS-Neustarts. Nachweise: `bmh_4k_ui/docs/qa/engine-commerce-2026-10-28/`. +## Spielerverträge + +Die [drei Vertragstabellen](../desktop/contracts/README.md) zeigen tatsächliche +Gehälter, Laufzeiten, Versicherung und Kaderwerte. Öffnen und Browsing fragen +keine Gehaltsforderung ab. Erst „Forderungen abfragen“ verwendet den vorhandenen +Command `quote.request {kind: contract, playerId}`. Der Read liefert danach die +Quote-ID, vier Forderungen und die maximale Monatsvergütung. Entwürfe und +Zahleneditor allein verändern diese Enginewerte nicht. + +Erst eine gesonderte Bestätigung sendet `contract.offer` mit exakter Quote-ID, +Jahren und `monthlySalary` in Minor Units. Der Client zeigt Annahme oder +Ablehnung aus der tatsächlichen Antwort; ein Original-Ablehnungsflag sperrt +gegebenenfalls den nächsten Versuch. Keine UI-Zufallszahl oder Demoforderung +ersetzt diese Entscheidung. Versicherung und Prämien bleiben hier lesend. + +### Ergänzter Runtime-Command: `contract.cancel` + +Der Payload ist `{quoteId: "quote:contract-"}`; die gemeinsame Hülle benötigt +`requestId`, `careerId`, `expectedRevision`, `owner.managerId` und `kind` wie die +anderen Commands. Die Capability wird nur am Vereinsschreibtisch bekanntgegeben. +Die Engine prüft die genaue Quote sowie deren Manager und Verein, schließt sie +und erhöht die Sessionrevision. Sie verändert keine Vertragsdaten und weder +spult sie Zufall zurück noch zieht sie neuen. Eine falsche/verbrauchte Quote +führt zu `stale_quote`; eine alte Revision zu `stale_revision`. Dieselbe +requestId erhält die bereits bekannte Antwort, ohne erneut zu schließen. + +Dies ergänzt die aktuelle Runtime-Implementierung; die allgemeinen JSON-Schemas +bleiben der separat gekennzeichnete Entwurf. Beim bloß lokalen Schließen ohne +angefragte Quote ist kein Command nötig. Nach einem echten Cancel bleibt eine +andere Schreibtischaktion möglich. In der geprüften Modern-Karriere blieb auch +der gespeicherte RNG bei der Forderungsabfrage gleich; erst die tatsächlichen +Vertragsentscheidungen änderten ihn. Der UI-Code setzt diesen Sonderfall nicht +als Regel fest. Neue OBS-Datei und Neustart erhalten den tatsächlichen Vertrag +und die Sperren, ohne einen offenen Quote-Owner zu hinterlassen. +Private Belege: `bmh_4k_ui/docs/qa/engine-contracts-2026-10-28/`. + ## Ausführung und Dateien Laden, Reads nach einer Aktion, Buchen und Speichern laufen seriell über einen diff --git a/src/modern/app/modern_session.cpp b/src/modern/app/modern_session.cpp index 4a381f0..282fdd7 100644 --- a/src/modern/app/modern_session.cpp +++ b/src/modern/app/modern_session.cpp @@ -10018,6 +10018,16 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision answer = modern::ui_command_result(request_id, previous, revision, {"stadium", "desktop", "bank"}, !feedback.empty() ? feedback : yes ? "Der Bau beginnt." : "Abgelehnt."); } + } else if (kind == "contract.cancel") { + // Close only this owner's exact quote. Releasing the UI owner must + // neither rewind nor advance either engine random stream. + const int team = g_.manager_teams[size_t(manager)]; + if (!contract_quote_ || ui_text(*payload, "quoteId") != "quote:contract-" + std::to_string(contract_quote_->quote_id) || + contract_quote_->manager_slot != manager || contract_quote_->runtime_club != team) + return refuse("stale_quote", "Diese Verhandlung ist nicht mehr geöffnet."); + contract_quote_.reset(); + revision = previous + 1; + answer = modern::ui_command_result(request_id, previous, revision, {"contracts"}, "Verhandlung abgebrochen."); } else if (kind == "quote.request" || kind == "contract.offer") { // quote.request {kind: "contract", playerId}: the player's demands for one to four years // (draws a random number, as at the desk); contract.offer {quoteId, years 1-4, diff --git a/src/modern/content/ui_contract.cpp b/src/modern/content/ui_contract.cpp index ef612cc..06b3b62 100644 --- a/src/modern/content/ui_contract.cpp +++ b/src/modern/content/ui_contract.cpp @@ -139,7 +139,7 @@ A allowed_commands(const ModernState& g, const UiContext& c) { "session.advance", "lineup.commit", "tactics.commit", "friendly.book", "manager.resign.commit", "training.commit", "camp.book", "bank.commit", "toto.submit", "quote.request", "contract.offer", "stadium.commit", "advertising.accept", "budget.commit", "ticket.commit", "transfer.submit", - "sponsor.answer", "environment.commit", "fixture.reschedule"}; + "sponsor.answer", "environment.commit", "fixture.reschedule", "contract.cancel"}; A out; for (size_t i = 0; i < std::size(kAll); ++i) if (!national || i < 5) out.push_back(kAll[i]); diff --git a/src/modern/ui/contracts_controls.inc b/src/modern/ui/contracts_controls.inc index 74ca4d0..2d996eb 100644 --- a/src/modern/ui/contracts_controls.inc +++ b/src/modern/ui/contracts_controls.inc @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-only void App::close_contracts(bool focus) { + if (engine_mode_) { engine_contracts_close(focus); return; } auto restore = contracts_return_focus_; if (focus && !restore.empty()) { const auto snapshot = snap(); @@ -22,6 +23,7 @@ void App::close_contracts(bool focus) { bool App::contracts_action(const std::string &action, Rml::Element *target) { if (menu_ != "contracts") return false; + if (engine_mode_) return engine_contracts_action(action, target); constexpr std::array actions = {"contracts-tab", "contract-player", "contract-close", "contract-term", "contract-salary", "contract-submit", "contract-insurance", "contract-insure", "contracts-bonuses", "contract-bonus"}; diff --git a/src/modern/ui/contracts_screens.inc b/src/modern/ui/contracts_screens.inc index e360c2c..b32745c 100644 --- a/src/modern/ui/contracts_screens.inc +++ b/src/modern/ui/contracts_screens.inc @@ -72,15 +72,16 @@ bool contracts_bound(const Snapshot &snapshot, uint64_t revision, } // namespace std::string App::render_contracts() { - const auto snapshot = snap(); - const auto projection = contracts_projection(snapshot); + const auto snapshot = engine_mode_ ? Snapshot{input_revision(), world_, Json::object()} : snap(); + const auto projection = engine_mode_ ? engine_contracts_projection(engine_data_) : contracts_projection(snapshot); + const auto show_money = [&](const Json &v) { return engine_mode_ ? (v.is_number_integer() ? money(v.get(), {{"code", "EUR"}, {"minor_units", 2}}) : std::string("—")) : contracts_money(v, *snapshot.world); }; const bool ready = projection.value("ok", false) && snapshot.world; const auto &rows = contracts_field(projection, "rows"); const size_t count = rows.is_array() ? rows.size() : 0; if (contracts_tab_ < 0 || contracts_tab_ > 2) contracts_tab_ = 2; if (contracts_dialog_.empty() && contracts_player_.empty() && count) contracts_player_ = contracts_text(contracts_field(rows[0], "id"), ""); - const auto managed = contracts_managed(snapshot); + const auto managed = engine_mode_ ? projection.at("club").get() : contracts_managed(snapshot); const auto *own = snapshot.world ? snapshot.world->find("clubs", managed) : nullptr; const auto club_name = own ? snapshot.world->name(*own) : std::string("—"); std::string output = "
" @@ -88,8 +89,8 @@ std::string App::render_contracts() { (own ? img(own->value("crest", ""), 58, 58, true) : "") + "" + esc(club_name) + "

" + std::to_string(count) + " Spieler · Spieler anklicken, um einen Vertrag zu verhandeln

" - "
Monatsgehälter" + - (ready ? esc(contracts_money(contracts_field(projection, "salary_total"), *snapshot.world)) : "—") + + "
Monatsgehälter" + + (ready ? esc(show_money(contracts_field(projection, "salary_total"))) : "—") + "
" "
"; const std::array>, 3> headings = {{ @@ -126,7 +127,7 @@ std::string App::render_contracts() { else { std::string value; if (key == "position") value = contracts_position(row); - else if (key == "salary") value = ready ? contracts_money(contracts_field(row, "salary"), *snapshot.world) : "—"; + else if (key == "salary") value = ready ? show_money(contracts_field(row, "salary")) : "—"; else if (key == "months") value = contracts_number(contracts_field(row, "months")) + " Monate"; else if (key == "insurance") { const auto &insurance = contracts_field(row, "insurance"); @@ -152,7 +153,7 @@ std::string App::render_contracts() { "id=\"contracts-tab-" + std::to_string(tab) + "\" data-id=\"" + std::to_string(tab) + "\" aria-pressed=\"" + (contracts_tab_ == tab ? "true" : "false") + "\""); output += btn("contracts-bonuses", "Team-Prämien", "contract-control bonuses", - "id=\"contracts-bonuses\" " + std::string(ready ? "" : "disabled")) + "
"; + "id=\"contracts-bonuses\" " + std::string(ready && !engine_mode_ ? "" : "disabled")) + "
"; if (contracts_dialog_.empty()) return output; const auto &draft_row = contracts_field(contract_draft_, "row"); @@ -173,9 +174,12 @@ std::string App::render_contracts() { const auto &proposed = contracts_field(contract_draft_, "salary"); const auto &months = contracts_field(contract_draft_, "months"); const auto source = contracts_text(contracts_field(draft_row, "source_label")); - const int64_t factor = world ? finance_currency_factor(*world) : 1; - // Fictional asking price follows the HTML preview, never an engine demand. - const Json demand = salary.is_number_integer() + const int64_t factor = engine_mode_ ? 100 : world ? finance_currency_factor(*world) : 1; + const auto engine_quote = engine_mode_ ? projection.at("quote") : Json(); + const bool quoted = engine_quote.is_object() && engine_quote.at("player") == contracts_player_; + const int term_index = months.is_number_integer() ? std::clamp(months.get() / 12 - 1, 0, 3) : 0; + // Demo asking prices never enter a real negotiation. + const Json demand = engine_mode_ ? (quoted ? engine_quote.at("demands")[size_t(term_index)] : Json()) : salary.is_number_integer() ? Json(((salary.get() / factor * 11 + 5) / 10) * factor) : Json(); body = "

" + esc(contracts_position(draft_row)) + " · Stärke " + esc(contracts_number(contracts_field(draft_row, "strength"))) + @@ -184,26 +188,33 @@ std::string App::render_contracts() { "

" + img("contracts.scene.1", 955, 291.0625) + "
" "
Aktuelles Monatsgehalt" + - (world ? esc(contracts_money(salary, *world)) : "—") + - "
Fiktive Forderung" - "" + (world ? esc(contracts_money(demand, *world)) : "—") + + (world ? esc(show_money(salary)) : "—") + + "
" + std::string(engine_mode_ ? "Forderung für die gewählte Laufzeit" : "Fiktive Forderung") + "" + "" + (world ? esc(show_money(demand)) : "—") + "
Laufzeit" + esc(contracts_number(months)) + " Monate
Dein Angebot pro Monat" "Betrag über die gemeinsame Zahleneingabe ändern
" + btn("contract-salary", "" + (world && proposed.is_number_integer() - ? esc(std::to_string(proposed.get())) : "—") + "", - "contract-salary-input amount-trigger", "id=\"contract-salary\" aria-haspopup=\"dialog\" aria-label=\"Angebotenes Monatsgehalt ändern\"") + - "

Erst „Angebot machen“ übernimmt Gehalt und Laufzeit.

"; + ? esc(engine_mode_ ? money(proposed.get() * 100, {{"code", "EUR"}, {"minor_units", 2}}) : std::to_string(proposed.get())) : "—") + "", + "contract-salary-input amount-trigger", "id=\"contract-salary\" aria-haspopup=\"dialog\" aria-label=\"Angebotenes Monatsgehalt ändern\" " + std::string(engine_mode_ && !quoted ? "disabled" : "")) + + "

" + std::string(engine_mode_ ? (!contracts_notice_.empty() ? contracts_notice_ : "Forderungen ausdrücklich abfragen. Erst das bestätigte Angebot wird verhandelt.") : "Erst „Angebot machen“ übernimmt Gehalt und Laufzeit.") + "

"; actions = close("Abbrechen") + - btn("contract-insurance", "Versichern", "contract-control", "id=\"contract-insurance\"") + + btn("contract-insurance", "" + std::string(engine_mode_ ? "Details" : "Versichern") + "", "contract-control", "id=\"contract-insurance\"") + + (engine_mode_ && !quoted ? btn("contract-quote", "Forderungen abfragen", "contract-control contract-submit", "id=\"contract-quote\" " + std::string(draft_row.value("can_request", false) && engine_quote.is_null() ? "" : "disabled")) : btn("contract-submit", "Angebot machen", "contract-control contract-submit", - "id=\"contract-submit\" " + std::string(proposed.is_number_integer() ? "" : "disabled")); + "id=\"contract-submit\" " + std::string(proposed.is_number_integer() && (!engine_mode_ || (!demand.is_null() && engine_quote.value("can_offer", false) && proposed.get() >= 0 && proposed.get() <= engine_quote.at("max_salary").get() / 100)) ? "" : "disabled"))); + } else if (engine_mode_ && contracts_dialog_ == "engine-details") { + title = "Versicherung und Prämien · " + player_name; + body = "

Versicherung: " + contracts_number(draft_row.at("insurance")) + " Monate · Versicherung und Prämien sind hier schreibgeschützt.

"; + const std::array labels{"Torprämie", "Punktprämie", "Auflaufprämie", "Meisterprämie", "Prämie Pl. 2–5", "Prämie Pl. 6–10", "Nichtabstiegsprämie"}; + for (size_t i = 0; i < labels.size(); ++i) body += "
" + std::string(labels[i]) + "Stufe " + contracts_number(draft_row.at("premiums")[i]) + "
"; + body += "
"; actions = close("Zurück zur Verhandlung"); } else if (insurance) { const auto current = contracts_field(draft_row, "insurance"); body = "

Wähle die Versicherungsdauer für diesen Spieler.

" @@ -238,7 +249,7 @@ std::string App::render_contracts() { actions = close("Verstanden"); } return output + "
" "

" + esc(title) + "

" + body + "
"; diff --git a/src/modern/ui/engine_bridge.cpp b/src/modern/ui/engine_bridge.cpp index 334a6e2..3906873 100644 --- a/src/modern/ui/engine_bridge.cpp +++ b/src/modern/ui/engine_bridge.cpp @@ -30,7 +30,7 @@ std::shared_ptr EngineBridge::open(const fs::path &world, const fs } Json EngineBridge::snapshot() const { Json bundle = Json::object(); - for (const auto *kind : {"session", "desktop", "camps", "squad", "lineup", "tactics", "training", "bank", "stadium", "credit", "environment", "advertising"}) + for (const auto *kind : {"session", "desktop", "camps", "squad", "lineup", "tactics", "training", "bank", "stadium", "credit", "environment", "advertising", "contracts"}) bundle[kind] = from_engine(impl_->session->ui_read(cli::Json::Object{{"kind", kind}}, impl_->revision)); validate_engine_desk(bundle); return bundle; diff --git a/src/modern/ui/engine_bridge.hpp b/src/modern/ui/engine_bridge.hpp index 00b1092..f61b151 100644 --- a/src/modern/ui/engine_bridge.hpp +++ b/src/modern/ui/engine_bridge.hpp @@ -33,6 +33,11 @@ Json engine_advertising_quote(const Json &bundle, int slot, int choice); Json engine_advertising_command(const Json &bundle, const std::string &offer, const std::string &request_id); Json engine_budget_command(const Json &bundle, const std::string &budget, int64_t euros, const std::string &request_id); +Json engine_contracts_projection(const Json &bundle); +Json engine_contract_request(const Json &bundle, const std::string &player, const std::string &request_id); +Json engine_contract_offer(const Json &bundle, const std::string &player, const std::string "e, int years, int64_t euros, const std::string &request_id); +Json engine_contract_cancel(const Json &bundle, const std::string "e, const std::string &request_id); + // Single-session facade. Its owner serializes all calls on a background worker. // No RmlUI objects or callbacks cross this boundary. class EngineBridge { diff --git a/src/modern/ui/engine_contracts.inc b/src/modern/ui/engine_contracts.inc new file mode 100644 index 0000000..d8072ad --- /dev/null +++ b/src/modern/ui/engine_contracts.inc @@ -0,0 +1,97 @@ +// SPDX-License-Identifier: GPL-3.0-only +void App::engine_contracts_clear(bool focus) { + if (focus && !contracts_return_focus_.empty()) focus_after_render_ = contracts_return_focus_; + contract_draft_ = Json(); contracts_dialog_.clear(); contracts_notice_.clear(); contracts_return_focus_.clear(); + contracts_world_.reset(); contracts_revision_ = 0; refresh(); +} +void App::engine_contracts_close(bool focus) { + if (engine_busy_) return; + if (contracts_dialog_ == "engine-details") { + contracts_dialog_ = "offer"; focus_after_render_ = "contract-insurance"; refresh(); return; + } + const auto view = engine_contracts_projection(engine_data_); + if (view.at("quote").is_object()) { + const auto command = engine_contract_cancel(engine_data_, view.at("quote").at("id"), editor::new_id("request:ui-")); + engine_contract_operation_ = "cancel"; engine_finance_submit(command); return; + } + engine_contracts_clear(focus); +} +void App::engine_contracts_poll() { + const auto operation = std::exchange(engine_contract_operation_, {}); + if (operation.empty()) return; + const auto view = engine_contracts_projection(engine_data_); + if (engine_response_.value("messageType", "") == "error") { + contracts_notice_ = engine_notice_; + if (view.at("quote").is_null()) { contract_draft_["notice_title"] = "Nicht übernommen"; contracts_dialog_ = "notice"; } + focus_after_render_ = "contract-close"; return; + } + if (operation == "cancel" && engine_response_.value("messageType", "") == "command_result") { engine_contracts_clear(); return; } + if (operation == "quote") { + const auto "e = view.at("quote"); + if (quote.is_object() && quote.at("player") == contracts_player_) { + contracts_revision_ = input_revision(); + const int index = contract_draft_.at("months").get() / 12 - 1; + if (quote.at("demands")[size_t(index)].is_null()) + for (int i = 0; i < 4; ++i) if (!quote.at("demands")[size_t(i)].is_null()) { contract_draft_["months"] = (i + 1) * 12; break; } + focus_after_render_ = "contract-term-" + std::to_string(contract_draft_.at("months").get()); + } + } else if (operation == "offer" && view.at("quote").is_null()) { + const bool rejected = engine_response_.value("outcome", "") == "offer_rejected"; + contract_draft_["notice_title"] = rejected ? "Angebot abgelehnt" : "Verhandlung abgeschlossen"; + contracts_notice_ = engine_text(engine_response_.value("feedback", Json(engine_notice_))); + contracts_dialog_ = "notice"; focus_after_render_ = "contract-close"; + } +} +bool App::engine_contracts_action(const std::string &action, Rml::Element *target) { + const std::set actions{"contracts-tab", "contract-player", "contract-close", "contract-term", "contract-salary", "contract-submit", "contract-insurance", "contract-insure", "contracts-bonuses", "contract-bonus", "contract-quote"}; + if (!actions.contains(action)) return false; + if (!engine_fresh_ || engine_busy_) return true; + const auto id = target ? target->GetAttribute("data-id", "") : std::string(); + if (action == "contract-close") { engine_contracts_close(); return true; } + if (action == "contracts-tab" && contracts_dialog_.empty()) { + if (id == "0" || id == "1" || id == "2") { contracts_tab_ = std::stoi(id); focus_after_render_ = target->GetId(); refresh(); } return true; + } + if (action == "contract-player" && contracts_dialog_.empty()) { + const auto view = engine_contracts_projection(engine_data_); const auto row = contracts_row(view, id); + if (!row.is_object()) return true; + contracts_player_ = id; contracts_world_ = world_; contracts_revision_ = input_revision(); contracts_return_focus_ = target->GetId(); contracts_notice_.clear(); + contract_draft_ = {{"club", view.at("club")}, {"row", row}, {"salary", row.at("salary").get() / 100}, {"months", 12}}; + contracts_dialog_ = "offer"; focus_after_render_ = "contract-term-12"; refresh(); return true; + } + if (action == "contract-insurance" && contracts_dialog_ == "offer") { + contracts_dialog_ = "engine-details"; focus_after_render_ = "contract-close"; refresh(); return true; + } + if (action == "contract-term" && contracts_dialog_ == "offer") { + if (id == "12" || id == "24" || id == "36" || id == "48") { contract_draft_["months"] = std::stoi(id); focus_after_render_ = target->GetId(); refresh(); } return true; + } + if (action == "contract-quote" && contracts_dialog_ == "offer") { + const auto command = engine_contract_request(engine_data_, contracts_player_, editor::new_id("request:ui-")); + engine_contract_operation_ = "quote"; engine_finance_submit(command); return true; + } + if (action == "contract-salary" && contracts_dialog_ == "offer") { + const auto view = engine_contracts_projection(engine_data_), quote = view.at("quote"); + if (!quote.is_object() || quote.at("player") != contracts_player_) return true; + const auto meta = engine_data_.at("desktop").at("meta"), quote_id = quote.at("id"); + const auto player = contracts_player_; + AmountRequest request; request.title = "Angebotenes Monatsgehalt"; request.unit = "€"; request.return_focus = "contract-salary"; + request.value = contract_draft_.at("salary"); request.min = 0; request.max = quote.at("max_salary").get() / 100; + request.step = 1; request.suggestion_step = 5000; request.review = true; + request.review_text = [](int64_t) { return "Entwurf ändern. Das Vertragsangebot wird danach separat bestätigt."; }; + request.accept = [this, meta, player, quote_id](int64_t value) { + if (!engine_fresh_ || engine_busy_ || menu_ != "contracts" || contracts_dialog_ != "offer" || contracts_player_ != player || meta != engine_data_.at("desktop").at("meta")) return false; + const auto quote = engine_contracts_projection(engine_data_).at("quote"); + if (!quote.is_object() || quote.at("id") != quote_id) return false; + contract_draft_["salary"] = value; refresh(); return true; + }; + open_amount(std::move(request)); return true; + } + if (action == "contract-submit" && contracts_dialog_ == "offer") { + const auto quote = engine_contracts_projection(engine_data_).at("quote"); if (!quote.is_object()) return true; + const auto salary = contract_draft_.at("salary").get(); const int years = contract_draft_.at("months").get() / 12; + const auto command = engine_contract_offer(engine_data_, contracts_player_, quote.at("id"), years, salary, editor::new_id("request:ui-")); + confirmation(contract_draft_.at("row").at("name").get() + ": " + std::to_string(years) + " Jahre zu " + money(salary * 100, {{"code", "EUR"}, {"minor_units", 2}}) + " pro Monat verbindlich anbieten?", [this, command] { + engine_contract_operation_ = "offer"; engine_finance_submit(command); + }); return true; + } + return true; // Missing insurance/bonus write APIs stay read-only. +} diff --git a/src/modern/ui/engine_controls.inc b/src/modern/ui/engine_controls.inc index 056d22d..f0ae39d 100644 --- a/src/modern/ui/engine_controls.inc +++ b/src/modern/ui/engine_controls.inc @@ -31,13 +31,16 @@ void App::engine_poll() { engine_notice_ = engine_text(engine_response_.at("feedback")) + (engine_dirty_ ? " · Änderungen noch nicht gespeichert." : ""); } else if (engine_response_.value("messageType", "") == "error") { engine_dirty_ = engine_base_dirty_; - engine_notice_ = "Änderung abgewiesen: " + engine_response_.value("code", "unknown_error"); + auto reason = engine_text(engine_response_.value("message", Json())); + if (reason.empty() || reason == "—") reason = engine_response_.value("code", "unknown_error"); + engine_notice_ = "Änderung abgewiesen: " + reason; } else if (engine_response_.value("messageType", "") == "saved") { engine_dirty_ = false; engine_notice_ = "Spielstand als neue OBS-Datei gespeichert."; } else engine_notice_ = "Spielstand geladen · Weitere Menüs werden schrittweise angebunden."; if (engine_response_.value("messageType", "") == "command_result") { advertising_selected_ = -1; advertising_offer_ = 0; } engine_credit_ = engine_data_.value("credit", Json()); engine_credit_edits_ = Json::array(); engine_ticket_bind(); + engine_contracts_poll(); engine_sports_reset(); const auto &f = engine_data_.at("camps").at("data").at("focus"); engine_focus_ = {{"condition", f.at("condition")}, {"technique", f.at("technique")}, {"play", f.at("play")}}; @@ -52,6 +55,10 @@ void App::engine_frame() { engine_sports_update(); if (ticket_) ticket_->update(); render_popup(); context_->Update(); + if (menu_ == "contracts" && engine_contract_scroll_) { + if (auto *roster = element("contracts-roster-scroll")) roster->SetScrollTop(*engine_contract_scroll_); + engine_contract_scroll_.reset(); + } if (center_selects(*doc_)) context_->Update(); if (menu_ == "lineup" && lineup_roster_scroll_) { if (auto *roster = element("lineup-roster-scroll")) roster->SetScrollTop(*lineup_roster_scroll_); @@ -100,6 +107,7 @@ void App::engine_event(Rml::Event &event) { if (amount_event(event)) return; if (!engine_busy_ && bank_event(event)) return; if (!engine_busy_ && advertising_event(event)) return; + if (!engine_busy_ && popup_.empty() && contracts_event(event)) return; if (engine_sports_event(event)) return; Rml::ElementFormControl *range = nullptr; for (auto *node = target; node && node != doc_; node = node->GetParentNode()) @@ -162,6 +170,7 @@ void App::engine_event(Rml::Event &event) { if (action == "popup-confirm") { auto callback = std::move(confirm_); popup_.clear(); dirty_ = true; if (callback) callback(); } return; } + if (contracts_action(action, node)) return; if (environment_action(action, node)) return; if (advertising_action(action, node)) return; if (bank_action(action, node)) return; @@ -173,6 +182,7 @@ void App::engine_event(Rml::Event &event) { ticket_->open(node, device_ratio_, price.at("min"), price.at("max")); dirty_ = true; } else if (action == "engine-open" && (id == "environment" || id == "advertising")) { menu_ = id; advertising_selected_ = -1; advertising_offer_ = 0; refresh(); } + else if (action == "engine-open" && id == "contracts") { menu_ = id; engine_contracts_clear(false); contracts_player_.clear(); engine_contract_scroll_ = 0.f; refresh(); } else if (action == "engine-open" && id == "bank") { bank_view_ = "entrance"; bank_hint_.clear(); menu_ = "bank"; refresh(); } else if (action == "engine-open" && id == "save") engine_save(); else if (action == "engine-open" && (id == "training" || id == "tactics")) { engine_sports_reset(); menu_ = id; refresh(); } diff --git a/src/modern/ui/engine_dto.cpp b/src/modern/ui/engine_dto.cpp index 41e10ac..064503c 100644 --- a/src/modern/ui/engine_dto.cpp +++ b/src/modern/ui/engine_dto.cpp @@ -502,4 +502,71 @@ Json engine_budget_command(const Json &bundle, const std::string &id, int64_t eu "Budget ist gesperrt oder außerhalb des verfügbaren Bereichs."); return sports_command(bundle, "budget.commit", {{"budgetId", id}, {"amount", {{"currency", "EUR"}, {"minorUnits", 2}, {"minor", std::to_string(euros * 100)}}}}, request_id); } + +Json engine_contracts_projection(const Json &bundle) { + validate_engine_desk(bundle); + const auto &data = lineup_read(bundle, "contracts"), &meta = bundle.at("desktop").at("meta"); + require(data.at("teamId") == meta.at("scope").at("teamId"), "Verträge gehören einer anderen Mannschaft."); + const auto squad = engine_lineup_projection(bundle); + require(data.at("players").is_array() && data.at("players").size() == squad.at("rows").size(), "Verträge und Kader passen nicht zusammen."); + const auto commands = meta.at("scope").value("allowedCommands", Json::array()); + const auto allowed = [&](const char *name) { return commands.is_array() && std::find(commands.begin(), commands.end(), Json(name)) != commands.end(); }; + Json rows = Json::array(); int64_t total = 0; std::set ids; + for (const auto &member : squad.at("rows")) { + const Json *person = nullptr; const auto id = member.at("id").get(); + for (const auto &p : data.at("players")) if (p.at("playerId") == id) { require(!person, "Doppelte Vertrags-ID."); person = &p; } + require(person, "Vertrag fehlt für einen Kaderspieler."); + auto row = member; + const auto salary = engine_money_minor(person->at("salaryMonthly")); + require(salary >= 0 && salary <= std::numeric_limits::max() - total, "Ungültiges Monatsgehalt."); total += salary; + require(person->at("contractRemaining").at("unit") == "months" && person->at("offerBlocked").is_boolean(), "Unbekannte Vertragseinheit oder Sperre."); + row["name"] = person->at("name"); row["position"] = person->at("position"); + row["age"] = whole_in_range(person->at("age"), 0, 255); + row["salary"] = salary; row["months"] = whole_in_range(person->at("contractRemaining").at("value"), 0, 255); + row["insurance"] = whole_in_range(person->at("insuranceMonths"), 0, 255); + row["insurance_fee"] = engine_money_minor(person->at("insuranceFee")); + require(row.at("insurance_fee").get() >= 0, "Ungültiger Versicherungsbetrag."); + row["source_label"] = "Aktuelles Monatsgehalt"; + row["shoot"] = member.at("shooting"); row["pass"] = member.at("passing"); row["team"] = member.at("teamplay"); + row["can_request"] = !person->at("offerBlocked").get() && allowed("quote.request") && allowed("contract.offer") && allowed("contract.cancel"); + require(person->at("bonuses").is_array() && person->at("bonuses").size() == 7, "Unvollständige Prämienstufen."); + row["premiums"] = Json::array(); for (const auto &v : person->at("bonuses")) row["premiums"].push_back(whole_in_range(v, 0, 255)); + rows.push_back(row); ids.insert(id); + } + Json quote; + if (!data.at("quote").is_null()) { + const auto &q = data.at("quote"); const auto id = q.at("id").get(); + require(id.starts_with("quote:contract-") && id.size() > 15 && q.at("playerId").is_string() && ids.contains(q.at("playerId").get()), "Verhandlung gehört einem fremden Spieler."); + require(q.at("demands").is_array() && q.at("demands").size() == 4, "Unvollständige Gehaltsforderungen."); + const auto max = engine_money_minor(q.at("maxMonthlySalary")); + require(max >= 0 && max % 100 == 0 && max <= 9999999900LL, "Ungültige Gehaltsgrenze."); + Json demands = Json::array({nullptr,nullptr,nullptr,nullptr}); std::set terms; + for (const auto &d : q.at("demands")) { + const int years = whole_in_range(d.at("years"), 1, 4); require(terms.insert(years).second, "Doppelte Vertragslaufzeit."); + const auto amount = engine_money_minor(d.at("monthlyDemand")); require(amount >= 0 && amount % 100 == 0, "Ungültige Gehaltsforderung."); + // The legacy contract service uses zero / UINT32_MAX for unavailable terms. + if (amount > 0 && amount != 429496729500LL) demands[size_t(years - 1)] = amount; + } + quote = {{"id", id}, {"player", q.at("playerId")}, {"demands", demands}, {"max_salary", max}, {"can_offer", allowed("contract.offer")}}; + } + return {{"ok", true}, {"club", data.at("teamId")}, {"rows", rows}, {"salary_total", total}, {"bonuses", Json::array()}, {"quote", quote}}; +} +Json engine_contract_request(const Json &bundle, const std::string &id, const std::string &request_id) { + const auto view = engine_contracts_projection(bundle); bool allowed = false; + require(view.at("quote").is_null(), "Bitte zuerst die laufende Verhandlung schließen."); + for (const auto &r : view.at("rows")) if (r.at("id") == id) allowed = r.at("can_request"); + require(allowed, "Dieser Spieler kann derzeit nicht verhandeln."); + return sports_command(bundle, "quote.request", {{"kind", "contract"}, {"playerId", id}}, request_id); +} +Json engine_contract_offer(const Json &bundle, const std::string &player, const std::string &id, int years, int64_t euros, const std::string &request_id) { + const auto q = engine_contracts_projection(bundle).at("quote"); + require(q.is_object() && q.at("id") == id && q.at("player") == player, "Die Verhandlung ist nicht mehr aktuell."); + require(years >= 1 && years <= 4 && !q.at("demands")[size_t(years - 1)].is_null() && euros >= 0 && euros <= q.at("max_salary").get() / 100, "Ungültige Laufzeit oder Gehalt."); + return sports_command(bundle, "contract.offer", {{"quoteId", id}, {"years", years}, {"monthlySalary", {{"currency", "EUR"}, {"minorUnits", 2}, {"minor", std::to_string(euros * 100)}}}}, request_id); +} +Json engine_contract_cancel(const Json &bundle, const std::string &id, const std::string &request_id) { + const auto q = engine_contracts_projection(bundle).at("quote"); + require(q.is_object() && q.at("id") == id, "Diese Verhandlung ist nicht mehr geöffnet."); + return sports_command(bundle, "contract.cancel", {{"quoteId", id}}, request_id); +} } // namespace bmh::modern_ui diff --git a/src/modern/ui/engine_screens.inc b/src/modern/ui/engine_screens.inc index 37383de..4736b33 100644 --- a/src/modern/ui/engine_screens.inc +++ b/src/modern/ui/engine_screens.inc @@ -37,6 +37,7 @@ Json App::engine_camp_view() const { } void App::engine_render() { if (ticket_) ticket_->close(false); + if (menu_ == "contracts") if (auto *roster = element("contracts-roster-scroll")) engine_contract_scroll_ = roster->GetScrollTop(); if (menu_ == "lineup") { if (auto *roster = element("lineup-roster-scroll")) lineup_roster_scroll_ = lineup_reset_scroll_ ? 0.f : roster->GetScrollTop(); lineup_reset_scroll_ = false; @@ -71,6 +72,8 @@ void App::engine_render() { try { (void)engine_advertising_projection(engine_data_); advertising_available = true; } catch (const std::exception &) {} environment_available = environment_available && std::find(allowed.begin(), allowed.end(), Json("environment.commit")) != allowed.end(); advertising_available = advertising_available && (std::find(allowed.begin(), allowed.end(), Json("advertising.accept")) != allowed.end() || std::find(allowed.begin(), allowed.end(), Json("budget.commit")) != allowed.end()); + bool contracts_available = false; + try { (void)engine_contracts_projection(engine_data_); contracts_available = true; } catch (const std::exception &) {} init_desktop(); for (const auto &[id, o] : desktop_.at("objects").items()) { if (!o.value("visible", false)) continue; @@ -103,11 +106,12 @@ void App::engine_render() { const auto route = id.substr(4); const bool camp_allowed = desk.at("menuAvailability").at("camps").value("status", "") == "available"; const auto commands = meta.at("scope").value("allowedCommands", Json::array()); - const bool supported = (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || route == "save" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end()); + const bool supported = (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || route == "save" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end()); out += desktop_button(id, o, "engine-open", supported && !engine_busy_); } } out += ""; + if (menu_ == "contracts") out += "
" + window("Verträge", render_contracts()) + "
"; if (menu_ == "environment") out += "
" + window("Umfeld", render_environment()) + "
"; if (menu_ == "advertising") out += "
" + window("Werbung", render_advertising()) + "
"; if (menu_ == "bank") out += "
" + window("Bank", render_bank()) + "
"; @@ -116,7 +120,7 @@ void App::engine_render() { if (menu_ == "lineup") out += "
" + window("Aufstellung", render_lineup()) + "
"; if (menu_ == "camp") out += "
" + window("Trainingslager", render_camp()) + "
"; } - if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising") && !amount_) out += "
" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
"; + if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts") && !amount_ && contracts_dialog_.empty()) out += "
" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
"; if (menu_.empty() || engine_data_.empty()) out += "
" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
"; element("canvas")->SetInnerRML(out); ++document_generation_; scale_chalk_shadow(); @@ -127,6 +131,10 @@ void App::engine_render() { const auto size = context_->GetDimensions(); element("background")->SetInnerRML(img("background", size.x / scale_, size.y / scale_, false, true, 2048)); element("background")->SetProperty("filter", theme_ == "silver" ? "saturate(0.2) brightness(0.9)" : theme_ == "matchday" ? "saturate(0.13) brightness(0.56)" : "saturate(0.34) brightness(0.70)"); + if (!contracts_dialog_.empty()) { + Rml::ElementList underlay; doc_->QuerySelectorAll(underlay, "#contracts-underlay button,.contracts-actions button,#window-close"); + for (auto *node : underlay) { node->SetAttribute("disabled", true); node->SetProperty("pointer-events", "none"); } + } if (amount_) { Rml::ElementList underlay; doc_->QuerySelectorAll(underlay, ".window>.content,.window>.titlebar"); for (auto *node : underlay) { node->SetProperty("pointer-events", "none"); node->SetProperty("filter", "blur(10dp)"); } diff --git a/src/modern/ui/engine_state.inc b/src/modern/ui/engine_state.inc index 41e8ae3..90a8b47 100644 --- a/src/modern/ui/engine_state.inc +++ b/src/modern/ui/engine_state.inc @@ -5,6 +5,12 @@ Json engine_data_, engine_response_, engine_focus_, engine_training_draft_, engine_tactics_draft_; std::string engine_camp_, engine_operation_, engine_notice_, engine_player_; Json engine_credit_, engine_credit_edits_ = Json::array(); + std::string engine_contract_operation_; + std::optional engine_contract_scroll_; + bool engine_contracts_action(const std::string &, Rml::Element *); + void engine_contracts_poll(); + void engine_contracts_clear(bool focus = true); + void engine_contracts_close(bool focus = true); bool engine_commerce_action(const std::string &, Rml::Element *); bool engine_bank_action(const std::string &, Rml::Element *); std::string engine_credit_view(); diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp index 6a8a2ae..aa3de8b 100644 --- a/src/modern/ui/view.cpp +++ b/src/modern/ui/view.cpp @@ -1518,6 +1518,7 @@ public: #include "modern/ui/engine_sports.inc" #include "modern/ui/engine_finance.inc" #include "modern/ui/engine_commerce.inc" +#include "modern/ui/engine_contracts.inc" } // namespace bool is_modern_world(const fs::path &file) { try { diff --git a/tests/modern_engine_bridge_probe.cpp b/tests/modern_engine_bridge_probe.cpp index 522d364..67bd1b3 100644 --- a/tests/modern_engine_bridge_probe.cpp +++ b/tests/modern_engine_bridge_probe.cpp @@ -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 "); + 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 "); 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(),second=players[1].at("id").get(); + 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()/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; } } diff --git a/tests/modern_engine_dto_tests.cpp b/tests/modern_engine_dto_tests.cpp index bb968c6..8f585b0 100644 --- a/tests/modern_engine_dto_tests.cpp +++ b/tests/modern_engine_dto_tests.cpp @@ -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(); + 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 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()&"ed.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(),"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; }