volleyballsimtypes 0.0.97 → 0.0.99

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

@@ -42,23 +42,15 @@ function transformFromServeType(type) {
     return service_1.ServeTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
-    const eventTraits = event.activeTraits.map(trait => ({
-        event_id: event.id,
-        serve_id: event.id,
-        trait_id: trait.id
-    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
         rally_id: rallyId,
         order: event.order,
-        modifier: event.modifier,
-        score: event.score,
         target: (0, _1.transformFromCourtTarget)(event.target),
         failure: transformToServeFailure(event.failure),
         type: transformToServeType(event.type),
         event_type: (0, _1.transformFromEventType)(event.eventType),
-        EventTraits: eventTraits
     };
 }
 exports.transformFromServe = transformToAttributes;
@@ -70,10 +62,10 @@ function transformToObject(serve) {
         type: transformFromServeType(serve.type),
         player: (0, _1.transformToPlayer)(serve.player),
         target: (0, _1.transformToCourtTarget)(serve.target),
-        modifier: serve.modifier,
         order: serve.order,
-        score: serve.score,
-        activeTraits: serve.Traits.map(_1.transformToTrait)
+        modifier: 1,
+        score: 1,
+        activeTraits: []
     });
 }
 exports.transformToServe = transformToObject;
@@ -85,9 +77,7 @@ function transformToAPIObject(event) {
         type: transformFromServeType(event.type),
         playerId: event.player_id,
         target: (0, _1.transformToCourtTarget)(event.target),
-        modifier: event.modifier,
-        order: event.order,
-        score: event.score
+        order: event.order
     };
 }
 exports.transformToAPIServe = transformToAPIObject;

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

@@ -40,23 +40,15 @@ function transformFromSetType(type) {
     return service_1.SetTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
-    const eventTraits = event.activeTraits.map(trait => ({
-        event_id: event.id,
-        set_id: event.id,
-        trait_id: trait.id
-    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
         rally_id: rallyId,
         order: event.order,
-        modifier: event.modifier,
-        score: event.score,
         target: (0, _1.transformFromCourtTarget)(event.target),
         failure: transformToSetFailure(event.failure),
         type: transformToSetType(event.type),
-        event_type: (0, _1.transformFromEventType)(event.eventType),
-        EventTraits: eventTraits
+        event_type: (0, _1.transformFromEventType)(event.eventType)
     };
 }
 exports.transformFromSet = transformToAttributes;
@@ -68,10 +60,10 @@ function transformToObject(set) {
         type: transformFromSetType(set.type),
         player: (0, _1.transformToPlayer)(set.player),
         target: (0, _1.transformToCourtTarget)(set.target),
-        modifier: set.modifier,
         order: set.order,
-        score: set.score,
-        activeTraits: set.Traits.map(_1.transformToTrait)
+        modifier: 1,
+        score: 1,
+        activeTraits: []
     });
 }
 exports.transformToSet = transformToObject;
@@ -83,9 +75,7 @@ function transformToAPIObject(event) {
         type: transformFromSetType(event.type),
         playerId: event.player_id,
         target: (0, _1.transformToCourtTarget)(event.target),
-        modifier: event.modifier,
-        order: event.order,
-        score: event.score
+        order: event.order
     };
 }
 exports.transformToAPISet = transformToAPIObject;

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

@@ -44,23 +44,15 @@ function transformFromSpikeType(type) {
     return service_1.SpikeTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
-    const eventTraits = event.activeTraits.map(trait => ({
-        event_id: event.id,
-        spike_id: event.id,
-        trait_id: trait.id
-    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
         rally_id: rallyId,
         order: event.order,
-        modifier: event.modifier,
-        score: event.score,
         target: (0, _1.transformFromCourtTarget)(event.target),
         failure: transformToSpikeFailure(event.failure),
         type: transformToSpikeType(event.type),
-        event_type: (0, _1.transformFromEventType)(event.eventType),
-        EventTraits: eventTraits
+        event_type: (0, _1.transformFromEventType)(event.eventType)
     };
 }
 exports.transformFromSpike = transformToAttributes;
@@ -72,10 +64,10 @@ function transformToObject(spike) {
         type: transformFromSpikeType(spike.type),
         player: (0, _1.transformToPlayer)(spike.player),
         target: (0, _1.transformToCourtTarget)(spike.target),
-        modifier: spike.modifier,
         order: spike.order,
-        score: spike.score,
-        activeTraits: spike.Traits.map(_1.transformToTrait)
+        modifier: 1,
+        score: 1,
+        activeTraits: []
     });
 }
 exports.transformToSpike = transformToObject;
