volleyballsimtypes 0.0.197 → 0.0.199

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

@@ -24,7 +24,6 @@ function initModels(sequelize) {
     const Player = models_1.PlayerModel.initModel(sequelize);
     const PlayerTeam = models_1.PlayerTeamModel.initModel(sequelize);
     const Rally = models_1.RallyModel.initModel(sequelize);
-    const SetPosition = models_1.SetPositionModel.initModel(sequelize);
     const Team = models_1.TeamModel.initModel(sequelize);
     const User = models_1.UserModel.initModel(sequelize);
     Tactics.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
@@ -78,12 +77,6 @@ function initModels(sequelize) {
     MatchRating.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
     MatchRating.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     MatchSet.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
-    MatchSet.belongsToMany(Player, {
-        as: 'SetPositionsPlayer',
-        through: SetPosition,
-        foreignKey: 'match_set_id',
-        otherKey: 'player_id'
-    });
     MatchSet.belongsToMany(Player, {
         as: 'BoxScorePlayers',
         through: BoxScore,
@@ -92,17 +85,10 @@ function initModels(sequelize) {
     });
     MatchSet.hasMany(BoxScore, { as: 'BoxScores', foreignKey: 'match_set_id' });
     MatchSet.hasMany(Rally, { as: 'Rallies', foreignKey: 'match_set_id' });
-    MatchSet.hasMany(SetPosition, { as: 'SetPositions', foreignKey: 'match_set_id' });
     BoxScore.belongsTo(MatchSet, { as: 'MatchSet', foreignKey: 'match_set_id' });
     BoxScore.belongsTo(Player, { as: 'Player', foreignKey: 'player_id' });
     PerformanceStats.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Player.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
-    Player.belongsToMany(MatchSet, {
-        as: 'SetPositionSets',
-        through: SetPosition,
-        foreignKey: 'player_id',
-        otherKey: 'match_set_id'
-    });
     Player.belongsToMany(MatchSet, {
         as: 'BoxScoreMatchSets',
         through: BoxScore,
@@ -117,15 +103,12 @@ function initModels(sequelize) {
     });
     Player.hasMany(BoxScore, { as: 'BoxScores', foreignKey: 'player_id' });
     Player.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'player_id' });
-    Player.hasMany(SetPosition, { as: 'SetPositions', foreignKey: 'player_id' });
     Player.hasOne(DraftPick, { as: 'DraftPick', foreignKey: 'player_id' });
     Player.hasOne(PerformanceStats, { as: 'PerformanceStat', foreignKey: 'player_id' });
     PlayerTeam.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     PlayerTeam.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Rally.belongsTo(MatchSet, { as: 'matchSet', foreignKey: 'match_set_id' });
     Rally.belongsTo(Team, { as: 'ServingTeam', foreignKey: 'serving_team' });
-    SetPosition.belongsTo(MatchSet, { as: 'matchSet', foreignKey: 'match_set_id' });
-    SetPosition.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Team.hasOne(Tactics, { as: 'tactics', foreignKey: 'team_id' });
     Team.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Team.belongsToMany(Competition, {
@@ -176,7 +159,6 @@ function initModels(sequelize) {
         Player,
         PlayerTeam,
         Rally,
-        SetPosition,
         Team,
         Tactics,
         User

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

@@ -18,7 +18,6 @@ export * from './performance-stats';
 export * from './player';
 export * from './player-team';
 export * from './rally';
-export * from './set-position';
 export * from './team';
 export * from './user';
 export * from './tactics';

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

@@ -34,7 +34,6 @@ __exportStar(require("./performance-stats"), exports);
 __exportStar(require("./player"), exports);
 __exportStar(require("./player-team"), exports);
 __exportStar(require("./rally"), exports);
-__exportStar(require("./set-position"), exports);
 __exportStar(require("./team"), exports);
 __exportStar(require("./user"), exports);
 __exportStar(require("./tactics"), exports);

package/dist/cjs/src/data/models/league.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LeagueModel = void 0;
 const sequelize_1 = require("sequelize");
+const _1 = require(".");
 class LeagueModel extends sequelize_1.Model {
     static initModel(sequelize) {
         return LeagueModel.init({
@@ -27,6 +28,11 @@ class LeagueModel extends sequelize_1.Model {
             tableName: 'League',
             schema: 'public',
             timestamps: false,
+            defaultScope: {
+                include: [
+                    { model: _1.CountryModel, as: 'country' }
+                ]
+            },
             indexes: [{
                     name: 'League_pk',
                     unique: true,

package/dist/cjs/src/data/models/match-set.d.ts

@@ -1,6 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, MatchId, MatchModel, PlayerId, PlayerModel, RallyAttributes, RallyId, RallyModel, SetPositionAttributes, SetPositionId, SetPositionModel } from '.';
+import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, MatchId, MatchModel, PlayerId, PlayerModel, RallyAttributes, RallyId, RallyModel } from '.';
+import { PlayerPositionAttributes } from '../transformers';
 export interface MatchSetAttributes {
     match_set_id: string;
     match_id: string;
@@ -8,7 +9,7 @@ export interface MatchSetAttributes {
     order: number;
     home_score: number;
     away_score: number;
-    SetPositions?: SetPositionAttributes[];
+    player_positions: PlayerPositionAttributes[];
     Rallies?: RallyAttributes[];
     BoxScores?: BoxScoreAttributes[];
 }
@@ -22,6 +23,7 @@ export declare class MatchSetModel extends Model<MatchSetAttributes, MatchSetCre
     order: number;
     home_score: number;
     away_score: number;
+    player_positions: PlayerPositionAttributes[];
     match: MatchModel;
     getMatch: Sequelize.BelongsToGetAssociationMixin<MatchModel>;
     setMatch: Sequelize.BelongsToSetAssociationMixin<MatchModel, MatchId>;
@@ -48,17 +50,6 @@ export declare class MatchSetModel extends Model<MatchSetAttributes, MatchSetCre
     hasSetStatsPlayer: Sequelize.BelongsToManyHasAssociationMixin<PlayerModel, PlayerId>;
     hasSetStatsPlayers: Sequelize.BelongsToManyHasAssociationsMixin<PlayerModel, PlayerId>;
     countSetStatsPlayers: Sequelize.BelongsToManyCountAssociationsMixin;
-    SetPositionPlayers: PlayerModel[];
-    getSetPositionPlayers: Sequelize.BelongsToManyGetAssociationsMixin<PlayerModel>;
-    setSetPositionPlayers: Sequelize.BelongsToManySetAssociationsMixin<PlayerModel, PlayerId>;
-    addSetPositionPlayer: Sequelize.BelongsToManyAddAssociationMixin<PlayerModel, PlayerId>;
-    addSetPositionPlayers: Sequelize.BelongsToManyAddAssociationsMixin<PlayerModel, PlayerId>;
-    createSetPositionPlayer: Sequelize.BelongsToManyCreateAssociationMixin<PlayerModel>;
-    removeSetPositionPlayer: Sequelize.BelongsToManyRemoveAssociationMixin<PlayerModel, PlayerId>;
-    removeSetPositionPlayers: Sequelize.BelongsToManyRemoveAssociationsMixin<PlayerModel, PlayerId>;
-    hasSetPositionPlayer: Sequelize.BelongsToManyHasAssociationMixin<PlayerModel, PlayerId>;
-    hasSetPositionPlayers: Sequelize.BelongsToManyHasAssociationsMixin<PlayerModel, PlayerId>;
-    countSetPositionPlayers: Sequelize.BelongsToManyCountAssociationsMixin;
     Rallies: RallyModel[];
     getRallies: Sequelize.HasManyGetAssociationsMixin<RallyModel>;
     setRallies: Sequelize.HasManySetAssociationsMixin<RallyModel, RallyId>;
@@ -70,16 +61,5 @@ export declare class MatchSetModel extends Model<MatchSetAttributes, MatchSetCre
     hasRally: Sequelize.HasManyHasAssociationMixin<RallyModel, RallyId>;
     hasRallies: Sequelize.HasManyHasAssociationsMixin<RallyModel, RallyId>;
     countRallies: Sequelize.HasManyCountAssociationsMixin;
-    SetPositions: SetPositionModel[];
-    getSetPositions: Sequelize.HasManyGetAssociationsMixin<SetPositionModel>;
-    setSetPositions: Sequelize.HasManySetAssociationsMixin<SetPositionModel, SetPositionId>;
-    addSetPosition: Sequelize.HasManyAddAssociationMixin<SetPositionModel, SetPositionId>;
-    addSetPositions: Sequelize.HasManyAddAssociationsMixin<SetPositionModel, SetPositionId>;
-    createSetPosition: Sequelize.HasManyCreateAssociationMixin<SetPositionModel>;
-    removeSetPosition: Sequelize.HasManyRemoveAssociationMixin<SetPositionModel, SetPositionId>;
-    removeSetPositions: Sequelize.HasManyRemoveAssociationsMixin<SetPositionModel, SetPositionId>;
-    hasSetPosition: Sequelize.HasManyHasAssociationMixin<SetPositionModel, SetPositionId>;
-    hasSetPositions: Sequelize.HasManyHasAssociationsMixin<SetPositionModel, SetPositionId>;
-    countSetPositions: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof MatchSetModel;
 }

package/dist/cjs/src/data/models/match-set.js

@@ -34,6 +34,11 @@ class MatchSetModel extends sequelize_1.Model {
             away_score: {
                 type: sequelize_1.DataTypes.INTEGER,
                 allowNull: false
+            },
+            player_positions: {
+                type: sequelize_1.DataTypes.JSONB,
+                allowNull: false,
+                defaultValue: []
             }
         }, {
             sequelize,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, CountryId, CountryModel, DraftPickId, DraftPickModel, MatchSetId, MatchSetModel, PerformanceStatsAttributes, PerformanceStatsId, PerformanceStatsModel, PlayerTeamId, PlayerTeamModel, SetPositionId, SetPositionModel, TeamId, TeamModel } from '.';
+import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, CountryId, CountryModel, DraftPickId, DraftPickModel, MatchSetId, MatchSetModel, PerformanceStatsAttributes, PerformanceStatsId, PerformanceStatsModel, PlayerTeamId, PlayerTeamModel, TeamId, TeamModel } from '.';
 import { Rarity, Role, Trait } from '../../service';
 export interface PlayerAttributes {
     player_id: string;
@@ -43,17 +43,6 @@ export declare class PlayerModel extends Model<PlayerAttributes, PlayerCreationA
     hasStatsMatchSet: Sequelize.BelongsToManyHasAssociationMixin<MatchSetModel, MatchSetId>;
     hasStatsMatchSets: Sequelize.BelongsToManyHasAssociationsMixin<MatchSetModel, MatchSetId>;
     countStatsMatchSets: Sequelize.BelongsToManyCountAssociationsMixin;
-    SetPositionSets: MatchSetModel[];
-    getSetPositionSets: Sequelize.BelongsToManyGetAssociationsMixin<MatchSetModel>;
-    setSetPositionSets: Sequelize.BelongsToManySetAssociationsMixin<MatchSetModel, MatchSetId>;
-    addSetPositionSet: Sequelize.BelongsToManyAddAssociationMixin<MatchSetModel, MatchSetId>;
-    addSetPositionSets: Sequelize.BelongsToManyAddAssociationsMixin<MatchSetModel, MatchSetId>;
-    createSetPositionSet: Sequelize.BelongsToManyCreateAssociationMixin<MatchSetModel>;
-    removeSetPositionSet: Sequelize.BelongsToManyRemoveAssociationMixin<MatchSetModel, MatchSetId>;
-    removeSetPositionSets: Sequelize.BelongsToManyRemoveAssociationsMixin<MatchSetModel, MatchSetId>;
-    hasSetPositionSet: Sequelize.BelongsToManyHasAssociationMixin<MatchSetModel, MatchSetId>;
-    hasSetPositionSets: Sequelize.BelongsToManyHasAssociationsMixin<MatchSetModel, MatchSetId>;
-    countSetPositionSets: Sequelize.BelongsToManyCountAssociationsMixin;
     BoxScores: BoxScoreModel[];
     getBoxScores: Sequelize.HasManyGetAssociationsMixin<BoxScoreModel>;
     setBoxScores: Sequelize.HasManySetAssociationsMixin<BoxScoreModel, BoxScoreId>;
@@ -80,17 +69,6 @@ export declare class PlayerModel extends Model<PlayerAttributes, PlayerCreationA
     hasPlayerTeam: Sequelize.HasManyHasAssociationMixin<PlayerTeamModel, PlayerTeamId>;
     hasPlayerTeams: Sequelize.HasManyHasAssociationsMixin<PlayerTeamModel, PlayerTeamId>;
     countPlayerTeams: Sequelize.HasManyCountAssociationsMixin;
-    SetPositions: SetPositionModel[];
-    getSetPositions: Sequelize.HasManyGetAssociationsMixin<SetPositionModel>;
-    setSetPositions: Sequelize.HasManySetAssociationsMixin<SetPositionModel, SetPositionId>;
-    addSetPosition: Sequelize.HasManyAddAssociationMixin<SetPositionModel, SetPositionId>;
-    addSetPositions: Sequelize.HasManyAddAssociationsMixin<SetPositionModel, SetPositionId>;
-    createSetPosition: Sequelize.HasManyCreateAssociationMixin<SetPositionModel>;
-    removeSetPosition: Sequelize.HasManyRemoveAssociationMixin<SetPositionModel, SetPositionId>;
-    removeSetPositions: Sequelize.HasManyRemoveAssociationsMixin<SetPositionModel, SetPositionId>;
-    hasSetPosition: Sequelize.HasManyHasAssociationMixin<SetPositionModel, SetPositionId>;
-    hasSetPositions: Sequelize.HasManyHasAssociationsMixin<SetPositionModel, SetPositionId>;
-    countSetPositions: Sequelize.HasManyCountAssociationsMixin;
     Teams: TeamModel[];
     getTeams: Sequelize.BelongsToManyGetAssociationsMixin<TeamModel>;
     setTeams: Sequelize.BelongsToManySetAssociationsMixin<TeamModel, TeamId>;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlayerModel = void 0;
 const sequelize_1 = require("sequelize");
+const _1 = require(".");
 const service_1 = require("../../service");
 class PlayerModel extends sequelize_1.Model {
     static initModel(sequelize) {
@@ -12,15 +13,15 @@ class PlayerModel extends sequelize_1.Model {
                 primaryKey: true
             },
             roles: {
-                type: sequelize_1.DataTypes.ARRAY(service_1.RoleDataType),
+                type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.ENUM(...Object.values(service_1.RoleEnum))),
                 allowNull: false
             },
             traits: {
-                type: sequelize_1.DataTypes.ARRAY(service_1.TraitDataType),
+                type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.ENUM(...Object.values(service_1.TraitEnum))),
                 allowNull: false
             },
             rarity: {
-                type: service_1.RarityDataType,
+                type: sequelize_1.DataTypes.ENUM(...Object.values(service_1.RarityEnum)),
                 allowNull: false
             },
             first_name: {
@@ -44,6 +45,12 @@ class PlayerModel extends sequelize_1.Model {
             tableName: 'Player',
             schema: 'public',
             timestamps: false,
+            defaultScope: {
+                include: [
+                    { model: _1.CountryModel, as: 'country' },
+                    { model: _1.PerformanceStatsModel, as: 'PerformanceStat' }
+                ]
+            },
             indexes: [{
                     name: 'Player_pk',
                     unique: true,

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamModel = void 0;
 const sequelize_1 = require("sequelize");
+const _1 = require(".");
 class TeamModel extends sequelize_1.Model {
     static initModel(sequelize) {
         return TeamModel.init({
@@ -44,6 +45,12 @@ class TeamModel extends sequelize_1.Model {
             tableName: 'Team',
             schema: 'public',
             timestamps: false,
+            defaultScope: {
+                include: [
+                    { model: _1.CountryModel, as: 'country' },
+                    { model: _1.TacticsModel, as: 'tactics' }
+                ]
+            },
             indexes: [{
                     name: 'Team_pk',
                     unique: true,

package/dist/cjs/src/data/transformers/court-position.d.ts

@@ -1,5 +1,5 @@
 import { CourtPosition } from '../../service';
-import { CourtPositionType } from '../models';
+import { CourtPositionType } from './match-set';
 declare function transformToType(position: CourtPosition): CourtPositionType;
 declare function transformFromType(position: CourtPositionType): CourtPosition;
 export { transformToType as transformFromCourtPosition, transformFromType as transformToCourtPosition };

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

@@ -15,7 +15,6 @@ export * from './box-score';
 export * from './performance-stats';
 export * from './player';
 export * from './rally';
-export * from './set-position';
 export * from './season';
 export * from './season-match';
 export * from './player-team';

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

@@ -31,7 +31,6 @@ __exportStar(require("./box-score"), exports);
 __exportStar(require("./performance-stats"), exports);
 __exportStar(require("./player"), exports);
 __exportStar(require("./rally"), exports);
-__exportStar(require("./set-position"), exports);
 __exportStar(require("./season"), exports);
 __exportStar(require("./season-match"), exports);
 __exportStar(require("./player-team"), exports);

package/dist/cjs/src/data/transformers/match-set.d.ts

@@ -1,5 +1,12 @@
 import { MatchSetAttributes, MatchSetModel } from '../models';
 import { MatchSet } from '../../service';
+export type CourtPositionType = 'NOT_IN_COURT' | 'LIBERO_ZONE' | 'LEFT_FRONT' | 'MIDDLE_FRONT' | 'RIGHT_FRONT' | 'LEFT_BACK' | 'MIDDLE_BACK' | 'RIGHT_BACK';
+export type Side = 'HOME' | 'AWAY';
+export interface PlayerPositionAttributes {
+    player_id: string;
+    side: Side;
+    court_position: CourtPositionType;
+}
 declare function transformToAttributes(set: MatchSet, matchId: string): MatchSetAttributes;
 declare function transformToObject(model: MatchSetModel): MatchSet;
 export { transformToObject as transformToMatchSet, transformToAttributes as transformFromMatchSet };

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

@@ -3,9 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformFromMatchSet = exports.transformToMatchSet = void 0;
 const service_1 = require("../../service");
 const _1 = require(".");
+function fromPosition(playerPosition, side) {
+    return {
+        side,
+        court_position: (0, _1.transformFromCourtPosition)(playerPosition.position),
+        player_id: playerPosition.playerId
+    };
+}
+function toPosition(model) {
+    return {
+        playerId: model.player_id,
+        position: (0, _1.transformToCourtPosition)(model.court_position)
+    };
+}
 function transformToAttributes(set, matchId) {
-    const homeSetPositions = set.homePlayerPosition.map(position => (0, _1.transformFromPlayerPosition)(position, 'HOME', set.id));
-    const awaySetPositions = set.awayPlayerPosition.map(position => (0, _1.transformFromPlayerPosition)(position, 'AWAY', set.id));
+    const homeSetPositions = set.homePlayerPosition.map(position => (fromPosition(position, 'HOME')));
+    const awaySetPositions = set.awayPlayerPosition.map(position => fromPosition(position, 'AWAY'));
     return {
         match_set_id: set.id,
         match_id: matchId,
@@ -13,15 +26,16 @@ function transformToAttributes(set, matchId) {
         is_tie_break: set.isTieBreak,
         home_score: set.homeScore,
         away_score: set.awayScore,
-        SetPositions: [...homeSetPositions, ...awaySetPositions],
+        player_positions: [...homeSetPositions, ...awaySetPositions],
         BoxScores: (set.boxScores ?? []).map(_1.transformFromBoxScore),
         Rallies: (set.rallies ?? []).map((rally) => (0, _1.transformFromRally)(rally, set.id))
     };
 }
 exports.transformFromMatchSet = transformToAttributes;
 function transformToObject(model) {
-    const homePlayerPosition = (model.SetPositions ?? []).filter((p) => p.side === 'HOME').map(_1.transformToPlayerPosition);
-    const awayPlayerPosition = (model.SetPositions ?? []).filter((p) => p.side === 'AWAY').map(_1.transformToPlayerPosition);
+    const playerPositions = model.player_positions ?? [];
+    const homePlayerPosition = playerPositions.filter((p) => p.side === 'HOME').map(toPosition);
+    const awayPlayerPosition = playerPositions.filter((p) => p.side === 'AWAY').map(toPosition);
     const rallies = (model.Rallies ?? []).map(_1.transformToRally).sort((r1, r2) => r1.order - r2.order);
     return new service_1.MatchSet({
         id: model.match_set_id,

package/dist/cjs/src/service/player/rarity.d.ts

@@ -1,4 +1,3 @@
-import { EnumDataType } from 'sequelize';
 export declare enum RarityEnum {
     COMMON = "COMMON",
     RARE = "RARE",
@@ -14,4 +13,3 @@ export declare const RarityRanges: {
     MYTHIC: number[];
     SPECIAL: number[];
 };
-export declare const RarityDataType: EnumDataType<RarityEnum>;

package/dist/cjs/src/service/player/rarity.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RarityDataType = exports.RarityRanges = exports.RarityEnum = void 0;
-const sequelize_1 = require("sequelize");
+exports.RarityRanges = exports.RarityEnum = void 0;
 var RarityEnum;
 (function (RarityEnum) {
     RarityEnum["COMMON"] = "COMMON";
@@ -17,7 +16,3 @@ exports.RarityRanges = {
     [RarityEnum.MYTHIC]: [86, 98],
     [RarityEnum.SPECIAL]: [99, 100]
 };
-exports.RarityDataType = sequelize_1.DataTypes.ENUM({
-    values: Object.values(RarityEnum),
-    name: 'rarity'
-});

package/dist/cjs/src/service/player/role.d.ts

@@ -1,4 +1,3 @@
-import { EnumDataType } from 'sequelize';
 import { PerformanceStats, PerformanceStatsParams } from './performance-stats';
 export declare enum RoleEnum {
     SETTER = "SETTER",
@@ -8,7 +7,6 @@ export declare enum RoleEnum {
     MIDDLE_BLOCKER = "MIDDLE_BLOCKER"
 }
 export type Role = RoleEnum.SETTER | RoleEnum.LIBERO | RoleEnum.MIDDLE_BLOCKER | RoleEnum.OUTSIDE_HITTER | RoleEnum.OPPOSITE_HITTER;
-export declare const RoleDataType: EnumDataType<Role>;
 export interface RolesFormula {
     role: Role;
     weight: PerformanceStatsParams;

package/dist/cjs/src/service/player/role.js

@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assignRoles = exports.calculateRoleScore = exports.RoleDataType = exports.RoleEnum = void 0;
-const sequelize_1 = require("sequelize");
+exports.assignRoles = exports.calculateRoleScore = exports.RoleEnum = void 0;
 const roles_json_1 = __importDefault(require("../../stat-config/roles.json"));
 var RoleEnum;
 (function (RoleEnum) {
@@ -14,10 +13,6 @@ var RoleEnum;
     RoleEnum["OPPOSITE_HITTER"] = "OPPOSITE_HITTER";
     RoleEnum["MIDDLE_BLOCKER"] = "MIDDLE_BLOCKER";
 })(RoleEnum = exports.RoleEnum || (exports.RoleEnum = {}));
-exports.RoleDataType = sequelize_1.DataTypes.ENUM({
-    values: Object.values(RoleEnum),
-    name: 'role'
-});
 const rolesFormula = roles_json_1.default;
 function calculateRoleScore(stats, role) {
     const weights = rolesFormula.find(r => r.role === role);

package/dist/cjs/src/service/player/trait.d.ts

@@ -1,5 +1,4 @@
 import { Rarity } from './rarity';
-import { EnumDataType } from 'sequelize';
 import { Role } from './role';
 interface TraitProps {
     readonly name: Trait;
@@ -47,7 +46,6 @@ export declare enum TraitEnum {
     DEFENSIVE_SPECIALIST = "DEFENSIVE_SPECIALIST"
 }
 export type Trait = TraitEnum.FLOAT_SERVE | TraitEnum.SURPRISE_ATTACK | TraitEnum.GUARDIAN | TraitEnum.MASTER_MIND | TraitEnum.MOVING_WALL | TraitEnum.MARKSMAN | TraitEnum.METEOR_SERVE | TraitEnum.VIGOROUS | TraitEnum.DEFENSIVE_SPECIALIST;
-export declare const TraitDataType: EnumDataType<Trait>;
 export declare function assignTraits(roles: Role[], rarity: Rarity): Trait[];
 export declare const traitMap: Map<Trait, TraitProps>;
 export {};

package/dist/cjs/src/service/player/trait.js

@@ -3,11 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.traitMap = exports.assignTraits = exports.TraitDataType = exports.TraitEnum = void 0;
+exports.traitMap = exports.assignTraits = exports.TraitEnum = void 0;
 const rarity_1 = require("./rarity");
 const node_crypto_1 = require("node:crypto");
 const traits_json_1 = __importDefault(require("../../stat-config/traits.json"));
-const sequelize_1 = require("sequelize");
 const utils_1 = require("../utils");
 const traits = traits_json_1.default;
 var TraitEnum;
@@ -50,10 +49,6 @@ var TraitEnum;
      */
     TraitEnum["DEFENSIVE_SPECIALIST"] = "DEFENSIVE_SPECIALIST";
 })(TraitEnum = exports.TraitEnum || (exports.TraitEnum = {}));
-exports.TraitDataType = sequelize_1.DataTypes.ENUM({
-    values: Object.values(TraitEnum),
-    name: 'trait'
-});
 function assignTraits(roles, rarity) {
     let traitCount;
     switch (rarity) {

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

@@ -1,4 +1,4 @@
-import { BoxScoreModel, CompetitionChampionModel, CompetitionMatchModel, CompetitionModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, DraftModel, DraftPickModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerTeamModel, RallyModel, SetPositionModel, TacticsModel, TeamModel, UserModel } from './models';
+import { BoxScoreModel, CompetitionChampionModel, CompetitionMatchModel, CompetitionModel, CompetitionTeamsModel, CountryModel, DivisionModel, DivisionSeasonModel, DraftModel, DraftPickModel, IterationModel, LeagueModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, PerformanceStatsModel, PlayerModel, PlayerTeamModel, RallyModel, TacticsModel, TeamModel, UserModel } from './models';
 export function initModels(sequelize) {
     const Tactics = TacticsModel.initModel(sequelize);
     const Country = CountryModel.initModel(sequelize);
@@ -21,7 +21,6 @@ export function initModels(sequelize) {
     const Player = PlayerModel.initModel(sequelize);
     const PlayerTeam = PlayerTeamModel.initModel(sequelize);
     const Rally = RallyModel.initModel(sequelize);
-    const SetPosition = SetPositionModel.initModel(sequelize);
     const Team = TeamModel.initModel(sequelize);
     const User = UserModel.initModel(sequelize);
     Tactics.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
@@ -75,12 +74,6 @@ export function initModels(sequelize) {
     MatchRating.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
     MatchRating.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     MatchSet.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
-    MatchSet.belongsToMany(Player, {
-        as: 'SetPositionsPlayer',
-        through: SetPosition,
-        foreignKey: 'match_set_id',
-        otherKey: 'player_id'
-    });
     MatchSet.belongsToMany(Player, {
         as: 'BoxScorePlayers',
         through: BoxScore,
@@ -89,17 +82,10 @@ export function initModels(sequelize) {
     });
     MatchSet.hasMany(BoxScore, { as: 'BoxScores', foreignKey: 'match_set_id' });
     MatchSet.hasMany(Rally, { as: 'Rallies', foreignKey: 'match_set_id' });
-    MatchSet.hasMany(SetPosition, { as: 'SetPositions', foreignKey: 'match_set_id' });
     BoxScore.belongsTo(MatchSet, { as: 'MatchSet', foreignKey: 'match_set_id' });
     BoxScore.belongsTo(Player, { as: 'Player', foreignKey: 'player_id' });
     PerformanceStats.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Player.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
-    Player.belongsToMany(MatchSet, {
-        as: 'SetPositionSets',
-        through: SetPosition,
-        foreignKey: 'player_id',
-        otherKey: 'match_set_id'
-    });
     Player.belongsToMany(MatchSet, {
         as: 'BoxScoreMatchSets',
         through: BoxScore,
@@ -114,15 +100,12 @@ export function initModels(sequelize) {
     });
     Player.hasMany(BoxScore, { as: 'BoxScores', foreignKey: 'player_id' });
     Player.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'player_id' });
-    Player.hasMany(SetPosition, { as: 'SetPositions', foreignKey: 'player_id' });
     Player.hasOne(DraftPick, { as: 'DraftPick', foreignKey: 'player_id' });
     Player.hasOne(PerformanceStats, { as: 'PerformanceStat', foreignKey: 'player_id' });
     PlayerTeam.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     PlayerTeam.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Rally.belongsTo(MatchSet, { as: 'matchSet', foreignKey: 'match_set_id' });
     Rally.belongsTo(Team, { as: 'ServingTeam', foreignKey: 'serving_team' });
-    SetPosition.belongsTo(MatchSet, { as: 'matchSet', foreignKey: 'match_set_id' });
-    SetPosition.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Team.hasOne(Tactics, { as: 'tactics', foreignKey: 'team_id' });
     Team.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Team.belongsToMany(Competition, {
@@ -173,7 +156,6 @@ export function initModels(sequelize) {
         Player,
         PlayerTeam,
         Rally,
-        SetPosition,
         Team,
         Tactics,
         User

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

@@ -18,7 +18,6 @@ export * from './performance-stats';
 export * from './player';
 export * from './player-team';
 export * from './rally';
-export * from './set-position';
 export * from './team';
 export * from './user';
 export * from './tactics';

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

@@ -18,7 +18,6 @@ export * from './performance-stats';
 export * from './player';
 export * from './player-team';
 export * from './rally';
-export * from './set-position';
 export * from './team';
 export * from './user';
 export * from './tactics';

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

@@ -1,4 +1,5 @@
 import { DataTypes, Model } from 'sequelize';
+import { CountryModel } from '.';
 export class LeagueModel extends Model {
     static initModel(sequelize) {
         return LeagueModel.init({
@@ -24,6 +25,11 @@ export class LeagueModel extends Model {
             tableName: 'League',
             schema: 'public',
             timestamps: false,
+            defaultScope: {
+                include: [
+                    { model: CountryModel, as: 'country' }
+                ]
+            },
             indexes: [{
                     name: 'League_pk',
                     unique: true,

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

@@ -1,6 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, MatchId, MatchModel, PlayerId, PlayerModel, RallyAttributes, RallyId, RallyModel, SetPositionAttributes, SetPositionId, SetPositionModel } from '.';
+import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, MatchId, MatchModel, PlayerId, PlayerModel, RallyAttributes, RallyId, RallyModel } from '.';
+import { PlayerPositionAttributes } from '../transformers';
 export interface MatchSetAttributes {
     match_set_id: string;
     match_id: string;
@@ -8,7 +9,7 @@ export interface MatchSetAttributes {
     order: number;
     home_score: number;
     away_score: number;
-    SetPositions?: SetPositionAttributes[];
+    player_positions: PlayerPositionAttributes[];
     Rallies?: RallyAttributes[];
     BoxScores?: BoxScoreAttributes[];
 }
@@ -22,6 +23,7 @@ export declare class MatchSetModel extends Model<MatchSetAttributes, MatchSetCre
     order: number;
     home_score: number;
     away_score: number;
+    player_positions: PlayerPositionAttributes[];
     match: MatchModel;
     getMatch: Sequelize.BelongsToGetAssociationMixin<MatchModel>;
     setMatch: Sequelize.BelongsToSetAssociationMixin<MatchModel, MatchId>;
@@ -48,17 +50,6 @@ export declare class MatchSetModel extends Model<MatchSetAttributes, MatchSetCre
     hasSetStatsPlayer: Sequelize.BelongsToManyHasAssociationMixin<PlayerModel, PlayerId>;
     hasSetStatsPlayers: Sequelize.BelongsToManyHasAssociationsMixin<PlayerModel, PlayerId>;
     countSetStatsPlayers: Sequelize.BelongsToManyCountAssociationsMixin;
-    SetPositionPlayers: PlayerModel[];
-    getSetPositionPlayers: Sequelize.BelongsToManyGetAssociationsMixin<PlayerModel>;
-    setSetPositionPlayers: Sequelize.BelongsToManySetAssociationsMixin<PlayerModel, PlayerId>;
-    addSetPositionPlayer: Sequelize.BelongsToManyAddAssociationMixin<PlayerModel, PlayerId>;
-    addSetPositionPlayers: Sequelize.BelongsToManyAddAssociationsMixin<PlayerModel, PlayerId>;
-    createSetPositionPlayer: Sequelize.BelongsToManyCreateAssociationMixin<PlayerModel>;
-    removeSetPositionPlayer: Sequelize.BelongsToManyRemoveAssociationMixin<PlayerModel, PlayerId>;
-    removeSetPositionPlayers: Sequelize.BelongsToManyRemoveAssociationsMixin<PlayerModel, PlayerId>;
-    hasSetPositionPlayer: Sequelize.BelongsToManyHasAssociationMixin<PlayerModel, PlayerId>;
-    hasSetPositionPlayers: Sequelize.BelongsToManyHasAssociationsMixin<PlayerModel, PlayerId>;
-    countSetPositionPlayers: Sequelize.BelongsToManyCountAssociationsMixin;
     Rallies: RallyModel[];
     getRallies: Sequelize.HasManyGetAssociationsMixin<RallyModel>;
     setRallies: Sequelize.HasManySetAssociationsMixin<RallyModel, RallyId>;
@@ -70,16 +61,5 @@ export declare class MatchSetModel extends Model<MatchSetAttributes, MatchSetCre
     hasRally: Sequelize.HasManyHasAssociationMixin<RallyModel, RallyId>;
     hasRallies: Sequelize.HasManyHasAssociationsMixin<RallyModel, RallyId>;
     countRallies: Sequelize.HasManyCountAssociationsMixin;
-    SetPositions: SetPositionModel[];
-    getSetPositions: Sequelize.HasManyGetAssociationsMixin<SetPositionModel>;
-    setSetPositions: Sequelize.HasManySetAssociationsMixin<SetPositionModel, SetPositionId>;
-    addSetPosition: Sequelize.HasManyAddAssociationMixin<SetPositionModel, SetPositionId>;
-    addSetPositions: Sequelize.HasManyAddAssociationsMixin<SetPositionModel, SetPositionId>;
-    createSetPosition: Sequelize.HasManyCreateAssociationMixin<SetPositionModel>;
-    removeSetPosition: Sequelize.HasManyRemoveAssociationMixin<SetPositionModel, SetPositionId>;
-    removeSetPositions: Sequelize.HasManyRemoveAssociationsMixin<SetPositionModel, SetPositionId>;
-    hasSetPosition: Sequelize.HasManyHasAssociationMixin<SetPositionModel, SetPositionId>;
-    hasSetPositions: Sequelize.HasManyHasAssociationsMixin<SetPositionModel, SetPositionId>;
-    countSetPositions: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof MatchSetModel;
 }

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

@@ -31,6 +31,11 @@ export class MatchSetModel extends Model {
             away_score: {
                 type: DataTypes.INTEGER,
                 allowNull: false
+            },
+            player_positions: {
+                type: DataTypes.JSONB,
+                allowNull: false,
+                defaultValue: []
             }
         }, {
             sequelize,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, CountryId, CountryModel, DraftPickId, DraftPickModel, MatchSetId, MatchSetModel, PerformanceStatsAttributes, PerformanceStatsId, PerformanceStatsModel, PlayerTeamId, PlayerTeamModel, SetPositionId, SetPositionModel, TeamId, TeamModel } from '.';
+import { BoxScoreAttributes, BoxScoreId, BoxScoreModel, CountryId, CountryModel, DraftPickId, DraftPickModel, MatchSetId, MatchSetModel, PerformanceStatsAttributes, PerformanceStatsId, PerformanceStatsModel, PlayerTeamId, PlayerTeamModel, TeamId, TeamModel } from '.';
 import { Rarity, Role, Trait } from '../../service';
 export interface PlayerAttributes {
     player_id: string;
@@ -43,17 +43,6 @@ export declare class PlayerModel extends Model<PlayerAttributes, PlayerCreationA
     hasStatsMatchSet: Sequelize.BelongsToManyHasAssociationMixin<MatchSetModel, MatchSetId>;
     hasStatsMatchSets: Sequelize.BelongsToManyHasAssociationsMixin<MatchSetModel, MatchSetId>;
     countStatsMatchSets: Sequelize.BelongsToManyCountAssociationsMixin;
-    SetPositionSets: MatchSetModel[];
-    getSetPositionSets: Sequelize.BelongsToManyGetAssociationsMixin<MatchSetModel>;
-    setSetPositionSets: Sequelize.BelongsToManySetAssociationsMixin<MatchSetModel, MatchSetId>;
-    addSetPositionSet: Sequelize.BelongsToManyAddAssociationMixin<MatchSetModel, MatchSetId>;
-    addSetPositionSets: Sequelize.BelongsToManyAddAssociationsMixin<MatchSetModel, MatchSetId>;
-    createSetPositionSet: Sequelize.BelongsToManyCreateAssociationMixin<MatchSetModel>;
-    removeSetPositionSet: Sequelize.BelongsToManyRemoveAssociationMixin<MatchSetModel, MatchSetId>;
-    removeSetPositionSets: Sequelize.BelongsToManyRemoveAssociationsMixin<MatchSetModel, MatchSetId>;
-    hasSetPositionSet: Sequelize.BelongsToManyHasAssociationMixin<MatchSetModel, MatchSetId>;
-    hasSetPositionSets: Sequelize.BelongsToManyHasAssociationsMixin<MatchSetModel, MatchSetId>;
-    countSetPositionSets: Sequelize.BelongsToManyCountAssociationsMixin;
     BoxScores: BoxScoreModel[];
     getBoxScores: Sequelize.HasManyGetAssociationsMixin<BoxScoreModel>;
     setBoxScores: Sequelize.HasManySetAssociationsMixin<BoxScoreModel, BoxScoreId>;
@@ -80,17 +69,6 @@ export declare class PlayerModel extends Model<PlayerAttributes, PlayerCreationA
     hasPlayerTeam: Sequelize.HasManyHasAssociationMixin<PlayerTeamModel, PlayerTeamId>;
     hasPlayerTeams: Sequelize.HasManyHasAssociationsMixin<PlayerTeamModel, PlayerTeamId>;
     countPlayerTeams: Sequelize.HasManyCountAssociationsMixin;
-    SetPositions: SetPositionModel[];
-    getSetPositions: Sequelize.HasManyGetAssociationsMixin<SetPositionModel>;
-    setSetPositions: Sequelize.HasManySetAssociationsMixin<SetPositionModel, SetPositionId>;
-    addSetPosition: Sequelize.HasManyAddAssociationMixin<SetPositionModel, SetPositionId>;
-    addSetPositions: Sequelize.HasManyAddAssociationsMixin<SetPositionModel, SetPositionId>;
-    createSetPosition: Sequelize.HasManyCreateAssociationMixin<SetPositionModel>;
-    removeSetPosition: Sequelize.HasManyRemoveAssociationMixin<SetPositionModel, SetPositionId>;
-    removeSetPositions: Sequelize.HasManyRemoveAssociationsMixin<SetPositionModel, SetPositionId>;
-    hasSetPosition: Sequelize.HasManyHasAssociationMixin<SetPositionModel, SetPositionId>;
-    hasSetPositions: Sequelize.HasManyHasAssociationsMixin<SetPositionModel, SetPositionId>;
-    countSetPositions: Sequelize.HasManyCountAssociationsMixin;
     Teams: TeamModel[];
     getTeams: Sequelize.BelongsToManyGetAssociationsMixin<TeamModel>;
     setTeams: Sequelize.BelongsToManySetAssociationsMixin<TeamModel, TeamId>;

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

@@ -1,5 +1,6 @@
 import { DataTypes, Model } from 'sequelize';
-import { RarityDataType, RoleDataType, TraitDataType } from '../../service';
+import { CountryModel, PerformanceStatsModel } from '.';
+import { RarityEnum, RoleEnum, TraitEnum } from '../../service';
 export class PlayerModel extends Model {
     static initModel(sequelize) {
         return PlayerModel.init({
@@ -9,15 +10,15 @@ export class PlayerModel extends Model {
                 primaryKey: true
             },
             roles: {
-                type: DataTypes.ARRAY(RoleDataType),
+                type: DataTypes.ARRAY(DataTypes.ENUM(...Object.values(RoleEnum))),
                 allowNull: false
             },
             traits: {
-                type: DataTypes.ARRAY(TraitDataType),
+                type: DataTypes.ARRAY(DataTypes.ENUM(...Object.values(TraitEnum))),
                 allowNull: false
             },
             rarity: {
-                type: RarityDataType,
+                type: DataTypes.ENUM(...Object.values(RarityEnum)),
                 allowNull: false
             },
             first_name: {
@@ -41,6 +42,12 @@ export class PlayerModel extends Model {
             tableName: 'Player',
             schema: 'public',
             timestamps: false,
+            defaultScope: {
+                include: [
+                    { model: CountryModel, as: 'country' },
+                    { model: PerformanceStatsModel, as: 'PerformanceStat' }
+                ]
+            },
             indexes: [{
                     name: 'Player_pk',
                     unique: true,

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

@@ -1,4 +1,5 @@
 import { DataTypes, Model } from 'sequelize';
+import { TacticsModel, CountryModel } from '.';
 export class TeamModel extends Model {
     static initModel(sequelize) {
         return TeamModel.init({
@@ -41,6 +42,12 @@ export class TeamModel extends Model {
             tableName: 'Team',
             schema: 'public',
             timestamps: false,
+            defaultScope: {
+                include: [
+                    { model: CountryModel, as: 'country' },
+                    { model: TacticsModel, as: 'tactics' }
+                ]
+            },
             indexes: [{
                     name: 'Team_pk',
                     unique: true,

package/dist/esm/src/data/transformers/court-position.d.ts

@@ -1,5 +1,5 @@
 import { CourtPosition } from '../../service';
-import { CourtPositionType } from '../models';
+import { CourtPositionType } from './match-set';
 declare function transformToType(position: CourtPosition): CourtPositionType;
 declare function transformFromType(position: CourtPositionType): CourtPosition;
 export { transformToType as transformFromCourtPosition, transformFromType as transformToCourtPosition };

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

@@ -15,7 +15,6 @@ export * from './box-score';
 export * from './performance-stats';
 export * from './player';
 export * from './rally';
-export * from './set-position';
 export * from './season';
 export * from './season-match';
 export * from './player-team';

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

@@ -15,7 +15,6 @@ export * from './box-score';
 export * from './performance-stats';
 export * from './player';
 export * from './rally';
-export * from './set-position';
 export * from './season';
 export * from './season-match';
 export * from './player-team';

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

@@ -1,5 +1,12 @@
 import { MatchSetAttributes, MatchSetModel } from '../models';
 import { MatchSet } from '../../service';
+export type CourtPositionType = 'NOT_IN_COURT' | 'LIBERO_ZONE' | 'LEFT_FRONT' | 'MIDDLE_FRONT' | 'RIGHT_FRONT' | 'LEFT_BACK' | 'MIDDLE_BACK' | 'RIGHT_BACK';
+export type Side = 'HOME' | 'AWAY';
+export interface PlayerPositionAttributes {
+    player_id: string;
+    side: Side;
+    court_position: CourtPositionType;
+}
 declare function transformToAttributes(set: MatchSet, matchId: string): MatchSetAttributes;
 declare function transformToObject(model: MatchSetModel): MatchSet;
 export { transformToObject as transformToMatchSet, transformToAttributes as transformFromMatchSet };

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

@@ -1,8 +1,21 @@
 import { MatchSet } from '../../service';
-import { transformFromBoxScore, transformFromPlayerPosition as fromPosition, transformFromRally, transformToBoxScore, transformToPlayerPosition as toPosition, transformToRally } from '.';
+import { transformFromBoxScore, transformFromCourtPosition, transformFromRally, transformToBoxScore, transformToCourtPosition, transformToRally } from '.';
+function fromPosition(playerPosition, side) {
+    return {
+        side,
+        court_position: transformFromCourtPosition(playerPosition.position),
+        player_id: playerPosition.playerId
+    };
+}
+function toPosition(model) {
+    return {
+        playerId: model.player_id,
+        position: transformToCourtPosition(model.court_position)
+    };
+}
 function transformToAttributes(set, matchId) {
-    const homeSetPositions = set.homePlayerPosition.map(position => fromPosition(position, 'HOME', set.id));
-    const awaySetPositions = set.awayPlayerPosition.map(position => fromPosition(position, 'AWAY', set.id));
+    const homeSetPositions = set.homePlayerPosition.map(position => (fromPosition(position, 'HOME')));
+    const awaySetPositions = set.awayPlayerPosition.map(position => fromPosition(position, 'AWAY'));
     return {
         match_set_id: set.id,
         match_id: matchId,
@@ -10,14 +23,15 @@ function transformToAttributes(set, matchId) {
         is_tie_break: set.isTieBreak,
         home_score: set.homeScore,
         away_score: set.awayScore,
-        SetPositions: [...homeSetPositions, ...awaySetPositions],
+        player_positions: [...homeSetPositions, ...awaySetPositions],
         BoxScores: (set.boxScores ?? []).map(transformFromBoxScore),
         Rallies: (set.rallies ?? []).map((rally) => transformFromRally(rally, set.id))
     };
 }
 function transformToObject(model) {
-    const homePlayerPosition = (model.SetPositions ?? []).filter((p) => p.side === 'HOME').map(toPosition);
-    const awayPlayerPosition = (model.SetPositions ?? []).filter((p) => p.side === 'AWAY').map(toPosition);
+    const playerPositions = model.player_positions ?? [];
+    const homePlayerPosition = playerPositions.filter((p) => p.side === 'HOME').map(toPosition);
+    const awayPlayerPosition = playerPositions.filter((p) => p.side === 'AWAY').map(toPosition);
     const rallies = (model.Rallies ?? []).map(transformToRally).sort((r1, r2) => r1.order - r2.order);
     return new MatchSet({
         id: model.match_set_id,

package/dist/esm/src/service/player/rarity.d.ts

@@ -1,4 +1,3 @@
-import { EnumDataType } from 'sequelize';
 export declare enum RarityEnum {
     COMMON = "COMMON",
     RARE = "RARE",
@@ -14,4 +13,3 @@ export declare const RarityRanges: {
     MYTHIC: number[];
     SPECIAL: number[];
 };
-export declare const RarityDataType: EnumDataType<RarityEnum>;

package/dist/esm/src/service/player/rarity.js

@@ -1,4 +1,3 @@
-import { DataTypes } from 'sequelize';
 export var RarityEnum;
 (function (RarityEnum) {
     RarityEnum["COMMON"] = "COMMON";
@@ -14,7 +13,3 @@ export const RarityRanges = {
     [RarityEnum.MYTHIC]: [86, 98],
     [RarityEnum.SPECIAL]: [99, 100]
 };
-export const RarityDataType = DataTypes.ENUM({
-    values: Object.values(RarityEnum),
-    name: 'rarity'
-});

package/dist/esm/src/service/player/role.d.ts

@@ -1,4 +1,3 @@
-import { EnumDataType } from 'sequelize';
 import { PerformanceStats, PerformanceStatsParams } from './performance-stats';
 export declare enum RoleEnum {
     SETTER = "SETTER",
@@ -8,7 +7,6 @@ export declare enum RoleEnum {
     MIDDLE_BLOCKER = "MIDDLE_BLOCKER"
 }
 export type Role = RoleEnum.SETTER | RoleEnum.LIBERO | RoleEnum.MIDDLE_BLOCKER | RoleEnum.OUTSIDE_HITTER | RoleEnum.OPPOSITE_HITTER;
-export declare const RoleDataType: EnumDataType<Role>;
 export interface RolesFormula {
     role: Role;
     weight: PerformanceStatsParams;

package/dist/esm/src/service/player/role.js

@@ -1,4 +1,3 @@
-import { DataTypes } from 'sequelize';
 import roles from '../../stat-config/roles.json';
 export var RoleEnum;
 (function (RoleEnum) {
@@ -8,10 +7,6 @@ export var RoleEnum;
     RoleEnum["OPPOSITE_HITTER"] = "OPPOSITE_HITTER";
     RoleEnum["MIDDLE_BLOCKER"] = "MIDDLE_BLOCKER";
 })(RoleEnum || (RoleEnum = {}));
-export const RoleDataType = DataTypes.ENUM({
-    values: Object.values(RoleEnum),
-    name: 'role'
-});
 const rolesFormula = roles;
 export function calculateRoleScore(stats, role) {
     const weights = rolesFormula.find(r => r.role === role);

package/dist/esm/src/service/player/trait.d.ts

@@ -1,5 +1,4 @@
 import { Rarity } from './rarity';
-import { EnumDataType } from 'sequelize';
 import { Role } from './role';
 interface TraitProps {
     readonly name: Trait;
@@ -47,7 +46,6 @@ export declare enum TraitEnum {
     DEFENSIVE_SPECIALIST = "DEFENSIVE_SPECIALIST"
 }
 export type Trait = TraitEnum.FLOAT_SERVE | TraitEnum.SURPRISE_ATTACK | TraitEnum.GUARDIAN | TraitEnum.MASTER_MIND | TraitEnum.MOVING_WALL | TraitEnum.MARKSMAN | TraitEnum.METEOR_SERVE | TraitEnum.VIGOROUS | TraitEnum.DEFENSIVE_SPECIALIST;
-export declare const TraitDataType: EnumDataType<Trait>;
 export declare function assignTraits(roles: Role[], rarity: Rarity): Trait[];
 export declare const traitMap: Map<Trait, TraitProps>;
 export {};

package/dist/esm/src/service/player/trait.js

@@ -1,7 +1,6 @@
 import { RarityEnum } from './rarity';
 import { randomInt } from 'node:crypto';
 import rawTraits from '../../stat-config/traits.json';
-import { DataTypes } from 'sequelize';
 import { shuffle } from '../utils';
 const traits = rawTraits;
 export var TraitEnum;
@@ -44,10 +43,6 @@ export var TraitEnum;
      */
     TraitEnum["DEFENSIVE_SPECIALIST"] = "DEFENSIVE_SPECIALIST";
 })(TraitEnum || (TraitEnum = {}));
-export const TraitDataType = DataTypes.ENUM({
-    values: Object.values(TraitEnum),
-    name: 'trait'
-});
 export function assignTraits(roles, rarity) {
     let traitCount;
     switch (rarity) {

package/package.json

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

package/dist/cjs/src/data/models/set-position.d.ts

@@ -1,29 +0,0 @@
-import * as Sequelize from 'sequelize';
-import { Model } from 'sequelize';
-import { MatchSetId, MatchSetModel, PlayerId, PlayerModel } from '.';
-export interface SetPositionAttributes {
-    player_id: string;
-    match_set_id: string;
-    side: Side;
-    court_position: CourtPositionType;
-}
-export type CourtPositionType = 'NOT_IN_COURT' | 'LIBERO_ZONE' | 'LEFT_FRONT' | 'MIDDLE_FRONT' | 'RIGHT_FRONT' | 'LEFT_BACK' | 'MIDDLE_BACK' | 'RIGHT_BACK';
-export type Side = 'HOME' | 'AWAY';
-export type SetPositionPk = 'player_id' | 'match_set_id';
-export type SetPositionId = SetPositionModel[SetPositionPk];
-export type SetPositionCreationAttributes = SetPositionAttributes;
-export declare class SetPositionModel extends Model<SetPositionAttributes, SetPositionCreationAttributes> implements SetPositionAttributes {
-    player_id: string;
-    match_set_id: string;
-    side: Side;
-    court_position: CourtPositionType;
-    matchSet: MatchSetModel;
-    getMatchSet: Sequelize.BelongsToGetAssociationMixin<MatchSetModel>;
-    setMatchSet: Sequelize.BelongsToSetAssociationMixin<MatchSetModel, MatchSetId>;
-    createMatchSet: Sequelize.BelongsToCreateAssociationMixin<MatchSetModel>;
-    player: PlayerModel;
-    getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
-    setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
-    createPlayer: Sequelize.BelongsToCreateAssociationMixin<PlayerModel>;
-    static initModel(sequelize: Sequelize.Sequelize): typeof SetPositionModel;
-}

package/dist/cjs/src/data/models/set-position.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetPositionModel = void 0;
-const sequelize_1 = require("sequelize");
-class SetPositionModel extends sequelize_1.Model {
-    static initModel(sequelize) {
-        return SetPositionModel.init({
-            player_id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                primaryKey: true,
-                references: {
-                    model: 'Player',
-                    key: 'player_id'
-                }
-            },
-            match_set_id: {
-                type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                primaryKey: true,
-                references: {
-                    model: 'MatchSet',
-                    key: 'match_set_id'
-                }
-            },
-            side: {
-                type: sequelize_1.DataTypes.ENUM('AWAY', 'HOME'),
-                allowNull: false
-            },
-            court_position: {
-                type: sequelize_1.DataTypes.ENUM('LEFT_BACK', 'LEFT_FRONT', 'LIBERO_ZONE', 'MIDDLE_BACK', 'MIDDLE_FRONT', 'NOT_IN_COURT', 'RIGHT_BACK', 'RIGHT_FRONT'),
-                allowNull: false
-            }
-        }, {
-            sequelize,
-            tableName: 'SetPosition',
-            schema: 'public',
-            timestamps: false,
-            indexes: [{
-                    name: 'RallyPosition_pk',
-                    unique: true,
-                    fields: [
-                        { name: 'match_set_id' },
-                        { name: 'player_id' }
-                    ]
-                }]
-        });
-    }
-}
-exports.SetPositionModel = SetPositionModel;

package/dist/cjs/src/data/transformers/set-position.d.ts

@@ -1,5 +0,0 @@
-import { PlayerPosition } from '../../service';
-import { SetPositionAttributes, SetPositionModel, Side } from '../models';
-declare function transformToAttributes(playerPosition: PlayerPosition, side: Side, setId: string): SetPositionAttributes;
-declare function transformToObject(model: SetPositionModel): PlayerPosition;
-export { transformToObject as transformToPlayerPosition, transformToAttributes as transformFromPlayerPosition };

package/dist/cjs/src/data/transformers/set-position.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformFromPlayerPosition = exports.transformToPlayerPosition = void 0;
-const _1 = require(".");
-function transformToAttributes(playerPosition, side, setId) {
-    return {
-        match_set_id: setId,
-        side,
-        court_position: (0, _1.transformFromCourtPosition)(playerPosition.position),
-        player_id: playerPosition.playerId
-    };
-}
-exports.transformFromPlayerPosition = transformToAttributes;
-function transformToObject(model) {
-    return {
-        playerId: model.player_id,
-        position: (0, _1.transformToCourtPosition)(model.court_position)
-    };
-}
-exports.transformToPlayerPosition = transformToObject;

package/dist/esm/src/data/models/set-position.d.ts

@@ -1,29 +0,0 @@
-import * as Sequelize from 'sequelize';
-import { Model } from 'sequelize';
-import { MatchSetId, MatchSetModel, PlayerId, PlayerModel } from '.';
-export interface SetPositionAttributes {
-    player_id: string;
-    match_set_id: string;
-    side: Side;
-    court_position: CourtPositionType;
-}
-export type CourtPositionType = 'NOT_IN_COURT' | 'LIBERO_ZONE' | 'LEFT_FRONT' | 'MIDDLE_FRONT' | 'RIGHT_FRONT' | 'LEFT_BACK' | 'MIDDLE_BACK' | 'RIGHT_BACK';
-export type Side = 'HOME' | 'AWAY';
-export type SetPositionPk = 'player_id' | 'match_set_id';
-export type SetPositionId = SetPositionModel[SetPositionPk];
-export type SetPositionCreationAttributes = SetPositionAttributes;
-export declare class SetPositionModel extends Model<SetPositionAttributes, SetPositionCreationAttributes> implements SetPositionAttributes {
-    player_id: string;
-    match_set_id: string;
-    side: Side;
-    court_position: CourtPositionType;
-    matchSet: MatchSetModel;
-    getMatchSet: Sequelize.BelongsToGetAssociationMixin<MatchSetModel>;
-    setMatchSet: Sequelize.BelongsToSetAssociationMixin<MatchSetModel, MatchSetId>;
-    createMatchSet: Sequelize.BelongsToCreateAssociationMixin<MatchSetModel>;
-    player: PlayerModel;
-    getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
-    setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
-    createPlayer: Sequelize.BelongsToCreateAssociationMixin<PlayerModel>;
-    static initModel(sequelize: Sequelize.Sequelize): typeof SetPositionModel;
-}

package/dist/esm/src/data/models/set-position.js

@@ -1,46 +0,0 @@
-import { DataTypes, Model } from 'sequelize';
-export class SetPositionModel extends Model {
-    static initModel(sequelize) {
-        return SetPositionModel.init({
-            player_id: {
-                type: DataTypes.UUID,
-                allowNull: false,
-                primaryKey: true,
-                references: {
-                    model: 'Player',
-                    key: 'player_id'
-                }
-            },
-            match_set_id: {
-                type: DataTypes.UUID,
-                allowNull: false,
-                primaryKey: true,
-                references: {
-                    model: 'MatchSet',
-                    key: 'match_set_id'
-                }
-            },
-            side: {
-                type: DataTypes.ENUM('AWAY', 'HOME'),
-                allowNull: false
-            },
-            court_position: {
-                type: DataTypes.ENUM('LEFT_BACK', 'LEFT_FRONT', 'LIBERO_ZONE', 'MIDDLE_BACK', 'MIDDLE_FRONT', 'NOT_IN_COURT', 'RIGHT_BACK', 'RIGHT_FRONT'),
-                allowNull: false
-            }
-        }, {
-            sequelize,
-            tableName: 'SetPosition',
-            schema: 'public',
-            timestamps: false,
-            indexes: [{
-                    name: 'RallyPosition_pk',
-                    unique: true,
-                    fields: [
-                        { name: 'match_set_id' },
-                        { name: 'player_id' }
-                    ]
-                }]
-        });
-    }
-}

package/dist/esm/src/data/transformers/set-position.d.ts

@@ -1,5 +0,0 @@
-import { PlayerPosition } from '../../service';
-import { SetPositionAttributes, SetPositionModel, Side } from '../models';
-declare function transformToAttributes(playerPosition: PlayerPosition, side: Side, setId: string): SetPositionAttributes;
-declare function transformToObject(model: SetPositionModel): PlayerPosition;
-export { transformToObject as transformToPlayerPosition, transformToAttributes as transformFromPlayerPosition };

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

@@ -1,16 +0,0 @@
-import { transformFromCourtPosition, transformToCourtPosition } from '.';
-function transformToAttributes(playerPosition, side, setId) {
-    return {
-        match_set_id: setId,
-        side,
-        court_position: transformFromCourtPosition(playerPosition.position),
-        player_id: playerPosition.playerId
-    };
-}
-function transformToObject(model) {
-    return {
-        playerId: model.player_id,
-        position: transformToCourtPosition(model.court_position)
-    };
-}
-export { transformToObject as transformToPlayerPosition, transformToAttributes as transformFromPlayerPosition };