volleyballsimtypes 0.0.459 → 0.0.462

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

@@ -16,6 +16,7 @@ function initModels(sequelize) {
     const UserPullGrant = models_1.UserPullGrantModel.initModel(sequelize);
     const Wishlist = models_1.WishlistModel.initModel(sequelize);
     const UserSettings = models_1.UserSettingsModel.initModel(sequelize);
+    const UserDeviceToken = models_1.UserDeviceTokenModel.initModel(sequelize);
     const Notification = models_1.NotificationModel.initModel(sequelize);
     const AuthIdentity = models_1.AuthIdentityModel.initModel(sequelize);
     const AuthSession = models_1.AuthSessionModel.initModel(sequelize);
@@ -63,7 +64,9 @@ 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' });
@@ -294,6 +297,7 @@ function initModels(sequelize) {
         UserPullGrant,
         Wishlist,
         UserSettings,
+        UserDeviceToken,
         Notification,
         Coach,
         Scout,

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

@@ -44,6 +44,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/cjs/src/data/models/index.js

@@ -60,6 +60,7 @@ __exportStar(require("./wishlist"), exports);
 __exportStar(require("./currency-transaction"), exports);
 __exportStar(require("./user-pull-grant"), exports);
 __exportStar(require("./user-settings"), exports);
+__exportStar(require("./user-device-token"), exports);
 __exportStar(require("./notification"), exports);
 __exportStar(require("./vper"), exports);
 __exportStar(require("./views"), exports);

package/dist/cjs/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/cjs/src/data/models/user-device-token.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserDeviceTokenModel = void 0;
+const sequelize_1 = require("sequelize");
+class UserDeviceTokenModel extends sequelize_1.Model {
+    static initModel(sequelize) {
+        return UserDeviceTokenModel.init({
+            user_device_token_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true,
+                defaultValue: sequelize_1.DataTypes.UUIDV4
+            },
+            user_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                references: {
+                    model: 'AuthUser',
+                    key: 'user_id'
+                }
+            },
+            device_token: {
+                type: sequelize_1.DataTypes.TEXT,
+                allowNull: false
+            },
+            platform: {
+                type: sequelize_1.DataTypes.TEXT,
+                allowNull: false,
+                defaultValue: 'android'
+            },
+            created_at: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: false,
+                defaultValue: sequelize_1.DataTypes.NOW
+            },
+            updated_at: {
+                type: sequelize_1.DataTypes.DATE,
+                allowNull: false,
+                defaultValue: sequelize_1.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' }]
+                }
+            ]
+        });
+    }
+}
+exports.UserDeviceTokenModel = UserDeviceTokenModel;

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/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/data/init-models.js

@@ -1,4 +1,4 @@
-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, 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);
@@ -13,6 +13,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 +61,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' });
@@ -291,6 +294,7 @@ export function initModels(sequelize) {
         UserPullGrant,
         Wishlist,
         UserSettings,
+        UserDeviceToken,
         Notification,
         Coach,
         Scout,

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

@@ -44,6 +44,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

@@ -44,6 +44,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/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/tactics.test.js

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

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

@@ -67,3 +67,118 @@ describe('TacticsInputSchema — second libero rules', () => {
         }
     });
 });
+describe('TacticsInputSchema — per-set tactics (systemSets / offensivePreferenceSets)', () => {
+    const country = makeCountry();
+    const p1 = makePlayer(country);
+    const p2 = makePlayer(country);
+    const p3 = makePlayer(country);
+    const p4 = makePlayer(country);
+    const p5 = makePlayer(country);
+    const p6 = makePlayer(country);
+    const reserve = 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
+        };
+    }
+    it('accepts valid per-set overrides for both scopes', () => {
+        const res = 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] }],
+                []
+            ]
+        }));
+        expect(res.success).toBe(true);
+    });
+    it('carries the per-set fields through Tactics.create parsing', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            systemSets: [{ rotationSystem: '5-1', designatedSetters: [p1] }],
+            offensivePreferenceSets: [[{ rotation: 2, order: [p3] }]]
+        }));
+        expect(res.success).toBe(true);
+        if (res.success) {
+            expect(res.data.systemSets?.[0].rotationSystem).toBe('5-1');
+            expect(res.data.systemSets?.[0].designatedSetters[0].id).toBe(p1.id);
+            expect(res.data.offensivePreferenceSets?.[0][0]).toMatchObject({ rotation: 2 });
+        }
+    });
+    it('rejects more than 5 per-set entries', () => {
+        const entry = { rotationSystem: '6-0', designatedSetters: [] };
+        expect(TacticsInputSchema.safeParse(baseInput({ systemSets: Array.from({ length: 6 }, () => entry) })).success).toBe(false);
+        expect(TacticsInputSchema.safeParse(baseInput({ offensivePreferenceSets: Array.from({ length: 6 }, () => []) })).success).toBe(false);
+    });
+    it('rejects a set entry whose setter count does not match its system (5-1 with none)', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            systemSets: [{ rotationSystem: '5-1', designatedSetters: [] }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'DESIGNATED_SETTERS_COUNT_5-1_EXPECTED_1');
+            expect(issue?.path).toEqual(['systemSets', 0]);
+        }
+    });
+    it('rejects a set entry whose setter is not a court starter', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            systemSets: [
+                { rotationSystem: '6-0', designatedSetters: [] },
+                { rotationSystem: '5-1', designatedSetters: [reserve] }
+            ]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'DESIGNATED_SETTER_NOT_A_STARTER');
+            expect(issue?.path).toEqual(['systemSets', 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 = TacticsInputSchema.safeParse(baseInput({
+            systemSets: [{ rotationSystem: '4-2', designatedSetters: [p1, p2] }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'DESIGNATED_SETTERS_NOT_IN_OPPOSITE_SLOTS')).toBe(true);
+        }
+    });
+    it('rejects a per-set preferences list with a duplicate rotation', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            offensivePreferenceSets: [[{ rotation: 1, order: [p2] }, { rotation: 1, order: [p3] }]]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'OFFENSIVE_PREFERENCE_DUPLICATE_ROTATION');
+            expect(issue?.path).toEqual(['offensivePreferenceSets', 0]);
+        }
+    });
+    it('rejects a per-set preferences order that lists a non-starter', () => {
+        const res = TacticsInputSchema.safeParse(baseInput({
+            offensivePreferenceSets: [[{ rotation: 1, order: [reserve] }]]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            expect(res.error.issues.some(i => i.message === 'OFFENSIVE_PREFERENCE_ATTACKER_NOT_A_STARTER')).toBe(true);
+        }
+    });
+    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 = TacticsInputSchema.safeParse(baseInput({
+            rotationSystem: '5-1',
+            designatedSetters: [],
+            systemSets: [{ rotationSystem: '6-0', designatedSetters: [] }]
+        }));
+        expect(res.success).toBe(false);
+        if (!res.success) {
+            const issue = res.error.issues.find(i => i.message === 'DESIGNATED_SETTERS_COUNT_5-1_EXPECTED_1');
+            expect(issue?.path).toEqual(['designatedSetters']);
+        }
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "volleyballsimtypes",
-  "version": "0.0.459",
+  "version": "0.0.462",
   "description": "vbsim types",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",