@@ -87,9 +79,7 @@ function transformToAPIObject(event) {
         type: transformFromSpikeType(event.type),
         playerId: event.player_id,
         target: (0, _1.transformToCourtTarget)(event.target),
-        modifier: event.modifier,
         order: event.order,
-        score: event.score
     };
 }
 exports.transformToAPISpike = transformToAPIObject;

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

@@ -2,20 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformFromTrait = exports.transformToAPITrait = exports.transformToTrait = void 0;
 const service_1 = require("../../service");
+const api_1 = require("../../api");
 function transformToAttributes(trait) {
     return {
         trait_id: trait.id,
-        name: trait.name,
-        modifier: trait.modifier,
-        chance: trait.chance,
-        weight: trait.weight,
-        threshold: trait.statThreshold,
-        general_stat: trait.stat
+        name: trait.name
     };
 }
 exports.transformFromTrait = transformToAttributes;
 function transformToAPIObject(model) {
-    return { name: model.name };
+    switch (model.name) {
+        case 'Master Mind':
+            return api_1.APITrait.MASTER_MIND;
+        case 'Moving Wall':
+            return api_1.APITrait.MOVING_WALL;
+        case 'Marksman':
+            return api_1.APITrait.MARKSMAN;
+        case 'Meteor Serve':
+            return api_1.APITrait.METEOR_SERVE;
+        case 'Squad Leader':
+            return api_1.APITrait.SQUAD_LEADER;
+        case 'Vigorous':
+            return api_1.APITrait.VIGOROUS;
+        case 'Guardian':
+            return api_1.APITrait.GUARDIAN;
+        default:
+            throw new Error('TRAIT_ERROR');
+    }
 }
 exports.transformToAPITrait = transformToAPIObject;
 function transformToObject(model) {

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

@@ -14,8 +14,6 @@ export interface APISubstitution extends APIEvent {
 }
 export interface APIInPlayEvent extends APIEvent {
     readonly target: CourtTargetEnum;
-    readonly modifier: number;
-    readonly score: number;
 }
 export interface APIScore extends APIEvent {
     readonly teamId: string;

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

@@ -1,7 +1,13 @@
 import { Country, Name, Stat } from '../service';
 import { APISetStatistics } from './';
-export interface APITrait {
-    readonly name: string;
+export declare enum APITrait {
+    MASTER_MIND = "Master Mind",
+    MOVING_WALL = "Moving Wall",
+    MARKSMAN = "Marksman",
+    METEOR_SERVE = "Meteor Serve",
+    SQUAD_LEADER = "Squad Leader",
+    VIGOROUS = "Vigorous",
+    GUARDIAN = "Guardian"
 }
 export declare enum APIRole {
     SETTER = "Setter",

package/dist/esm/src/api/player.js

@@ -1,3 +1,13 @@
+export var APITrait;
+(function (APITrait) {
+    APITrait["MASTER_MIND"] = "Master Mind";
+    APITrait["MOVING_WALL"] = "Moving Wall";
+    APITrait["MARKSMAN"] = "Marksman";
+    APITrait["METEOR_SERVE"] = "Meteor Serve";
+    APITrait["SQUAD_LEADER"] = "Squad Leader";
+    APITrait["VIGOROUS"] = "Vigorous";
+    APITrait["GUARDIAN"] = "Guardian";
+})(APITrait || (APITrait = {}));
 export var APIRole;
 (function (APIRole) {
     APIRole["SETTER"] = "Setter";

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

@@ -1,4 +1,4 @@
-import { BlockModel, CoachModel, CountryModel, DraftModel, DraftPickModel, EventModel, EventTraitModel, IterationModel, LeagueModel, LiberoReplacementModel, MatchModel, MatchRatingModel, MatchSetModel, MatchSetStatsModel, PerformanceStatsModel, PlayerModel, PlayerTeamModel, PlayerTraitModel, RallyModel, RallyPositionModel, ReceptionModel, ScoreModel, SeasonMatchModel, SeasonModel, SeasonTeamsModel, ServeModel, SetModel, SpikeModel, SubstitutionModel, TeamModel, TournamentMatchModel, TournamentModel, TournamentTeamsModel, TraitModel, UserModel } from './models';
+import { BlockModel, CoachModel, CountryModel, DraftModel, DraftPickModel, EventModel, IterationModel, LeagueModel, LiberoReplacementModel, MatchModel, MatchRatingModel, MatchSetModel, MatchSetStatsModel, PerformanceStatsModel, PlayerModel, PlayerTeamModel, PlayerTraitModel, RallyModel, RallyPositionModel, ReceptionModel, ScoreModel, SeasonMatchModel, SeasonModel, SeasonTeamsModel, ServeModel, SetModel, SpikeModel, SubstitutionModel, TeamModel, TournamentMatchModel, TournamentModel, TournamentTeamsModel, TraitModel, UserModel } from './models';
 export function initModels(sequelize) {
     const Block = BlockModel.initModel(sequelize);
     const Coach = CoachModel.initModel(sequelize);
@@ -6,7 +6,6 @@ export function initModels(sequelize) {
     const Draft = DraftModel.initModel(sequelize);
     const DraftPick = DraftPickModel.initModel(sequelize);
     const Event = EventModel.initModel(sequelize);
-    const EventTrait = EventTraitModel.initModel(sequelize);
     const Iteration = IterationModel.initModel(sequelize);
     const League = LeagueModel.initModel(sequelize);
     const LiberoReplacement = LiberoReplacementModel.initModel(sequelize);
@@ -44,7 +43,6 @@ export function initModels(sequelize) {
     Block.belongsTo(Player, { as: 'Blocker_3', foreignKey: 'blocker_3' });
     Block.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Block.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    Block.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'block_id' });
     Coach.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
     Coach.hasMany(Team, { as: 'Teams', foreignKey: 'coach_id' });
     Country.hasMany(Coach, { as: 'Coaches', foreignKey: 'country_id' });
@@ -53,12 +51,6 @@ export function initModels(sequelize) {
     Country.hasMany(Team, { as: 'Teams', foreignKey: 'country_id' });
     Event.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Event.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    EventTrait.belongsTo(Block, { as: 'Block', foreignKey: 'block_id' });
-    EventTrait.belongsTo(Reception, { as: 'Reception', foreignKey: 'reception_id' });
-    EventTrait.belongsTo(Serve, { as: 'Serve', foreignKey: 'serve_id' });
-    EventTrait.belongsTo(Set, { as: 'Set', foreignKey: 'set_id' });
-    EventTrait.belongsTo(Spike, { as: 'Spike', foreignKey: 'spike_id' });
-    EventTrait.belongsTo(Trait, { as: 'Trait', foreignKey: 'trait_id' });
     Iteration.hasMany(Season, { as: 'Seasons', foreignKey: 'iteration' });
     Iteration.hasOne(Tournament, { as: 'Tournament', foreignKey: 'iteration' });
     League.belongsTo(Country, { as: 'country', foreignKey: 'country_id' });
@@ -166,7 +158,6 @@ export function initModels(sequelize) {
     RallyPosition.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
     Reception.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Reception.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    Reception.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'reception_id' });
     Score.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Score.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
     Score.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
@@ -187,13 +178,10 @@ export function initModels(sequelize) {
     SeasonTeams.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Serve.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Serve.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    Serve.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'serve_id' });
     Set.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Set.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    Set.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'set_id' });
     Spike.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Spike.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
-    Spike.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'spike_id' });
     Substitution.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Substitution.belongsTo(Player, { as: 'playerOut', foreignKey: 'player_out' });
     Substitution.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
@@ -256,7 +244,6 @@ export function initModels(sequelize) {
         otherKey: 'player_id'
     });
     Trait.hasMany(PlayerTrait, { as: 'PlayerTraits', foreignKey: 'trait_id' });
-    Trait.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'trait_id' });
     return {
         Block,
         Coach,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
-import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface BlockAttributes {
     event_id: string;
     rally_id: string;
@@ -13,9 +13,6 @@ export interface BlockAttributes {
     blocker_1?: string;
     blocker_2?: string;
     blocker_3?: string;
-    modifier: number;
-    score: number;
-    EventTraits?: EventTraitAttributes[];
 }
 export type BlockType = 'NO_BLOCKER' | 'SINGLE' | 'DOUBLE' | 'TRIPLE';
 export type BlockFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'WIPE' | 'TOOL';
@@ -35,9 +32,6 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
     blocker_1?: string;
     blocker_2?: string;
     blocker_3?: string;
-    modifier: number;
-    score: number;
-    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -58,26 +52,5 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
     getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
     setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
     createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof BlockModel;
 }

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

@@ -66,14 +66,6 @@ export class BlockModel extends Model {
                     model: 'Player',
                     key: 'player_id'
                 }
-            },
-            modifier: {
-                type: DataTypes.REAL,
-                allowNull: false
-            },
-            score: {
-                type: DataTypes.REAL,
-                allowNull: false
             }
         }, {
             sequelize,

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

@@ -4,7 +4,6 @@ export * from './country';
 export * from './draft';
 export * from './draft-pick';
 export * from './event';
-export * from './event-trait';
 export * from './iteration';
 export * from './league';
 export * from './libero-replacement';

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

@@ -4,7 +4,6 @@ export * from './country';
 export * from './draft';
 export * from './draft-pick';
 export * from './event';
-export * from './event-trait';
 export * from './iteration';
 export * from './league';
 export * from './libero-replacement';

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface ReceptionAttributes {
     event_id: string;
     rally_id: string;
@@ -10,9 +10,6 @@ export interface ReceptionAttributes {
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits?: EventTraitAttributes[];
 }
 export type ReceptionFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'BAD_PASS';
 export type ReceptionType = 'DIG' | 'OVERHAND' | 'ONE_HAND' | 'OTHER_BODY_PART';
@@ -28,9 +25,6 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
     getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
     setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
     createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof ReceptionModel;
 }

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

@@ -42,14 +42,6 @@ export class ReceptionModel extends Model {
                     model: 'Player',
                     key: 'player_id'
                 }
-            },
-            modifier: {
-                type: DataTypes.REAL,
-                allowNull: false
-            },
-            score: {
-                type: DataTypes.REAL,
-                allowNull: false
             }
         }, {
             sequelize,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface ServeAttributes {
     event_id: string;
     rally_id: string;
@@ -9,10 +9,7 @@ export interface ServeAttributes {
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
     type: ServeType;
-    EventTraits?: EventTraitAttributes[];
 }
 export type ServeFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'NET' | 'OUT_OF_BOUNDS';
 export type ServeType = 'UNDERHAND' | 'OVERHAND_TOPSPIN' | 'OVERHAND_FLOAT' | 'JUMP_TOPSPIN' | 'JUMP_FLOAT';
@@ -27,10 +24,7 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
     type: ServeType;
-    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
     getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
     setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
     createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof ServeModel;
 }

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

@@ -39,14 +39,6 @@ export class ServeModel extends Model {
                     key: 'player_id'
                 }
             },
