volleyballsimtypes 0.0.459 → 0.0.463

package/dist/cjs/src/data/transformers/tactics.d.ts

@@ -2,6 +2,7 @@ import { TacticsAttributes, TacticsModel } from '../models';
 import { Player, Tactics } from '../../service';
 import type { Tactics as ApiTactics } from '../../api';
 declare function transformToAttributes(tactics: Tactics, teamId: string): TacticsAttributes;
-declare function transformToObject(model: TacticsModel, roster: Player[]): Tactics;
+declare function transformToObject(model: TacticsAttributes, roster: Player[]): Tactics;
 declare function tacticsColumnsToApiDto(model: TacticsModel): ApiTactics;
-export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics, tacticsColumnsToApiDto };
+declare function apiTacticsConfigToAttributes(config: ApiTactics, teamId: string): TacticsAttributes;
+export { transformToObject as transformToTactics, transformToAttributes as transformFromTactics, tacticsColumnsToApiDto, apiTacticsConfigToAttributes as apiTacticsConfigToTacticsAttributes };

package/dist/cjs/src/data/transformers/tactics.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformToTactics = transformToObject;
 exports.transformFromTactics = transformToAttributes;
 exports.tacticsColumnsToApiDto = tacticsColumnsToApiDto;
+exports.apiTacticsConfigToTacticsAttributes = apiTacticsConfigToAttributes;
 const service_1 = require("../../service");
 // Back-compat: new rows persist `mode`; rows written before the mode change persist `isPinchServer` (+ a
 // 'NEVER' fatigueBand for the old "never fatigue-sub" state). Derive the mode so existing data keeps working
@@ -89,6 +90,8 @@ function transformToAttributes(tactics, teamId) {
         })))
     };
 }
+// Accepts TacticsAttributes (not just TacticsModel) so a per-match preset's config, shaped as column data by
+// apiTacticsConfigToTacticsAttributes below, can be hydrated through the exact same validation/healing path.
 function transformToObject(model, roster) {
     const lineup = transformToLineup(model.lineup, roster);
     // A second libero is only valid as a RESERVE: it needs a starting libero (LIBERO_ZONE), the L2 player must be
@@ -224,3 +227,36 @@ function tacticsColumnsToApiDto(model) {
         offensivePreferenceSets: model.offensive_preference_sets
     };
 }
+// Inverse of tacticsColumnsToApiDto: shape a preset's stored API config (camelCase, player ids) as
+// TacticsAttributes-shaped column data so transformToTactics can hydrate it against a roster through the
+// exact same validation/healing path as the Tactics row. Only the top-level keys need renaming -- the jsonb
+// sub-objects (designated subs, libero sub, preferences, system sets) are stored camelCase in both shapes.
+// Deliberately NOT mirroring writeTacticsRow's null-clears-column rule: nothing is being UPDATEd here, so
+// absent optionals simply stay undefined.
+function apiTacticsConfigToAttributes(config, teamId) {
+    return {
+        team_id: teamId,
+        lineup: {
+            [service_1.CourtPosition.LIBERO_ZONE]: config.lineup[service_1.CourtPosition.LIBERO_ZONE],
+            [service_1.CourtPosition.LEFT_BACK]: config.lineup[service_1.CourtPosition.LEFT_BACK],
+            [service_1.CourtPosition.LEFT_FRONT]: config.lineup[service_1.CourtPosition.LEFT_FRONT],
+            [service_1.CourtPosition.MIDDLE_BACK]: config.lineup[service_1.CourtPosition.MIDDLE_BACK],
+            [service_1.CourtPosition.MIDDLE_FRONT]: config.lineup[service_1.CourtPosition.MIDDLE_FRONT],
+            [service_1.CourtPosition.RIGHT_BACK]: config.lineup[service_1.CourtPosition.RIGHT_BACK],
+            [service_1.CourtPosition.RIGHT_FRONT]: config.lineup[service_1.CourtPosition.RIGHT_FRONT],
+            bench: config.lineup.bench
+        },
+        libero_replacements: config.liberoReplacements,
+        receive_rotation_offset: config.receiveRotationOffset,
+        designated_subs: config.designatedSubs,
+        substitution_band: config.substitutionBand,
+        second_libero: config.secondLibero,
+        libero_sub: config.liberoSub,
+        libero_replacement_sets: config.liberoReplacementSets,
+        rotation_system: config.rotationSystem,
+        designated_setters: config.designatedSetters,
+        offensive_preferences: config.offensivePreferences,
+        system_sets: config.systemSets,
+        offensive_preference_sets: config.offensivePreferenceSets
+    };
+}

