Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src-tauri/crates/db/src/sql/v030_nationality_code_migration.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
-- Migration: Rename football_nation to nationality_code and add competitive_region
-- This migration handles the field rename from football_nation to nationality_code
-- and adds the new competitive_region field for LoL regional classification

-- Add nationality_code column (copy from football_nation) and competitive_region to teams
ALTER TABLE teams ADD COLUMN nationality_code TEXT NOT NULL DEFAULT '';
UPDATE teams SET nationality_code = football_nation;

-- Add nationality_code column and competitive_region to managers
ALTER TABLE managers ADD COLUMN nationality_code TEXT NOT NULL DEFAULT '';
ALTER TABLE managers ADD COLUMN competitive_region TEXT NOT NULL DEFAULT '';
UPDATE managers SET nationality_code = football_nation;

-- Add nationality_code column and competitive_region to players
ALTER TABLE players ADD COLUMN nationality_code TEXT NOT NULL DEFAULT '';
ALTER TABLE players ADD COLUMN competitive_region TEXT NOT NULL DEFAULT '';
UPDATE players SET nationality_code = football_nation;

-- Add nationality_code column and competitive_region to staff
ALTER TABLE staff ADD COLUMN nationality_code TEXT NOT NULL DEFAULT '';
ALTER TABLE staff ADD COLUMN competitive_region TEXT NOT NULL DEFAULT '';
UPDATE staff SET nationality_code = football_nation;
1 change: 0 additions & 1 deletion src-tauri/crates/domain/src/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ pub struct Manager {
pub struct ManagerCareerStats {
pub matches_managed: u32,
pub wins: u32,
pub draws: u32,
pub losses: u32,
pub trophies: u32,
pub best_finish: Option<u32>,
Expand Down
5 changes: 2 additions & 3 deletions src-tauri/crates/ofm_core/src/end_of_season.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::game::Game;
use crate::schedule::{
LecSplit, append_fixtures, generate_preseason_friendlies,
generate_single_round_league_with_offsets_and_bo, parse_lec_split, regular_best_of,
append_fixtures, generate_preseason_friendlies,
generate_single_round_league_with_offsets_and_bo, parse_lec_split, regular_best_of, LecSplit,
};
use crate::season_awards::compute_season_awards;
use chrono::{TimeZone, Utc};
Expand Down Expand Up @@ -305,7 +305,6 @@ pub fn process_end_of_season(game: &mut Game) -> EndOfSeasonSummary {
let total_matches = standing.won + standing.drawn + standing.lost;
game.manager.career_stats.matches_managed += total_matches;
game.manager.career_stats.wins += standing.won;
game.manager.career_stats.draws += standing.drawn;
game.manager.career_stats.losses += standing.lost;
if user_position == 1 {
game.manager.career_stats.trophies += 1;
Expand Down
11 changes: 4 additions & 7 deletions src-tauri/crates/ofm_core/tests/end_of_season_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,6 @@ fn manager_career_stats_updated() {

assert_eq!(game.manager.career_stats.matches_managed, 2);
assert_eq!(game.manager.career_stats.wins, 2);
assert_eq!(game.manager.career_stats.draws, 0);
assert_eq!(game.manager.career_stats.losses, 0);
}

Expand Down Expand Up @@ -937,12 +936,10 @@ fn next_season_generation_ignores_academy_team_ids() {

let next_league = game.league.as_ref().expect("next league should exist");
assert_eq!(next_league.standings.len(), 10);
assert!(
!next_league
.standings
.iter()
.any(|entry| entry.team_id == "academy-1")
);
assert!(!next_league
.standings
.iter()
.any(|entry| entry.team_id == "academy-1"));
}

// ---------------------------------------------------------------------------
Expand Down
Loading