volleyballsimtypes 0.0.462 → 0.0.464

package/dist/esm/src/data/models/physiotherapist.d.ts

@@ -0,0 +1,25 @@
+import * as Sequelize from 'sequelize';
+import { Model } from 'sequelize';
+import { TeamId, TeamModel } from '.';
+export interface PhysiotherapistAttributes {
+    physiotherapist_id: string;
+    team_id: string;
+    name: string;
+    rarity: string;
+    currency_invested: number;
+}
+export type PhysiotherapistPk = 'physiotherapist_id';
+export type PhysiotherapistId = PhysiotherapistModel[PhysiotherapistPk];
+export type PhysiotherapistCreationAttributes = PhysiotherapistAttributes;
+export declare class PhysiotherapistModel extends Model<PhysiotherapistAttributes, PhysiotherapistCreationAttributes> implements PhysiotherapistAttributes {
+    physiotherapist_id: string;
+    team_id: string;
+    name: string;
+    rarity: string;
+    currency_invested: number;
+    team: TeamModel;
+    getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
+    setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;
+    createTeam: Sequelize.BelongsToCreateAssociationMixin<TeamModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof PhysiotherapistModel;
+}

package/dist/esm/src/data/models/physiotherapist.js

@@ -0,0 +1,53 @@
+import { DataTypes, Model } from 'sequelize';
+export class PhysiotherapistModel extends Model {
+    static initModel(sequelize) {
+        return PhysiotherapistModel.init({
+            physiotherapist_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true
+            },
+            team_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                unique: true,
+                references: {
+                    model: 'Team',
+                    key: 'team_id'
+                }
+            },
+            name: {
+                type: DataTypes.STRING,
+                allowNull: false,
+                defaultValue: ''
+            },
+            rarity: {
+                type: DataTypes.STRING,
+                allowNull: false,
+                defaultValue: 'COMMON'
+            },
+            currency_invested: {
+                type: DataTypes.INTEGER,
+                allowNull: false,
+                defaultValue: 0
+            }
+        }, {
+            sequelize,
+            tableName: 'Physiotherapist',
+            schema: 'public',
+            timestamps: false,
+            indexes: [
+                {
+                    name: 'Physiotherapist_pk',
+                    unique: true,
+                    fields: [{ name: 'physiotherapist_id' }]
+                },
+                {
+                    name: 'Physiotherapist_team_id_unique',
+                    unique: true,
+                    fields: [{ name: 'team_id' }]
+                }
+            ]
+        });
+    }
+}

package/dist/esm/src/data/models/player.d.ts

@@ -15,6 +15,10 @@ export interface PlayerAttributes {
     birth_iteration: number;
     last_declined_iteration: number | null;
     decline_profile: DeclineProfile;
+    injury_prone_profile?: number | string;
+    injury_severity?: number | null;
+    injured_until?: Date | string | null;
+    injury_debuff?: number | string | null;
     PerformanceStat?: PerformanceStatsAttributes;
     BoxScores?: BoxScoreAttributes[];
 }
@@ -34,6 +38,10 @@ export declare class PlayerModel extends Model<PlayerAttributes, PlayerCreationA
     birth_iteration: number;
     last_declined_iteration: number | null;
     decline_profile: DeclineProfile;
+    injury_prone_profile: number | string;
+    injury_severity: number | null;
+    injured_until: Date | string | null;
+    injury_debuff: number | string | null;
     country: CountryModel;
     getCountry: Sequelize.BelongsToGetAssociationMixin<CountryModel>;
     setCountry: Sequelize.BelongsToSetAssociationMixin<CountryModel, CountryId>;

package/dist/esm/src/data/models/player.js