package/dist/cjs/src/data/transformers/tactics.test.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const globals_1 = require("@jest/globals");
 const tactics_1 = require("./tactics");
 const service_1 = require("../../service");
+const test_helpers_1 = require("../../service/test-helpers");
 // Minimal TacticsModel-shaped object; cast through unknown since the transformer only reads columns.
 function makeTactics(designatedSubs) {
     return {
@@ -77,4 +78,64 @@ function makeTactics(designatedSubs) {
         (0, globals_1.expect)(dto.secondLibero).toBe('reserve1');
         (0, globals_1.expect)(dto.liberoSub).toEqual({ mode: 'FATIGUE' });
     });
+    (0, globals_1.it)('passes per-set tactics columns through to the API DTO shape', () => {
+        const model = makeTactics([]);
+        model.system_sets = [{ rotationSystem: service_1.RotationSystemEnum.FIVE_ONE, designatedSetters: ['lf'] }];
+        model.offensive_preference_sets = [[{ rotation: 1, order: ['rf', 'mf'] }]];
+        const dto = (0, tactics_1.tacticsColumnsToApiDto)(model);
+        (0, globals_1.expect)(dto.systemSets).toEqual([{ rotationSystem: '5-1', designatedSetters: ['lf'] }]);
+        (0, globals_1.expect)(dto.offensivePreferenceSets).toEqual([[{ rotation: 1, order: ['rf', 'mf'] }]]);
+    });
+    (0, globals_1.it)('leaves the per-set DTO fields undefined when the columns are absent', () => {
+        const dto = (0, tactics_1.tacticsColumnsToApiDto)(makeTactics([]));
+        (0, globals_1.expect)(dto.systemSets).toBeUndefined();
+        (0, globals_1.expect)(dto.offensivePreferenceSets).toBeUndefined();
+    });
+});
+(0, globals_1.describe)('per-set tactics — service <-> row round-trip', () => {
+    const country = (0, test_helpers_1.makeCountry)();
+    const p1 = (0, test_helpers_1.makePlayer)(country);
+    const p2 = (0, test_helpers_1.makePlayer)(country);
+    const p3 = (0, test_helpers_1.makePlayer)(country);
+    const p4 = (0, test_helpers_1.makePlayer)(country);
+    const p5 = (0, test_helpers_1.makePlayer)(country);
+    const p6 = (0, test_helpers_1.makePlayer)(country);
+    const roster = [p1, p2, p3, p4, p5, p6];
+    const tactics = service_1.Tactics.create({
+        lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+        liberoReplacements: [],
+        systemSets: [
+            { rotationSystem: service_1.RotationSystemEnum.FIVE_ONE, designatedSetters: [p1] },
+            { rotationSystem: service_1.RotationSystemEnum.SIX_ZERO, designatedSetters: [] }
+        ],
+        offensivePreferenceSets: [[{ rotation: 1, order: [p2, p3] }]]
+    });
+    (0, globals_1.it)('transformFromTactics writes the per-set overrides as id-based jsonb columns', () => {
+        const attrs = (0, tactics_1.transformFromTactics)(tactics, 'team-1');
+        (0, globals_1.expect)(attrs.system_sets).toEqual([
+            { rotationSystem: '5-1', designatedSetters: [p1.id] },
+            { rotationSystem: '6-0', designatedSetters: [] }
+        ]);
+        (0, globals_1.expect)(attrs.offensive_preference_sets).toEqual([[{ rotation: 1, order: [p2.id, p3.id] }]]);
+    });
+    (0, globals_1.it)('transformToTactics resolves the stored ids back to roster players', () => {
+        const attrs = (0, tactics_1.transformFromTactics)(tactics, 'team-1');
+        const back = (0, tactics_1.transformToTactics)(attrs, roster);
+        (0, globals_1.expect)(back.systemSets?.[0].rotationSystem).toBe(service_1.RotationSystemEnum.FIVE_ONE);
+        (0, globals_1.expect)(back.systemSets?.[0].designatedSetters[0].id).toBe(p1.id);
+        (0, globals_1.expect)(back.systemSets?.[1].designatedSetters).toEqual([]);
+        (0, globals_1.expect)(back.offensivePreferenceSets?.[0][0].order.map(p => p.id)).toEqual([p2.id, p3.id]);
+    });
+    (0, globals_1.it)('omits the per-set columns entirely for an all-sets config', () => {
+        const flat = service_1.Tactics.create({
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: []
+        });
+        const attrs = (0, tactics_1.transformFromTactics)(flat, 'team-1');
+        (0, globals_1.expect)(attrs.system_sets).toBeUndefined();
+        (0, globals_1.expect)(attrs.offensive_preference_sets).toBeUndefined();
+        const back = (0, tactics_1.transformToTactics)(attrs, roster);
+        (0, globals_1.expect)(back.systemSets).toBeUndefined();
+        (0, globals_1.expect)(back.offensivePreferenceSets).toBeUndefined();
+    });
 });