-            modifier: {
-                type: DataTypes.REAL,
-                allowNull: false
-            },
-            score: {
-                type: DataTypes.REAL,
-                allowNull: false
-            },
             type: {
                 type: DataTypes.ENUM('UNDERHAND', 'OVERHAND_TOPSPIN', 'OVERHAND_FLOAT', 'JUMP_TOPSPIN', 'JUMP_FLOAT'),
                 allowNull: false

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface SetAttributes {
     event_id: string;
     rally_id: string;
@@ -10,9 +10,6 @@ export interface SetAttributes {
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits?: EventTraitAttributes[];
 }
 export type SetFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'BAD_PASS';
 export type SetType = 'OVERHAND' | 'UNDERHAND' | 'SPIKE' | 'DUMP';
@@ -28,9 +25,6 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
     target: CourtTarget;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
     getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
     setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
     createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof SetModel;
 }

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

@@ -42,14 +42,6 @@ export class SetModel extends Model {
                     model: 'Player',
                     key: 'player_id'
                 }
-            },
-            modifier: {
-                type: DataTypes.REAL,
-                allowNull: false
-            },
-            score: {
-                type: DataTypes.REAL,
-                allowNull: false
             }
         }, {
             sequelize,

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface SpikeAttributes {
     event_id: string;
     rally_id: string;
@@ -10,9 +10,6 @@ export interface SpikeAttributes {
     failure: SpikeFailure;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits?: EventTraitAttributes[];
 }
 export type SpikeType = 'CROSS_SHOT' | 'LINE_SHOT' | 'TOOL_SHOT' | 'TIP' | 'DOWN_BALL' | 'OVERHAND';
 export type SpikeFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'NET';
@@ -28,9 +25,6 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
     failure: SpikeFailure;
     order: number;
     player_id: string;
-    modifier: number;
-    score: number;
-    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
     getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
     setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
     createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
-    Traits: TraitModel[];
-    getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
-    setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
-    addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
-    addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
-    createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
-    removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
-    removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
-    hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
-    hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
-    countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
-    setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
-    addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
-    addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
-    createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
-    removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
-    removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
-    hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
-    hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
-    countEventTraits: Sequelize.HasManyCountAssociationsMixin;
     static initModel(sequelize: Sequelize.Sequelize): typeof SpikeModel;
 }