@@ -59,6 +59,23 @@ export class PlayerModel extends Model {
                 type: DataTypes.ENUM(...Object.values(DeclineProfileEnum)),
                 allowNull: false,
                 defaultValue: DeclineProfileEnum.STANDARD
+            },
+            injury_prone_profile: {
+                type: DataTypes.DECIMAL(3, 2),
+                allowNull: false,
+                defaultValue: 0.5
+            },
+            injury_severity: {
+                type: DataTypes.INTEGER,
+                allowNull: true
+            },
+            injured_until: {
+                type: DataTypes.DATE,
+                allowNull: true
+            },
+            injury_debuff: {
+                type: DataTypes.DECIMAL(3, 2),
+                allowNull: true
             }
         }, {
             sequelize,

package/dist/esm/src/data/models/tactics.d.ts

@@ -39,6 +39,10 @@ export interface SystemSetAttributes {
     rotationSystem: RotationSystemEnum;
     designatedSetters: PlayerId[];
 }
+export interface ReservePriorityAttributes {
+    position: CourtPosition;
+    reserves: PlayerId[];
+}
 export interface LiberoSetSubConfigAttributes {
     mode: LiberoSubMode;
     fatigueBand?: EnergyBand;
@@ -61,10 +65,12 @@ export interface TacticsAttributes {
     offensive_preferences: OffensivePreferenceAttributes[];
     system_sets?: SystemSetAttributes[];
     offensive_preference_sets?: OffensivePreferenceAttributes[][];
+    replace_injured_immediately?: boolean;
+    reserve_priorities?: ReservePriorityAttributes[];
 }
 export type TacticsPk = 'team_id';
 export type TacticsId = TacticsModel[TacticsPk];
-export type TacticsOptionalAttributes = 'lineup' | 'libero_replacements' | 'receive_rotation_offset' | 'designated_subs' | 'substitution_band' | 'second_libero' | 'libero_sub' | 'libero_replacement_sets' | 'rotation_system' | 'designated_setters' | 'offensive_preferences' | 'system_sets' | 'offensive_preference_sets';
+export type TacticsOptionalAttributes = 'lineup' | 'libero_replacements' | 'receive_rotation_offset' | 'designated_subs' | 'substitution_band' | 'second_libero' | 'libero_sub' | 'libero_replacement_sets' | 'rotation_system' | 'designated_setters' | 'offensive_preferences' | 'system_sets' | 'offensive_preference_sets' | 'replace_injured_immediately' | 'reserve_priorities';
 export type TacticsCreationAttributes = Optional<TacticsAttributes, TacticsOptionalAttributes>;
 export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreationAttributes> implements TacticsAttributes {
     team_id: string;
@@ -81,6 +87,8 @@ export declare class TacticsModel extends Model<TacticsAttributes, TacticsCreati
     offensive_preferences: OffensivePreferenceAttributes[];
     system_sets?: SystemSetAttributes[];
     offensive_preference_sets?: OffensivePreferenceAttributes[][];
+    replace_injured_immediately?: boolean;
+    reserve_priorities?: ReservePriorityAttributes[];
     team: TeamModel;
     getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
     setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;

package/dist/esm/src/data/models/tactics.js

@@ -71,6 +71,15 @@ export class TacticsModel extends Model {
             offensive_preference_sets: {
                 type: DataTypes.JSONB,
                 allowNull: true
+            },
+            replace_injured_immediately: {
+                type: DataTypes.BOOLEAN,
+                allowNull: false,
+                defaultValue: true
+            },
+            reserve_priorities: {
+                type: DataTypes.JSONB,
+                allowNull: true
             }
         }, {
             sequelize,

package/dist/esm/src/data/transformers/division.js

@@ -23,7 +23,7 @@ function transformToObject(model) {
         subdivision: model.subdivision,
         leagueId: model.league_id,
         seasons: (model.DivisionSeasons ?? []).map((ds) => transformToSeason(ds.competition)),
-        teams: model.Teams != null ? model.Teams.map(transformToTeam) : undefined
+        teams: model.Teams != null ? model.Teams.map(team => transformToTeam(team)) : undefined
     });
 }
 export { transformToObject as transformToDivision, transformToAttributes as transformFromDivision };

package/dist/esm/src/data/transformers/lineup-preset.js

@@ -1,11 +1,17 @@
 // `config` is already stored as the API Tactics DTO, so a preset row maps to its API shape with no hydration.
+// Presets saved before the injuries fields exist lack replaceInjuredImmediately: heal it to the effective
+// default (true, matching transformToTactics' hydration) so the DTO's required field is honest and a UI
+// toggle seeded from an old preset cannot silently flip the user's effective setting on re-save.
 function transformToObject(model) {
     return {
         presetId: model.preset_id,
         name: model.name,
         isActive: model.is_active,
         orderIndex: model.order_index,
-        config: model.config
+        config: {
+            ...model.config,
+            replaceInjuredImmediately: model.config.replaceInjuredImmediately ?? true
+        }
     };
 }
 export { transformToObject as transformToLineupPreset };

package/dist/esm/src/data/transformers/lineup-preset.test.js

@@ -1,7 +1,7 @@
 import { describe, it, expect } from '@jest/globals';
 import { transformToLineupPreset } from './lineup-preset';
 describe('transformToLineupPreset()', () => {
-    it('maps preset columns to the API shape and passes config through by reference', () => {
+    it('maps preset columns to the API shape and heals a pre-injuries config to the effective default', () => {
         const config = { lineup: { bench: [] }, substitutionBand: 'TIRED' };
         const preset = transformToLineupPreset({
             preset_id: 'p1',
@@ -16,8 +16,21 @@ describe('transformToLineupPreset()', () => {
             name: 'Starters',
             isActive: true,
             orderIndex: 2,
+            // A config stored before the injuries fields lacks replaceInjuredImmediately; the transform heals it
+            // to true (the effective hydration default) so the DTO's required field is honest.
+            config: { ...config, replaceInjuredImmediately: true }
+        });
+    });
+    it('keeps an explicit replaceInjuredImmediately: false', () => {
+        const config = { lineup: { bench: [] }, substitutionBand: 'TIRED', replaceInjuredImmediately: false };
+        const preset = transformToLineupPreset({
+            preset_id: 'p2',
+            team_id: 't1',
+            name: 'Risky',
+            is_active: false,
+            order_index: 3,
             config
         });
-        expect(preset.config).toBe(config);
+        expect(preset.config.replaceInjuredImmediately).toBe(false);
     });
 });

package/dist/esm/src/data/transformers/match-preset-override.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/data/transformers/match-preset-override.test.js

@@ -0,0 +1,273 @@
+import { describe, it, expect, jest } from '@jest/globals';
+import { v4 as uuidv4 } from 'uuid';
+import { apiTacticsConfigToTacticsAttributes, tacticsColumnsToApiDto, transformToTactics } from './tactics';
+import { transformToTeam } from './team';
+import { transformToMatch } from './match';
+import { CourtPosition, DeclineProfileEnum, RarityEnum, RoleEnum } from '../../service';
+// ─── shared mocks (model-shaped plain objects, cast through unknown) ──────────
+const countryFixture = {
+    country_id: uuidv4(),
+    name: 'Test Country',
+    alpha_2: 'TC',
+    alpha_3: 'TCN',
+    country_code: '999',
+    iso_3166_2: 'TC-TEST',
+    region: '',
+    region_code: '',
+    sub_region: '',
+    sub_region_code: '',
+    intermediate_region: '',
+    intermediate_region_code: ''
+};
+function makePlayerModel(id) {
+    const stat = 50;
+    return {
+        player_id: id,
+        first_name: 'Test',
+        last_name: `P-${id.slice(0, 4)}`,
+        rarity: RarityEnum.COMMON,
+        roles: [RoleEnum.OUTSIDE_HITTER],
+        traits: [],
+        birth_age: 18,
+        birth_iteration: 1,
+        last_declined_iteration: null,
+        decline_profile: DeclineProfileEnum.STANDARD,
+        BoxScores: [],
+        BoxScoreTotals: null,
+        country: countryFixture,
+        PerformanceStat: {
+            setting: stat,
+            serve: stat,
+            spike: stat,
+            quick: stat,
+            power: stat,
+            awareness: stat,
+            attack: stat,
+            back_attack: stat,
+            reception: stat,
+            overhand: stat,
+            bump: stat,
+            block: stat,
+            read: stat,
+            commit: stat,
+            focus: stat,
+            defense: stat,
+            stamina: stat,
+            reflex: stat
+        }
+    };
+}
+// Six starters; index order is the row lineup's zone 1..6 order.
+const ids = Array.from({ length: 6 }, () => uuidv4());
+const teamId = uuidv4();
+function rowLineup(order) {
+    return {
+        [CourtPosition.RIGHT_BACK]: order[0],
+        [CourtPosition.RIGHT_FRONT]: order[1],
+        [CourtPosition.MIDDLE_FRONT]: order[2],
+        [CourtPosition.LEFT_FRONT]: order[3],
+        [CourtPosition.LEFT_BACK]: order[4],
+        [CourtPosition.MIDDLE_BACK]: order[5],
+        bench: []
+    };
+}
+function makeTacticsRow(order) {
+    return {
+        team_id: teamId,
+        lineup: rowLineup(order),
+        libero_replacements: [],
+        receive_rotation_offset: false,
+        designated_subs: [],
+        substitution_band: 'TIRED',
+        rotation_system: '6-0',
+        designated_setters: [],
+        offensive_preferences: []
+    };
+}
+function makeTeamModel(activeOrder) {
+    return {
+        team_id: teamId,
+        name: 'Test Team',
+        short_name: 'TST',
+        rating: 0,
+        division_id: uuidv4(),
+        active: true,
+        country: countryFixture,
+        tactics: makeTacticsRow(activeOrder),
+        PlayerTeams: ids.map(id => ({ player: makePlayerModel(id) }))
+    };
+}
+// The API-DTO config for a preset whose starters are the REVERSE of the active order, so an applied
+// override is visible through the hydrated lineup.
+function makeConfig(order) {
+    return {
+        lineup: {
+            [CourtPosition.RIGHT_BACK]: order[0],
+            [CourtPosition.RIGHT_FRONT]: order[1],
+            [CourtPosition.MIDDLE_FRONT]: order[2],
+            [CourtPosition.LEFT_FRONT]: order[3],
+            [CourtPosition.LEFT_BACK]: order[4],
+            [CourtPosition.MIDDLE_BACK]: order[5],
+            bench: []
+        },
+        liberoReplacements: [],
+        receiveRotationOffset: false,
+        designatedSubs: [],
+        substitutionBand: 'TIRED',
+        rotationSystem: '6-0',
+        designatedSetters: [],
+        offensivePreferences: []
+    };
+}
+const activeOrder = ids;
+const presetOrder = [...ids].reverse();
+function starterAt(tactics, zone) {
+    return tactics.lineup[zone]?.id;
+}
+// ─── apiTacticsConfigToTacticsAttributes ──────────────────────────────────────
+describe('apiTacticsConfigToTacticsAttributes()', () => {
+    it('round-trips a fully-loaded Tactics row through tacticsColumnsToApiDto', () => {
+        const full = {
+            team_id: teamId,
+            lineup: { ...rowLineup(activeOrder), [CourtPosition.LIBERO_ZONE]: undefined },
+            libero_replacements: [ids[5]],
+            receive_rotation_offset: true,
+            designated_subs: [{ starterId: ids[0], benchId: undefined, mode: 'FATIGUE', fatigueBand: 'WORN', sets: [{ mode: 'NEVER' }] }],
+            substitution_band: 'TIRED',
+            second_libero: undefined,
+            libero_sub: undefined,
+            libero_replacement_sets: [[ids[0]], [ids[1]]],
+            rotation_system: '5-1',
+            designated_setters: [ids[0]],
+            offensive_preferences: [{ rotation: 1, order: [ids[1], ids[2]] }],
+            system_sets: [{ rotationSystem: '5-1', designatedSetters: [ids[0]] }],
+            offensive_preference_sets: [[{ rotation: 2, order: [ids[3]] }]]
+        };
+        const dto = tacticsColumnsToApiDto(full);
+        const back = apiTacticsConfigToTacticsAttributes(dto, teamId);
+        expect(back.lineup).toEqual(full.lineup);
+        expect(back.libero_replacements).toEqual(full.libero_replacements);
+        expect(back.receive_rotation_offset).toBe(true);
+        expect(back.designated_subs).toEqual(full.designated_subs);
+        expect(back.libero_replacement_sets).toEqual(full.libero_replacement_sets);
+        expect(back.rotation_system).toBe('5-1');
+        expect(back.designated_setters).toEqual(full.designated_setters);
+        expect(back.offensive_preferences).toEqual(full.offensive_preferences);
+        expect(back.system_sets).toEqual(full.system_sets);
+        expect(back.offensive_preference_sets).toEqual(full.offensive_preference_sets);
+    });
+    it('hydrates through transformToTactics identically to the row path', () => {
+        const roster = ids.map(id => transformToTeam(makeTeamModel(activeOrder)).roster.find(p => p.id === id));
+        expect(roster.every(p => p != null)).toBe(true);
+        const teamModel = makeTeamModel(activeOrder);
+        const players = transformToTeam(teamModel).roster;
+        const fromRow = transformToTactics(makeTacticsRow(activeOrder), players);
+        const fromConfig = transformToTactics(apiTacticsConfigToTacticsAttributes(makeConfig(activeOrder), teamId), players);
+        for (const zone of [1, 2, 3, 4, 5, 6]) {
+            expect(starterAt(fromConfig, zone)).toBe(starterAt(fromRow, zone));
+        }
+    });
+    it('throws PLAYER_NOT_FOUND when the config references an off-roster player', () => {
+        const players = transformToTeam(makeTeamModel(activeOrder)).roster;
+        const drifted = makeConfig([uuidv4(), ...ids.slice(1)]);
+        expect(() => transformToTactics(apiTacticsConfigToTacticsAttributes(drifted, teamId), players)).toThrow('PLAYER_NOT_FOUND');
+    });
+});
+// ─── transformToTeam override / fallback ──────────────────────────────────────
+describe('transformToTeam() tacticsOverride', () => {
+    it('uses the override config when it hydrates', () => {
+        const team = transformToTeam(makeTeamModel(activeOrder), undefined, {
+            presetId: 'preset-1',
+            config: makeConfig(presetOrder)
+        });
+        expect(starterAt(team.tactics, CourtPosition.RIGHT_BACK)).toBe(presetOrder[0]);
+    });
+    it('falls back to the active tactics and notifies onFallback when the override fails', () => {
+        const onFallback = jest.fn();
+        const drifted = makeConfig([uuidv4(), ...ids.slice(1)]);
+        const team = transformToTeam(makeTeamModel(activeOrder), undefined, {
+            presetId: 'preset-1',
+            config: drifted,
+            onFallback
+        });
+        expect(onFallback).toHaveBeenCalledTimes(1);
+        expect(onFallback.mock.calls[0][0]).toBe('preset-1');
+        expect(starterAt(team.tactics, CourtPosition.RIGHT_BACK)).toBe(activeOrder[0]);
+    });
+    it('keeps the active tactics when no override is given', () => {
+        const team = transformToTeam(makeTeamModel(activeOrder));
+        expect(starterAt(team.tactics, CourtPosition.RIGHT_BACK)).toBe(activeOrder[0]);
+    });
+});
+// ─── transformToMatch per-team override ───────────────────────────────────────
+describe('transformToMatch() MatchPresets', () => {
+    const awayIds = Array.from({ length: 6 }, () => uuidv4());
+    const awayTeamId = uuidv4();
+    function makeAwayModel() {
+        return {
+            team_id: awayTeamId,
+            name: 'Away Team',
+            short_name: 'AWY',
+            rating: 0,
+            division_id: uuidv4(),
+            active: true,
+            country: countryFixture,
+            tactics: {
+                team_id: awayTeamId,
+                lineup: {
+                    [CourtPosition.RIGHT_BACK]: awayIds[0],
+                    [CourtPosition.RIGHT_FRONT]: awayIds[1],
+                    [CourtPosition.MIDDLE_FRONT]: awayIds[2],
+                    [CourtPosition.LEFT_FRONT]: awayIds[3],
+                    [CourtPosition.LEFT_BACK]: awayIds[4],
+                    [CourtPosition.MIDDLE_BACK]: awayIds[5],
+                    bench: []
+                },
+                libero_replacements: [],
+                receive_rotation_offset: false,
+                designated_subs: [],
+                substitution_band: 'TIRED',
+                rotation_system: '6-0',
+                designated_setters: [],
+                offensive_preferences: []
+            },
+            PlayerTeams: awayIds.map(id => ({ player: makePlayerModel(id) }))
+        };
+    }
+    function makeMatchModel(withPreset) {
+        return {
+            match_id: uuidv4(),
+            home_team: teamId,
+            away_team: awayTeamId,
+            scheduled_date: new Date(),
+            status: 'PENDING',
+            HomeTeam: makeTeamModel(activeOrder),
+            AwayTeam: makeAwayModel(),
+            MatchSets: [],
+            VPERs: [],
+            MatchPresets: withPreset
+                ? [{ match_id: 'm', team_id: teamId, preset_id: 'preset-1', preset: { config: makeConfig(presetOrder) } }]
+                : undefined
+        };
+    }
+    it('applies the home override and leaves the away team on active tactics', () => {
+        const match = transformToMatch(makeMatchModel(true));
+        expect(starterAt(match.homeTeam.tactics, CourtPosition.RIGHT_BACK)).toBe(presetOrder[0]);
+        expect(starterAt(match.awayTeam.tactics, CourtPosition.RIGHT_BACK)).toBe(awayIds[0]);
+    });
+    it('behaves exactly as before when the association is absent', () => {
+        const match = transformToMatch(makeMatchModel(false));
+        expect(starterAt(match.homeTeam.tactics, CourtPosition.RIGHT_BACK)).toBe(activeOrder[0]);
+        expect(starterAt(match.awayTeam.tactics, CourtPosition.RIGHT_BACK)).toBe(awayIds[0]);
+    });
+    it('routes the fallback callback with the failing team id', () => {
+        const onPresetFallback = jest.fn();
+        const model = makeMatchModel(true);
+        model.MatchPresets[0].preset.config = makeConfig([uuidv4(), ...ids.slice(1)]);
+        const match = transformToMatch(model, undefined, onPresetFallback);
+        expect(onPresetFallback).toHaveBeenCalledTimes(1);
+        expect(onPresetFallback.mock.calls[0][0]).toBe(teamId);
+        expect(onPresetFallback.mock.calls[0][1]).toBe('preset-1');
+        expect(starterAt(match.homeTeam.tactics, CourtPosition.RIGHT_BACK)).toBe(activeOrder[0]);
+    });
+});

package/dist/esm/src/data/transformers/match-set.js

@@ -23,6 +23,7 @@ function transformToAttributes(set, matchId) {
         is_tie_break: set.isTieBreak,
         home_score: set.homeScore,
         away_score: set.awayScore,
+        forfeited: set.forfeited,
         player_positions: [...homeSetPositions, ...awaySetPositions],
         BoxScores: (set.boxScores ?? []).map(transformFromBoxScore),
         Rallies: (set.rallies ?? []).map((rally) => transformFromRally(rally, set.id))
@@ -39,6 +40,7 @@ function transformToObject(model) {
         homeScore: model.home_score,
         awayScore: model.away_score,
         isTieBreak: model.is_tie_break,
+        forfeited: model.forfeited ?? false,
         boxScores: (model.BoxScores ?? []).map(transformToBoxScore),
         homePlayerPosition,
         awayPlayerPosition,

package/dist/esm/src/data/transformers/match.d.ts

@@ -1,5 +1,6 @@
 import { MatchAttributes, MatchModel } from '../models';
 import { Match } from '../../service';
+export type PresetFallbackHandler = (teamId: string, presetId: string, err: unknown) => void;
 declare function transformToAttributes(match: Match): MatchAttributes;
-declare function transformToObject(model: MatchModel, currentIteration?: number): Match;
+declare function transformToObject(model: MatchModel, currentIteration?: number, onPresetFallback?: PresetFallbackHandler): Match;
 export { transformToObject as transformToMatch, transformToAttributes as transformFromMatch };

package/dist/esm/src/data/transformers/match.js

@@ -8,10 +8,25 @@ function transformToAttributes(match) {
         away_team: match.awayTeam.id,
         home_team: match.homeTeam.id,
         scheduled_date: match.scheduledDate,
-        status: match.status
+        status: match.status,
+        // Both directions on purpose (the read is in transformToObject below). NOTE for the Sim: updateMatch's
+        // completion write uses an explicit column list and must include forfeit_type or the marker is lost.
+        forfeit_type: match.forfeitType ?? null
     };
 }
-function transformToObject(model, currentIteration) {
+function transformToObject(model, currentIteration, onPresetFallback) {
+    // The (match, team)-chosen preset override for one side, when the loader included MatchPresets with the
+    // preset loaded (only the simulator's match query does). Association absent = active tactics, as always.
+    const overrideFor = (teamId) => {
+        const row = (model.MatchPresets ?? []).find(mp => mp.team_id === teamId);
+        if (row?.preset == null)
+            return undefined;
+        return {
+            presetId: row.preset_id,
+            config: row.preset.config,
+            onFallback: (presetId, err) => onPresetFallback?.(teamId, presetId, err)
+        };
+    };
     const sets = (model.MatchSets ?? []).map(transformToMatchSet)
         .sort((s1, s2) => s1.order - s2.order);
     let homeScore = 0;
@@ -43,15 +58,16 @@ function transformToObject(model, currentIteration) {
     const VPERs = (model.VPERs ?? []).map(transformToVPER);
     return Match.create({
         id: model.match_id,
-        homeTeam: transformToTeam(model.HomeTeam, currentIteration),
-        awayTeam: transformToTeam(model.AwayTeam, currentIteration),
+        homeTeam: transformToTeam(model.HomeTeam, currentIteration, overrideFor(model.home_team)),
+        awayTeam: transformToTeam(model.AwayTeam, currentIteration, overrideFor(model.away_team)),
         scheduledDate: new Date(model.scheduled_date),
         sets,
         status: model.status,
         VPERs,
         homeScore,
         awayScore,
-        winner: model.MatchResult?.Winner != null ? transformToTeam(model.MatchResult.Winner, currentIteration) : undefined
+        winner: model.MatchResult?.Winner != null ? transformToTeam(model.MatchResult.Winner, currentIteration) : undefined,
+        forfeitType: model.forfeit_type ?? undefined
     });
 }
 export { transformToObject as transformToMatch, transformToAttributes as transformFromMatch };

package/dist/esm/src/data/transformers/player.js

@@ -21,7 +21,11 @@ function transformToAttributes(player) {
         birth_age: player.birthAge,
         birth_iteration: player.birthIteration,
         last_declined_iteration: null,
-        decline_profile: player.declineProfile
+        decline_profile: player.declineProfile,
+        injury_prone_profile: player.injuryProneProfile,
+        injury_severity: player.injury?.severity ?? null,
+        injured_until: player.injury?.injuredUntil ?? null,
+        injury_debuff: player.injury?.debuff ?? null
     };
 }
 function transformToBoxScoreTotals(model) {
@@ -87,6 +91,16 @@ function transformToObject(model, currentIteration) {
         birthAge: model.birth_age,
         birthIteration: model.birth_iteration,
         declineProfile: model.decline_profile,
+        // DECIMAL comes back as a string from pg; schema-defaulted when the column is absent (pre-migration rows).
+        injuryProneProfile: model.injury_prone_profile != null ? Number(model.injury_prone_profile) : undefined,
+        // Severity defends against a partial write: an injured_until without severity reads as MINOR.
+        injury: model.injured_until != null
+            ? {
+                severity: model.injury_severity != null ? Number(model.injury_severity) : 1,
+                injuredUntil: model.injured_until,
+                debuff: model.injury_debuff != null ? Number(model.injury_debuff) : undefined
+            }
+            : undefined,
         boxScores: (model.BoxScores ?? []).map(transformToBoxScore),
         boxScoreTotals
     });

package/dist/esm/src/data/transformers/qualifier.js

@@ -40,7 +40,7 @@ function transformToObject(model) {
         id: model.competition_id,
         iteration: transformToIteration(model.Iteration),
         matches: (model.CompetitionMatches ?? []).map(transformToQualifierMatch),
-        teams: sortTeamsByCompetitionIndex(model.Teams ?? []).map(transformToTeam),
+        teams: sortTeamsByCompetitionIndex(model.Teams ?? []).map(team => transformToTeam(team)),
         status: model.status,
         region: transformToRegion(regionQualifier),
         champion

package/dist/esm/src/data/transformers/rally-event-injury.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/src/data/transformers/rally-event-injury.test.js

@@ -0,0 +1,31 @@
+import { describe, it, expect } from '@jest/globals';
+import { v4 as uuidv4 } from 'uuid';
+import { EventTypeEnum, Substitution } from '../../service';
+import { transformToCompact, transformToSubstitution } from './rally-event';
+describe('rally-event compact round trip — injury substitution marker', () => {
+    const playerIn = uuidv4();
+    const playerOut = uuidv4();
+    const roster = [playerIn, playerOut];
+    const playerIndex = new Map(roster.map((id, i) => [id, i]));
+    it('packs the injury flag as j=1 and round-trips it', () => {
+        const sub = Substitution.create({ playerId: playerIn, playerOut, injury: true });
+        const compact = transformToCompact(sub, playerIndex);
+        expect(compact.j).toBe(1);
+        const decoded = transformToSubstitution(compact, roster);
+        expect(decoded.injury).toBe(true);
+        expect(decoded.playerId).toBe(playerIn);
+        expect(decoded.playerOut).toBe(playerOut);
+    });
+    it('omits j entirely for a normal substitution', () => {
+        const sub = Substitution.create({ playerId: playerIn, playerOut });
+        const compact = transformToCompact(sub, playerIndex);
+        expect('j' in compact).toBe(false);
+        const decoded = transformToSubstitution(compact, roster);
+        expect(decoded.injury).toBeUndefined();
+    });
+    it('decodes a legacy compact event (no j key) as a non-injury substitution', () => {
+        const legacy = { p: 0, e: EventTypeEnum.SUBSTITUTION, o: 1 };
+        const decoded = transformToSubstitution(legacy, roster);
+        expect(decoded.injury).toBeUndefined();
+    });
+});