package/dist/cjs/src/data/transformers/team.d.ts

@@ -1,5 +1,11 @@
 import { Team } from '../../service';
 import { TeamAttributes, TeamModel } from '../models';
+import type { Tactics as ApiTactics } from '../../api';
+export interface MatchTacticsOverride {
+    presetId: string;
+    config: ApiTactics;
+    onFallback?: (presetId: string, err: unknown) => void;
+}
 declare function transformToAttributes(team: Team): TeamAttributes;
-declare function transformToObject(model: TeamModel, currentIteration?: number): Team;
+declare function transformToObject(model: TeamModel, currentIteration?: number, tacticsOverride?: MatchTacticsOverride): Team;
 export { transformToObject as transformToTeam, transformToAttributes as transformFromTeam };

package/dist/cjs/src/data/transformers/team.js

@@ -1,9 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformToTeam = transformToObject;
 exports.transformFromTeam = transformToAttributes;
 const service_1 = require("../../service");
 const _1 = require(".");
+const logger_1 = __importDefault(require("../../logger"));
 function transformToAttributes(team) {
     return {
         team_id: team.id,
@@ -16,11 +20,25 @@ function transformToAttributes(team) {
         division_id: team.divisionId
     };
 }
-function transformToObject(model, currentIteration) {
+function transformToObject(model, currentIteration, tacticsOverride) {
     const roster = (model.PlayerTeams ?? []).map((pt) => (0, _1.transformToPlayer)(pt.player, currentIteration));
-    const tactics = model.tactics != null && roster != null && roster.length > 0
-        ? (0, _1.transformToTactics)(model.tactics, roster)
-        : undefined;
+    let tactics;
+    if (tacticsOverride != null && roster.length > 0) {
+        try {
+            tactics = (0, _1.transformToTactics)((0, _1.apiTacticsConfigToTacticsAttributes)(tacticsOverride.config, model.team_id), roster);
+        }
+        catch (err) {
+            if (tacticsOverride.onFallback != null)
+                tacticsOverride.onFallback(tacticsOverride.presetId, err);
+            else
+                logger_1.default.warn(`MATCH_PRESET_FALLBACK: team=${model.team_id} preset=${tacticsOverride.presetId} failed to hydrate; using active tactics`);
+        }
+    }
+    if (tactics == null) {
+        tactics = model.tactics != null && roster.length > 0
+            ? (0, _1.transformToTactics)(model.tactics, roster)
+            : undefined;
+    }
     return service_1.Team.create({
         id: model.team_id,
         name: model.name,

package/dist/cjs/src/data/transformers/tournament.js

@@ -45,7 +45,7 @@ function transformToObject(model) {
         id: model.competition_id,
         iteration: (0, _1.transformToIteration)(model.Iteration),
         matches: (model.CompetitionMatches ?? []).map(_1.transformToTournamentMatch),
-        teams: (0, _1.sortTeamsByCompetitionIndex)(model.Teams ?? []).map(_1.transformToTeam),
+        teams: (0, _1.sortTeamsByCompetitionIndex)(model.Teams ?? []).map(team => (0, _1.transformToTeam)(team)),
         status: model.status,
         champion
     });

package/dist/cjs/src/service/team/schemas/tactics.z.test.js

@@ -69,3 +69,118 @@ const test_helpers_1 = require("../../test-helpers");
         }
     });
 });
