volleyballsimtypes 0.0.86 → 0.0.87

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

@@ -47,13 +47,7 @@ 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.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    Block.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });
@@ -62,13 +56,12 @@ 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' });
-    Event.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    EventTrait.belongsTo(Trait, { as: 'trait', foreignKey: 'trait_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' });
@@ -170,13 +163,7 @@ 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.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    Reception.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });
@@ -197,31 +184,13 @@ 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.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    Serve.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    Set.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    Spike.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });
@@ -271,12 +240,6 @@ function initModels(sequelize) {
     TournamentMatch.belongsTo(Tournament, { as: 'tournament', foreignKey: 'tournament_id' });
     TournamentTeams.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     TournamentTeams.belongsTo(Tournament, { as: 'tournament', foreignKey: 'tournament_id' });
-    Trait.belongsToMany(Event, {
-        as: 'Events',
-        through: EventTrait,
-        foreignKey: 'trait_id',
-        otherKey: 'event_id'
-    });
     Trait.belongsToMany(Player, {
         as: 'Players',
         through: PlayerTrait,

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

@@ -37,6 +37,7 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
     blocker_3?: string;
     modifier: number;
     score: number;
+    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -68,7 +69,6 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
     hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
     hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
     countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
     addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;

package/dist/cjs/src/data/models/event-trait.d.ts

@@ -1,21 +1,48 @@
 import * as Sequelize from 'sequelize';
-import { Model } from 'sequelize';
-import type { EventId, EventModel, TraitId, TraitModel } from '.';
+import { Model, Optional } from 'sequelize';
+import type { BlockId, BlockModel, ReceptionId, ReceptionModel, ServeId, ServeModel, SetId, SetModel, SpikeId, SpikeModel, TraitId, TraitModel } from '.';
 export interface EventTraitAttributes {
+    block_id?: string;
+    reception_id?: string;
+    serve_id?: string;
+    set_id?: string;
+    spike_id?: string;
     event_id: string;
     trait_id: string;
 }
-export type EventTraitPk = 'event_id' | 'trait_id';
+export type EventTraitPk = 'event_id';
 export type EventTraitId = EventTraitModel[EventTraitPk];
-export type EventTraitCreationAttributes = EventTraitAttributes;
+export type EventTraitOptionalAttributes = 'block_id' | 'reception_id' | 'serve_id' | 'set_id' | 'spike_id';
+export type EventTraitCreationAttributes = Optional<EventTraitAttributes, EventTraitOptionalAttributes>;
 export declare class EventTraitModel extends Model<EventTraitAttributes, EventTraitCreationAttributes> implements EventTraitAttributes {
+    block_id?: string;
+    reception_id?: string;
+    serve_id?: string;
+    set_id?: string;
+    spike_id?: string;
     event_id: string;
     trait_id: string;
-    event: EventModel;
-    getEvent: Sequelize.BelongsToGetAssociationMixin<EventModel>;
-    setEvent: Sequelize.BelongsToSetAssociationMixin<EventModel, EventId>;
-    createEvent: Sequelize.BelongsToCreateAssociationMixin<EventModel>;
-    trait: TraitModel;
+    Block: BlockModel;
+    getBlock: Sequelize.BelongsToGetAssociationMixin<BlockModel>;
+    setBlock: Sequelize.BelongsToSetAssociationMixin<BlockModel, BlockId>;
+    createBlock: Sequelize.BelongsToCreateAssociationMixin<BlockModel>;
+    Reception: ReceptionModel;
+    getReception: Sequelize.BelongsToGetAssociationMixin<ReceptionModel>;
+    setReception: Sequelize.BelongsToSetAssociationMixin<ReceptionModel, ReceptionId>;
+    createReception: Sequelize.BelongsToCreateAssociationMixin<ReceptionModel>;
+    Serve: ServeModel;
+    getServe: Sequelize.BelongsToGetAssociationMixin<ServeModel>;
+    setServe: Sequelize.BelongsToSetAssociationMixin<ServeModel, ServeId>;
+    createServe: Sequelize.BelongsToCreateAssociationMixin<ServeModel>;
+    Set: SetModel;
+    getSet: Sequelize.BelongsToGetAssociationMixin<SetModel>;
+    setSet: Sequelize.BelongsToSetAssociationMixin<SetModel, SetId>;
+    createSet: Sequelize.BelongsToCreateAssociationMixin<SetModel>;
+    Spike: SpikeModel;
+    getSpike: Sequelize.BelongsToGetAssociationMixin<SpikeModel>;
+    setSpike: Sequelize.BelongsToSetAssociationMixin<SpikeModel, SpikeId>;
+    createSpike: Sequelize.BelongsToCreateAssociationMixin<SpikeModel>;
+    Trait: TraitModel;
     getTrait: Sequelize.BelongsToGetAssociationMixin<TraitModel>;
     setTrait: Sequelize.BelongsToSetAssociationMixin<TraitModel, TraitId>;
     createTrait: Sequelize.BelongsToCreateAssociationMixin<TraitModel>;

package/dist/cjs/src/data/models/event-trait.js

@@ -5,19 +5,54 @@ const sequelize_1 = require("sequelize");
 class EventTraitModel extends sequelize_1.Model {
     static initModel(sequelize) {
         return EventTraitModel.init({
-            event_id: {
+            block_id: {
                 type: sequelize_1.DataTypes.UUID,
-                allowNull: false,
-                primaryKey: true,
+                allowNull: true,
+                references: {
+                    model: 'Block',
+                    key: 'event_id'
+                }
+            },
+            reception_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'Reception',
+                    key: 'event_id'
+                }
+            },
+            serve_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'Serve',
+                    key: 'event_id'
+                }
+            },
+            set_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
                 references: {
-                    model: 'Event',
+                    model: 'Set',
                     key: 'event_id'
                 }
             },
+            spike_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'Spike',
+                    key: 'event_id'
+                }
+            },
+            event_id: {
+                type: sequelize_1.DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true
+            },
             trait_id: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
-                primaryKey: true,
                 references: {
                     model: 'Trait',
                     key: 'trait_id'
@@ -31,10 +66,7 @@ class EventTraitModel extends sequelize_1.Model {
             indexes: [{
                     name: 'eventtrait_pk',
                     unique: true,
-                    fields: [
-                        { name: 'event_id' },
-                        { name: 'trait_id' },
-                    ]
+                    fields: [{ name: 'event_id' }]
                 }]
         });
     }

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface EventAttributes {
     event_id: string;
     rally_id: string;
@@ -27,16 +27,5 @@ export declare class EventModel extends Model<EventAttributes, EventCreationAttr
     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;
     static initModel(sequelize: Sequelize.Sequelize): typeof EventModel;
 }

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

@@ -30,6 +30,7 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
     player_id: string;
     modifier: number;
     score: number;
+    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -49,7 +50,6 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
     hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
     hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
     countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
     addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;

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

@@ -30,6 +30,7 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
     modifier: number;
     score: number;
     type: ServeType;
+    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -49,7 +50,6 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
     hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
     hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
     countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
     addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;

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

@@ -30,6 +30,7 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
     player_id: string;
     modifier: number;
     score: number;
+    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -49,7 +50,6 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
     hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
     hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
     countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
     addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;

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

@@ -30,6 +30,7 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
     player_id: string;
     modifier: number;
     score: number;
+    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -49,7 +50,6 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
     hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
     hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
     countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
     addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { EventId, EventModel, EventTraitId, EventTraitModel, PlayerId, PlayerModel, PlayerTraitId, PlayerTraitModel } from '.';
+import { EventTraitId, EventTraitModel, PlayerId, PlayerModel, PlayerTraitId, PlayerTraitModel } from '.';
 export interface TraitAttributes {
     trait_id: string;
     name: string;
@@ -22,17 +22,6 @@ export declare class TraitModel extends Model<TraitAttributes, TraitCreationAttr
     threshold: number;
     weight: number;
     general_stat: GeneralStatType;
-    Events: EventModel[];
-    getEvents: Sequelize.BelongsToManyGetAssociationsMixin<EventModel>;
-    setEvents: Sequelize.BelongsToManySetAssociationsMixin<EventModel, EventId>;
-    addEvent: Sequelize.BelongsToManyAddAssociationMixin<EventModel, EventId>;
-    addEvents: Sequelize.BelongsToManyAddAssociationsMixin<EventModel, EventId>;
-    createEvent: Sequelize.BelongsToManyCreateAssociationMixin<EventModel>;
-    removeEvent: Sequelize.BelongsToManyRemoveAssociationMixin<EventModel, EventId>;
-    removeEvents: Sequelize.BelongsToManyRemoveAssociationsMixin<EventModel, EventId>;
-    hasEvent: Sequelize.BelongsToManyHasAssociationMixin<EventModel, EventId>;
-    hasEvents: Sequelize.BelongsToManyHasAssociationsMixin<EventModel, EventId>;
-    countEvents: Sequelize.BelongsToManyCountAssociationsMixin;
     EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;

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

@@ -43,8 +43,9 @@ function transformFromBlockType(type) {
 }
 function transformToAttributes(event, rallyId) {
     const eventTraits = event.activeTraits.map(trait => ({
-        event_id: event.id,
-        trait_id: trait.id
+        block_id: event.id,
+        trait_id: trait.id,
+        event_id: event.id
     }));
     return {
         event_id: event.id,

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

@@ -42,6 +42,7 @@ function transformFromReceptionType(type) {
 function transformToAttributes(event, rallyId) {
     const eventTraits = event.activeTraits.map(trait => ({
         event_id: event.id,
+        reception_id: event.id,
         trait_id: trait.id
     }));
     return {

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

@@ -44,6 +44,7 @@ function transformFromServeType(type) {
 function transformToAttributes(event, rallyId) {
     const eventTraits = event.activeTraits.map(trait => ({
         event_id: event.id,
+        serve_id: event.id,
         trait_id: trait.id
     }));
     return {

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

@@ -42,6 +42,7 @@ function transformFromSetType(type) {
 function transformToAttributes(event, rallyId) {
     const eventTraits = event.activeTraits.map(trait => ({
         event_id: event.id,
+        set_id: event.id,
         trait_id: trait.id
     }));
     return {

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

@@ -46,6 +46,7 @@ function transformFromSpikeType(type) {
 function transformToAttributes(event, rallyId) {
     const eventTraits = event.activeTraits.map(trait => ({
         event_id: event.id,
+        spike_id: event.id,
         trait_id: trait.id
     }));
     return {

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

@@ -44,13 +44,7 @@ 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.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    Block.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });
@@ -59,13 +53,12 @@ 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' });
-    Event.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    EventTrait.belongsTo(Trait, { as: 'trait', foreignKey: 'trait_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' });
@@ -167,13 +160,7 @@ 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.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    Reception.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });
@@ -194,31 +181,13 @@ 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.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    Serve.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    Set.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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.belongsToMany(Trait, {
-        as: 'Traits',
-        through: EventTrait,
-        foreignKey: 'event_id',
-        otherKey: 'trait_id'
-    });
-    Spike.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });
@@ -268,12 +237,6 @@ export function initModels(sequelize) {
     TournamentMatch.belongsTo(Tournament, { as: 'tournament', foreignKey: 'tournament_id' });
     TournamentTeams.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     TournamentTeams.belongsTo(Tournament, { as: 'tournament', foreignKey: 'tournament_id' });
-    Trait.belongsToMany(Event, {
-        as: 'Events',
-        through: EventTrait,
-        foreignKey: 'trait_id',
-        otherKey: 'event_id'
-    });
     Trait.belongsToMany(Player, {
         as: 'Players',
         through: PlayerTrait,

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

@@ -37,6 +37,7 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
     blocker_3?: string;
     modifier: number;
     score: number;
+    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -68,7 +69,6 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
     hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
     hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
     countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
     addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;

package/dist/esm/src/data/models/event-trait.d.ts

@@ -1,21 +1,48 @@
 import * as Sequelize from 'sequelize';
-import { Model } from 'sequelize';
-import type { EventId, EventModel, TraitId, TraitModel } from '.';
+import { Model, Optional } from 'sequelize';
+import type { BlockId, BlockModel, ReceptionId, ReceptionModel, ServeId, ServeModel, SetId, SetModel, SpikeId, SpikeModel, TraitId, TraitModel } from '.';
 export interface EventTraitAttributes {
+    block_id?: string;
+    reception_id?: string;
+    serve_id?: string;
+    set_id?: string;
+    spike_id?: string;
     event_id: string;
     trait_id: string;
 }
-export type EventTraitPk = 'event_id' | 'trait_id';
+export type EventTraitPk = 'event_id';
 export type EventTraitId = EventTraitModel[EventTraitPk];
-export type EventTraitCreationAttributes = EventTraitAttributes;
+export type EventTraitOptionalAttributes = 'block_id' | 'reception_id' | 'serve_id' | 'set_id' | 'spike_id';
+export type EventTraitCreationAttributes = Optional<EventTraitAttributes, EventTraitOptionalAttributes>;
 export declare class EventTraitModel extends Model<EventTraitAttributes, EventTraitCreationAttributes> implements EventTraitAttributes {
+    block_id?: string;
+    reception_id?: string;
+    serve_id?: string;
+    set_id?: string;
+    spike_id?: string;
     event_id: string;
     trait_id: string;
-    event: EventModel;
-    getEvent: Sequelize.BelongsToGetAssociationMixin<EventModel>;
-    setEvent: Sequelize.BelongsToSetAssociationMixin<EventModel, EventId>;
-    createEvent: Sequelize.BelongsToCreateAssociationMixin<EventModel>;
-    trait: TraitModel;
+    Block: BlockModel;
+    getBlock: Sequelize.BelongsToGetAssociationMixin<BlockModel>;
+    setBlock: Sequelize.BelongsToSetAssociationMixin<BlockModel, BlockId>;
+    createBlock: Sequelize.BelongsToCreateAssociationMixin<BlockModel>;
+    Reception: ReceptionModel;
+    getReception: Sequelize.BelongsToGetAssociationMixin<ReceptionModel>;
+    setReception: Sequelize.BelongsToSetAssociationMixin<ReceptionModel, ReceptionId>;
+    createReception: Sequelize.BelongsToCreateAssociationMixin<ReceptionModel>;
+    Serve: ServeModel;
+    getServe: Sequelize.BelongsToGetAssociationMixin<ServeModel>;
+    setServe: Sequelize.BelongsToSetAssociationMixin<ServeModel, ServeId>;
+    createServe: Sequelize.BelongsToCreateAssociationMixin<ServeModel>;
+    Set: SetModel;
+    getSet: Sequelize.BelongsToGetAssociationMixin<SetModel>;
+    setSet: Sequelize.BelongsToSetAssociationMixin<SetModel, SetId>;
+    createSet: Sequelize.BelongsToCreateAssociationMixin<SetModel>;
+    Spike: SpikeModel;
+    getSpike: Sequelize.BelongsToGetAssociationMixin<SpikeModel>;
+    setSpike: Sequelize.BelongsToSetAssociationMixin<SpikeModel, SpikeId>;
+    createSpike: Sequelize.BelongsToCreateAssociationMixin<SpikeModel>;
+    Trait: TraitModel;
     getTrait: Sequelize.BelongsToGetAssociationMixin<TraitModel>;
     setTrait: Sequelize.BelongsToSetAssociationMixin<TraitModel, TraitId>;
     createTrait: Sequelize.BelongsToCreateAssociationMixin<TraitModel>;

package/dist/esm/src/data/models/event-trait.js

@@ -2,19 +2,54 @@ import { DataTypes, Model } from 'sequelize';
 export class EventTraitModel extends Model {
     static initModel(sequelize) {
         return EventTraitModel.init({
-            event_id: {
+            block_id: {
                 type: DataTypes.UUID,
-                allowNull: false,
-                primaryKey: true,
+                allowNull: true,
+                references: {
+                    model: 'Block',
+                    key: 'event_id'
+                }
+            },
+            reception_id: {
+                type: DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'Reception',
+                    key: 'event_id'
+                }
+            },
+            serve_id: {
+                type: DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'Serve',
+                    key: 'event_id'
+                }
+            },
+            set_id: {
+                type: DataTypes.UUID,
+                allowNull: true,
                 references: {
-                    model: 'Event',
+                    model: 'Set',
                     key: 'event_id'
                 }
             },
+            spike_id: {
+                type: DataTypes.UUID,
+                allowNull: true,
+                references: {
+                    model: 'Spike',
+                    key: 'event_id'
+                }
+            },
+            event_id: {
+                type: DataTypes.UUID,
+                allowNull: false,
+                primaryKey: true
+            },
             trait_id: {
                 type: DataTypes.UUID,
                 allowNull: false,
-                primaryKey: true,
                 references: {
                     model: 'Trait',
                     key: 'trait_id'
@@ -28,10 +63,7 @@ export class EventTraitModel extends Model {
             indexes: [{
                     name: 'eventtrait_pk',
                     unique: true,
-                    fields: [
-                        { name: 'event_id' },
-                        { name: 'trait_id' },
-                    ]
+                    fields: [{ name: 'event_id' }]
                 }]
         });
     }

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { PlayerId, PlayerModel, RallyId, RallyModel } from '.';
 export interface EventAttributes {
     event_id: string;
     rally_id: string;
@@ -27,16 +27,5 @@ export declare class EventModel extends Model<EventAttributes, EventCreationAttr
     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;
     static initModel(sequelize: Sequelize.Sequelize): typeof EventModel;
 }

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

@@ -30,6 +30,7 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
     player_id: string;
     modifier: number;
     score: number;
+    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -49,7 +50,6 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
     hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
     hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
     countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
     addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;

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

@@ -30,6 +30,7 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
     modifier: number;
     score: number;
     type: ServeType;
+    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -49,7 +50,6 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
     hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
     hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
     countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
     addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;

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

@@ -30,6 +30,7 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
     player_id: string;
     modifier: number;
     score: number;
+    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -49,7 +50,6 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
     hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
     hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
     countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
     addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;

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

@@ -30,6 +30,7 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
     player_id: string;
     modifier: number;
     score: number;
+    EventTraits: EventTraitModel[];
     player: PlayerModel;
     getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
     setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -49,7 +50,6 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
     hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
     hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
     countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
-    EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
     addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { EventId, EventModel, EventTraitId, EventTraitModel, PlayerId, PlayerModel, PlayerTraitId, PlayerTraitModel } from '.';
+import { EventTraitId, EventTraitModel, PlayerId, PlayerModel, PlayerTraitId, PlayerTraitModel } from '.';
 export interface TraitAttributes {
     trait_id: string;
     name: string;
@@ -22,17 +22,6 @@ export declare class TraitModel extends Model<TraitAttributes, TraitCreationAttr
     threshold: number;
     weight: number;
     general_stat: GeneralStatType;
-    Events: EventModel[];
-    getEvents: Sequelize.BelongsToManyGetAssociationsMixin<EventModel>;
-    setEvents: Sequelize.BelongsToManySetAssociationsMixin<EventModel, EventId>;
-    addEvent: Sequelize.BelongsToManyAddAssociationMixin<EventModel, EventId>;
-    addEvents: Sequelize.BelongsToManyAddAssociationsMixin<EventModel, EventId>;
-    createEvent: Sequelize.BelongsToManyCreateAssociationMixin<EventModel>;
-    removeEvent: Sequelize.BelongsToManyRemoveAssociationMixin<EventModel, EventId>;
-    removeEvents: Sequelize.BelongsToManyRemoveAssociationsMixin<EventModel, EventId>;
-    hasEvent: Sequelize.BelongsToManyHasAssociationMixin<EventModel, EventId>;
-    hasEvents: Sequelize.BelongsToManyHasAssociationsMixin<EventModel, EventId>;
-    countEvents: Sequelize.BelongsToManyCountAssociationsMixin;
     EventTraits: EventTraitModel[];
     getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
     setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;

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

@@ -40,8 +40,9 @@ function transformFromBlockType(type) {
 }
 function transformToAttributes(event, rallyId) {
     const eventTraits = event.activeTraits.map(trait => ({
-        event_id: event.id,
-        trait_id: trait.id
+        block_id: event.id,
+        trait_id: trait.id,
+        event_id: event.id
     }));
     return {
         event_id: event.id,

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

@@ -39,6 +39,7 @@ function transformFromReceptionType(type) {
 function transformToAttributes(event, rallyId) {
     const eventTraits = event.activeTraits.map(trait => ({
         event_id: event.id,
+        reception_id: event.id,
         trait_id: trait.id
     }));
     return {

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

@@ -41,6 +41,7 @@ function transformFromServeType(type) {
 function transformToAttributes(event, rallyId) {
     const eventTraits = event.activeTraits.map(trait => ({
         event_id: event.id,
+        serve_id: event.id,
         trait_id: trait.id
     }));
     return {

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

@@ -39,6 +39,7 @@ function transformFromSetType(type) {
 function transformToAttributes(event, rallyId) {
     const eventTraits = event.activeTraits.map(trait => ({
         event_id: event.id,
+        set_id: event.id,
         trait_id: trait.id
     }));
     return {

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

@@ -43,6 +43,7 @@ function transformFromSpikeType(type) {
 function transformToAttributes(event, rallyId) {
     const eventTraits = event.activeTraits.map(trait => ({
         event_id: event.id,
+        spike_id: event.id,
         trait_id: trait.id
     }));
     return {

package/package.json

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