+(0, globals_1.describe)('TacticsInputSchema — per-set tactics (systemSets / offensivePreferenceSets)', () => {
+    const country = (0, test_helpers_1.makeCountry)();
+    const p1 = (0, test_helpers_1.makePlayer)(country);
+    const p2 = (0, test_helpers_1.makePlayer)(country);
+    const p3 = (0, test_helpers_1.makePlayer)(country);
+    const p4 = (0, test_helpers_1.makePlayer)(country);
+    const p5 = (0, test_helpers_1.makePlayer)(country);
+    const p6 = (0, test_helpers_1.makePlayer)(country);
+    const reserve = (0, test_helpers_1.makePlayer)(country);
+    // Minimal valid flat input (6-0 default: no setters, no preferences). Zone layout: p1@1, p2@2, p3@3,
+    // p4@4, p5@5, p6@6 — opposite slot pairs (3 apart) are (1,4), (2,5), (3,6).
+    function baseInput(overrides = {}) {
+        return {
+            lineup: { 4: p4, 3: p3, 2: p2, 5: p5, 6: p6, 1: p1, bench: [] },
+            liberoReplacements: [],
+            ...overrides
+        };
+    }
+    (0, globals_1.it)('accepts valid per-set overrides for both scopes', () => {
+        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
+            systemSets: [
+                { rotationSystem: '5-1', designatedSetters: [p1] },
+                { rotationSystem: '6-0', designatedSetters: [] },
+                { rotationSystem: '4-2', designatedSetters: [p1, p4] }
+            ],
+            offensivePreferenceSets: [
+                [{ rotation: 1, order: [p2, p3] }],
+                []
+            ]
+        }));
+        (0, globals_1.expect)(res.success).toBe(true);
+    });
+    (0, globals_1.it)('carries the per-set fields through Tactics.create parsing', () => {
+        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
+            systemSets: [{ rotationSystem: '5-1', designatedSetters: [p1] }],
+            offensivePreferenceSets: [[{ rotation: 2, order: [p3] }]]
+        }));
+        (0, globals_1.expect)(res.success).toBe(true);
+        if (res.success) {
+            (0, globals_1.expect)(res.data.systemSets?.[0].rotationSystem).toBe('5-1');
+            (0, globals_1.expect)(res.data.systemSets?.[0].designatedSetters[0].id).toBe(p1.id);
+            (0, globals_1.expect)(res.data.offensivePreferenceSets?.[0][0]).toMatchObject({ rotation: 2 });
+        }
+    });
+    (0, globals_1.it)('rejects more than 5 per-set entries', () => {
+        const entry = { rotationSystem: '6-0', designatedSetters: [] };
+        (0, globals_1.expect)(tactics_z_1.TacticsInputSchema.safeParse(baseInput({ systemSets: Array.from({ length: 6 }, () => entry) })).success).toBe(false);
+        (0, globals_1.expect)(tactics_z_1.TacticsInputSchema.safeParse(baseInput({ offensivePreferenceSets: Array.from({ length: 6 }, () => []) })).success).toBe(false);
+    });
+    (0, globals_1.it)('rejects a set entry whose setter count does not match its system (5-1 with none)', () => {
+        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
+            systemSets: [{ rotationSystem: '5-1', designatedSetters: [] }]
+        }));
+        (0, globals_1.expect)(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'DESIGNATED_SETTERS_COUNT_5-1_EXPECTED_1');
+            (0, globals_1.expect)(issue?.path).toEqual(['systemSets', 0]);
+        }
+    });
+    (0, globals_1.it)('rejects a set entry whose setter is not a court starter', () => {
+        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
+            systemSets: [
+                { rotationSystem: '6-0', designatedSetters: [] },
+                { rotationSystem: '5-1', designatedSetters: [reserve] }
+            ]
+        }));
+        (0, globals_1.expect)(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'DESIGNATED_SETTER_NOT_A_STARTER');
+            (0, globals_1.expect)(issue?.path).toEqual(['systemSets', 1]);
+        }
+    });
+    (0, globals_1.it)('rejects a 4-2 set entry whose setters are not in opposite slots', () => {
+        // p1@1 and p2@2 are adjacent (not 3 apart), so the 4-2 pair rule fails for that set entry.
+        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
+            systemSets: [{ rotationSystem: '4-2', designatedSetters: [p1, p2] }]
+        }));
+        (0, globals_1.expect)(res.success).toBe(false);
+        if (!res.success) {
+            (0, globals_1.expect)(res.error.issues.some(i => i.message === 'DESIGNATED_SETTERS_NOT_IN_OPPOSITE_SLOTS')).toBe(true);
+        }
+    });
+    (0, globals_1.it)('rejects a per-set preferences list with a duplicate rotation', () => {
+        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
+            offensivePreferenceSets: [[{ rotation: 1, order: [p2] }, { rotation: 1, order: [p3] }]]
+        }));
+        (0, globals_1.expect)(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'OFFENSIVE_PREFERENCE_DUPLICATE_ROTATION');
+            (0, globals_1.expect)(issue?.path).toEqual(['offensivePreferenceSets', 0]);
+        }
+    });
+    (0, globals_1.it)('rejects a per-set preferences order that lists a non-starter', () => {
+        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
+            offensivePreferenceSets: [[{ rotation: 1, order: [reserve] }]]
+        }));
+        (0, globals_1.expect)(res.success).toBe(false);
+        if (!res.success) {
+            (0, globals_1.expect)(res.error.issues.some(i => i.message === 'OFFENSIVE_PREFERENCE_ATTACKER_NOT_A_STARTER')).toBe(true);
+        }
+    });
+    (0, globals_1.it)('still validates the flat fields when per-set overrides are present', () => {
+        // Flat 5-1 with no setter is invalid even though every set entry is valid.
+        const res = tactics_z_1.TacticsInputSchema.safeParse(baseInput({
+            rotationSystem: '5-1',
+            designatedSetters: [],
+            systemSets: [{ rotationSystem: '6-0', designatedSetters: [] }]
+        }));
+        (0, globals_1.expect)(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'DESIGNATED_SETTERS_COUNT_5-1_EXPECTED_1');
+            (0, globals_1.expect)(issue?.path).toEqual(['designatedSetters']);
+        }
+    });
+});

package/dist/esm/src/api/index.d.ts

@@ -49,6 +49,7 @@ export type Match = Omit<DataProps<_Match>, 'sets' | 'homeTeam' | 'awayTeam' | '
     awayForm?: MatchForm[];
     isFriendly?: boolean;
     detailUnavailable?: boolean;
+    selectedPresetId?: string;
 };
 export type RallyEvent = DataProps<_RallyEvent> & {
     teamId?: string;
@@ -128,6 +129,7 @@ export interface ApiLineupPreset {
     orderIndex: number;
     config: Tactics;
 }
+export type ApiLineupPresetSummary = Omit<ApiLineupPreset, 'config'>;
 export type Team = Omit<DataProps<_Team>, 'roster' | '_rating' | 'rating' | 'tactics'> & {
     roster: Player[];
     rating: {

package/dist/esm/src/data/init-models.js

@@ -1,10 +1,11 @@
-import { AuthIdentityModel, AuthSessionModel, AuthUserModel, BoxScoreModel, CoachModel, ScoutModel, BoxScoreTotalsModel, CompetitionChampionModel, CurrencyTransactionModel, GachaPityModel, GachaPullHistoryModel, WishlistModel, UserSettingsModel, CompetitionMatchModel, CompetitionMVPModel, CompetitionModel, CompetitionStandingsMatchModel, CompetitionStandingsModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerImprovementLogModel, PlayerDeclineLogModel, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, FriendlyModel, RegionQualifierModel, NationalCountryModel, RallyModel, TacticsModel, LineupPresetModel, TeamModel, TeamReplacementModel, UserCurrencyModel, UserPlayerProgressModel, UserPullGrantModel, UserTeamModel, VPERModel, NotificationModel, AppConfigModel, LegacyTeamFlagModel } from './models';
+import { AuthIdentityModel, AuthSessionModel, AuthUserModel, BoxScoreModel, CoachModel, ScoutModel, BoxScoreTotalsModel, CompetitionChampionModel, CurrencyTransactionModel, GachaPityModel, GachaPullHistoryModel, WishlistModel, UserSettingsModel, UserDeviceTokenModel, CompetitionMatchModel, CompetitionMVPModel, CompetitionModel, CompetitionStandingsMatchModel, CompetitionStandingsModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerImprovementLogModel, PlayerDeclineLogModel, PlayerTeamModel, RetiredPlayerModel, PromotionMatchModel, FriendlyModel, RegionQualifierModel, NationalCountryModel, RallyModel, TacticsModel, LineupPresetModel, MatchPresetModel, TeamModel, TeamReplacementModel, UserCurrencyModel, UserPlayerProgressModel, UserPullGrantModel, UserTeamModel, VPERModel, NotificationModel, AppConfigModel, LegacyTeamFlagModel } from './models';
 export function initModels(sequelize) {
     const Coach = CoachModel.initModel(sequelize);
     const Scout = ScoutModel.initModel(sequelize);
     const CurrencyTransaction = CurrencyTransactionModel.initModel(sequelize);
     const Tactics = TacticsModel.initModel(sequelize);
     const LineupPreset = LineupPresetModel.initModel(sequelize);
+    const MatchPreset = MatchPresetModel.initModel(sequelize);
     const AuthUser = AuthUserModel.initModel(sequelize);
     const UserCurrency = UserCurrencyModel.initModel(sequelize);
     const UserPlayerProgress = UserPlayerProgressModel.initModel(sequelize);
@@ -13,6 +14,7 @@ export function initModels(sequelize) {
     const UserPullGrant = UserPullGrantModel.initModel(sequelize);
     const Wishlist = WishlistModel.initModel(sequelize);
     const UserSettings = UserSettingsModel.initModel(sequelize);
+    const UserDeviceToken = UserDeviceTokenModel.initModel(sequelize);
     const Notification = NotificationModel.initModel(sequelize);
     const AuthIdentity = AuthIdentityModel.initModel(sequelize);
     const AuthSession = AuthSessionModel.initModel(sequelize);
@@ -60,7 +62,9 @@ export function initModels(sequelize) {
     AuthUser.hasOne(GachaPity, { as: 'GachaPity', foreignKey: 'user_id' });
     AuthUser.hasOne(Wishlist, { as: 'Wishlist', foreignKey: 'user_id' });
     AuthUser.hasOne(UserSettings, { as: 'UserSettings', foreignKey: 'user_id' });
+    AuthUser.hasMany(UserDeviceToken, { as: 'UserDeviceTokens', foreignKey: 'user_id' });
     AuthUser.hasMany(Notification, { as: 'Notifications', foreignKey: 'user_id' });
+    UserDeviceToken.belongsTo(AuthUser, { as: 'user', foreignKey: 'user_id' });
     Notification.belongsTo(AuthUser, { as: 'user', foreignKey: 'user_id' });
     AuthUser.hasMany(GachaPullHistory, { as: 'GachaPullHistory', foreignKey: 'user_id' });
     AuthUser.hasMany(UserPullGrant, { as: 'UserPullGrants', foreignKey: 'user_id' });
@@ -209,6 +213,13 @@ export function initModels(sequelize) {
     // simulator's team loads are unchanged (it reads the active config from the mirrored Tactics row).
     Team.hasMany(LineupPreset, { as: 'lineupPresets', foreignKey: 'team_id' });
     LineupPreset.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
+    // Per-match preset choices. Deliberately NOT part of any default scope: only the simulator's match query
+    // loads MatchPresets, so every other transformToMatch caller stays on the active-tactics path.
+    Match.hasMany(MatchPreset, { as: 'MatchPresets', foreignKey: 'match_id' });
+    MatchPreset.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
+    MatchPreset.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
+    MatchPreset.belongsTo(LineupPreset, { as: 'preset', foreignKey: 'preset_id' });
+    LineupPreset.hasMany(MatchPreset, { as: 'MatchPresets', foreignKey: 'preset_id' });
     Team.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Team.belongsToMany(Competition, {
         as: 'Competitions',
@@ -283,6 +294,7 @@ export function initModels(sequelize) {
         TeamReplacement,
         Tactics,
         LineupPreset,
+        MatchPreset,
         UserTeam,
         UserCurrency,
         UserPlayerProgress,
@@ -291,6 +303,7 @@ export function initModels(sequelize) {
         UserPullGrant,
         Wishlist,
         UserSettings,
+        UserDeviceToken,
         Notification,
         Coach,
         Scout,

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

@@ -36,6 +36,7 @@ export * from './team';
 export * from './team-replacement';
 export * from './tactics';
 export * from './lineup-preset';
+export * from './match-preset';
 export * from './user-currency';
 export * from './user-player-progress';
 export * from './gacha-pity';
@@ -44,6 +45,7 @@ export * from './wishlist';
 export * from './currency-transaction';
 export * from './user-pull-grant';
 export * from './user-settings';
+export * from './user-device-token';
 export * from './notification';
 export * from './vper';
 export * from './views';

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

@@ -36,6 +36,7 @@ export * from './team';
 export * from './team-replacement';
 export * from './tactics';
 export * from './lineup-preset';
+export * from './match-preset';
 export * from './user-currency';
 export * from './user-player-progress';
 export * from './gacha-pity';
@@ -44,6 +45,7 @@ export * from './wishlist';
 export * from './currency-transaction';
 export * from './user-pull-grant';
 export * from './user-settings';
+export * from './user-device-token';
 export * from './notification';
 export * from './vper';
 export * from './views';

package/dist/esm/src/data/models/match-preset.d.ts

@@ -0,0 +1,28 @@
+import * as Sequelize from 'sequelize';
+import { Model } from 'sequelize';
+import { LineupPresetId, LineupPresetModel, MatchId, MatchModel, TeamId, TeamModel } from '.';
+export interface MatchPresetAttributes {
+    match_id: string;
+    team_id: string;
+    preset_id: string;
+}
+export type MatchPresetPk = 'match_id' | 'team_id';
+export type MatchPresetCreationAttributes = MatchPresetAttributes;
+export declare class MatchPresetModel extends Model<MatchPresetAttributes, MatchPresetCreationAttributes> implements MatchPresetAttributes {
+    match_id: string;
+    team_id: string;
+    preset_id: string;
+    match: MatchModel;
+    getMatch: Sequelize.BelongsToGetAssociationMixin<MatchModel>;
+    setMatch: Sequelize.BelongsToSetAssociationMixin<MatchModel, MatchId>;
+    createMatch: Sequelize.BelongsToCreateAssociationMixin<MatchModel>;
+    team: TeamModel;
+    getTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
+    setTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;
+    createTeam: Sequelize.BelongsToCreateAssociationMixin<TeamModel>;
+    preset: LineupPresetModel;
+    getPreset: Sequelize.BelongsToGetAssociationMixin<LineupPresetModel>;
+    setPreset: Sequelize.BelongsToSetAssociationMixin<LineupPresetModel, LineupPresetId>;
+    createPreset: Sequelize.BelongsToCreateAssociationMixin<LineupPresetModel>;
+    static initModel(sequelize: Sequelize.Sequelize): typeof MatchPresetModel;
+}

package/dist/esm/src/data/models/match-preset.js

@@ -0,0 +1,61 @@
+import { DataTypes, Model } from 'sequelize';
+export class MatchPresetModel extends Model {
+    static initModel(sequelize) {
+        return MatchPresetModel.init({
+            match_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Match',
+                    key: 'match_id'
+                }
+            },
+            team_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                references: {
+                    model: 'Team',
+                    key: 'team_id'
+                }
+            },
+            preset_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'LineupPreset',
+                    key: 'preset_id'
+                }
+            }
+        }, {
+            sequelize,
+            tableName: 'MatchPreset',
+            schema: 'public',
+            timestamps: false,
+            indexes: [
+                {
+                    name: 'MatchPreset_pk',
+                    unique: true,
+                    fields: [
+                        { name: 'match_id' },
+                        { name: 'team_id' }
+                    ]
+                },
+                {
+                    name: 'MatchPreset_team_id_idx',
+                    fields: [
+                        { name: 'team_id' }
+                    ]
+                },
+                {
+                    // Keeps the LineupPreset ON DELETE CASCADE cheap.
+                    name: 'MatchPreset_preset_id_idx',
+                    fields: [
+                        { name: 'preset_id' }
+                    ]
+                }
+            ]
+        });
+    }
+}

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

@@ -1,7 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
 import { Status } from '../common';
-import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultModel, MatchSetAttributes, MatchSetId, MatchSetModel, VPERAttributes, VPERId, VPERModel, TeamId, TeamModel } from '.';
+import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultModel, MatchPresetModel, MatchSetAttributes, MatchSetId, MatchSetModel, VPERAttributes, VPERId, VPERModel, TeamId, TeamModel } from '.';
 import { MatchRallyAggregates } from '../../service';
 export interface MatchAttributes {
     match_id: string;
@@ -59,6 +59,7 @@ export declare class MatchModel extends Model<MatchAttributes, MatchCreationAttr
     hasVPER: Sequelize.HasManyHasAssociationMixin<VPERModel, VPERId>;
     hasVPERs: Sequelize.HasManyHasAssociationsMixin<VPERModel, VPERId>;
     countVPERs: Sequelize.HasManyCountAssociationsMixin;
+    MatchPresets?: MatchPresetModel[];
     MatchSets: MatchSetModel[];
     getMatchSets: Sequelize.HasManyGetAssociationsMixin<MatchSetModel>;
     setMatchSets: Sequelize.HasManySetAssociationsMixin<MatchSetModel, MatchSetId>;

package/dist/esm/src/data/models/user-device-token.d.ts

@@ -0,0 +1,23 @@
+import * as Sequelize from 'sequelize';
+import { Model, Optional } from 'sequelize';
+export interface UserDeviceTokenAttributes {
+    user_device_token_id: string;
+    user_id: string;
+    device_token: string;
+    platform: string;
+    created_at?: Date;
+    updated_at?: Date;
+}
+export type UserDeviceTokenPk = 'user_device_token_id';
+export type UserDeviceTokenId = UserDeviceTokenModel[UserDeviceTokenPk];
+export type UserDeviceTokenOptionalAttributes = 'user_device_token_id' | 'platform' | 'created_at' | 'updated_at';
+export type UserDeviceTokenCreationAttributes = Optional<UserDeviceTokenAttributes, UserDeviceTokenOptionalAttributes>;
+export declare class UserDeviceTokenModel extends Model<UserDeviceTokenAttributes, UserDeviceTokenCreationAttributes> implements UserDeviceTokenAttributes {
+    user_device_token_id: string;
+    user_id: string;
+    device_token: string;
+    platform: string;
+    created_at?: Date;
+    updated_at?: Date;
+    static initModel(sequelize: Sequelize.Sequelize): typeof UserDeviceTokenModel;
+}

package/dist/esm/src/data/models/user-device-token.js

@@ -0,0 +1,61 @@
+import { DataTypes, Model } from 'sequelize';
+export class UserDeviceTokenModel extends Model {
+    static initModel(sequelize) {
+        return UserDeviceTokenModel.init({
+            user_device_token_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                defaultValue: DataTypes.UUIDV4
+            },
+            user_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'AuthUser',
+                    key: 'user_id'
+                }
+            },
+            device_token: {
+                type: DataTypes.TEXT,
+                allowNull: false
+            },
+            platform: {
+                type: DataTypes.TEXT,
+                allowNull: false,
+                defaultValue: 'android'
+            },
+            created_at: {
+                type: DataTypes.DATE,
+                allowNull: false,
+                defaultValue: DataTypes.NOW
+            },
+            updated_at: {
+                type: DataTypes.DATE,
+                allowNull: false,
+                defaultValue: DataTypes.NOW
+            }
+        }, {
+            sequelize,
+            tableName: 'UserDeviceToken',
+            schema: 'public',
+            timestamps: false,
+            indexes: [
+                {
+                    name: 'UserDeviceToken_pk',
+                    unique: true,
+                    fields: [{ name: 'user_device_token_id' }]
+                },
+                {
+                    name: 'UserDeviceToken_user_id_device_token_uq',
+                    unique: true,
+                    fields: [{ name: 'user_id' }, { name: 'device_token' }]
+                },
+                {
+                    name: 'UserDeviceToken_user_id_idx',
+                    fields: [{ name: 'user_id' }]
+                }
+            ]
+        });
+    }
+}

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/match-preset-override.test.d.ts

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