volleyballsimtypes 0.0.84 → 0.0.86

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

@@ -53,6 +53,7 @@ function initModels(sequelize) {
         foreignKey: 'event_id',
         otherKey: 'trait_id'
     });
+    Block.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });
@@ -175,6 +176,7 @@ function initModels(sequelize) {
         foreignKey: 'event_id',
         otherKey: 'trait_id'
     });
+    Reception.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });
@@ -201,6 +203,7 @@ function initModels(sequelize) {
         foreignKey: 'event_id',
         otherKey: 'trait_id'
     });
+    Serve.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_id' });
     Set.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Set.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
     Set.belongsToMany(Trait, {
@@ -209,6 +212,7 @@ function initModels(sequelize) {
         foreignKey: 'event_id',
         otherKey: 'trait_id'
     });
+    Set.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_id' });
     Spike.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Spike.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
     Spike.belongsToMany(Trait, {
@@ -217,6 +221,7 @@ function initModels(sequelize) {
         foreignKey: 'event_id',
         otherKey: 'trait_id'
     });
+    Spike.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });

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

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model, Optional } from 'sequelize';
-import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
 export interface BlockAttributes {
     event_id: string;
     rally_id: string;
@@ -15,6 +15,7 @@ export interface BlockAttributes {
     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';
@@ -67,5 +68,16 @@ 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>;
+    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/cjs/src/data/models/reception.d.ts

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
 export interface ReceptionAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface ReceptionAttributes {
     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';
@@ -48,5 +49,16 @@ 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>;
+    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/cjs/src/data/models/serve.d.ts

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
 export interface ServeAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface ServeAttributes {
     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';
@@ -48,5 +49,16 @@ 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>;
+    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/cjs/src/data/models/set.d.ts

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
 export interface SetAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface SetAttributes {
     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';
@@ -48,5 +49,16 @@ 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>;
+    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/cjs/src/data/models/spike.d.ts

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
 export interface SpikeAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface SpikeAttributes {
     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';
@@ -48,5 +49,16 @@ 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>;
+    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;
 }

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

@@ -42,6 +42,10 @@ function transformFromBlockType(type) {
     return service_1.BlockTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
+    const eventTraits = event.activeTraits.map(trait => ({
+        event_id: event.id,
+        trait_id: trait.id
+    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
@@ -55,7 +59,8 @@ function transformToAttributes(event, rallyId) {
         event_type: (0, _1.transformFromEventType)(event.eventType),
         blocker_1: event.blockers[0]?.id,
         blocker_2: event.blockers[1]?.id,
-        blocker_3: event.blockers[2]?.id
+        blocker_3: event.blockers[2]?.id,
+        EventTraits: eventTraits
     };
 }
 exports.transformFromBlock = transformToAttributes;
@@ -71,7 +76,7 @@ function transformToObject(model) {
         order: model.order,
         score: model.score,
         blockers: [],
-        activeTraits: []
+        activeTraits: model.Traits.map(_1.transformToTrait)
     });
     if (model.Blocker_1 != null)
         block.blockers.push((0, _1.transformToPlayer)(model.Blocker_1));

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

@@ -2,6 +2,6 @@ import { Reception } from '../../service';
 import { ReceptionAttributes, ReceptionModel } from '../models';
 import { APIReception } from '../../api';
 declare function transformToAttributes(event: Reception, rallyId: string): ReceptionAttributes;
-declare function transformToObject(event: ReceptionModel): Reception;
+declare function transformToObject(reception: ReceptionModel): Reception;
 declare function transformToAPIObject(event: ReceptionModel): APIReception;
 export { transformToObject as transformToReception, transformToAPIObject as transformToAPIReception, transformToAttributes as transformFromReception };

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

@@ -40,6 +40,10 @@ function transformFromReceptionType(type) {
     return service_1.ReceptionTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
+    const eventTraits = event.activeTraits.map(trait => ({
+        event_id: event.id,
+        trait_id: trait.id
+    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
@@ -50,22 +54,23 @@ function transformToAttributes(event, rallyId) {
         target: (0, _1.transformFromCourtTarget)(event.target),
         failure: transformToReceptionFailure(event.failure),
         type: transformToReceptionType(event.type),
-        event_type: (0, _1.transformFromEventType)(event.eventType)
+        event_type: (0, _1.transformFromEventType)(event.eventType),
+        EventTraits: eventTraits
     };
 }
 exports.transformFromReception = transformToAttributes;
-function transformToObject(event) {
+function transformToObject(reception) {
     return new service_1.Reception({
-        id: event.event_id,
-        eventType: (0, _1.transformToEventType)(event.event_type),
-        failure: transformFromReceptionFailure(event.failure),
-        type: transformFromReceptionType(event.type),
-        player: (0, _1.transformToPlayer)(event.player),
-        target: (0, _1.transformToCourtTarget)(event.target),
-        modifier: event.modifier,
-        order: event.order,
-        score: event.score,
-        activeTraits: []
+        id: reception.event_id,
+        eventType: (0, _1.transformToEventType)(reception.event_type),
+        failure: transformFromReceptionFailure(reception.failure),
+        type: transformFromReceptionType(reception.type),
+        player: (0, _1.transformToPlayer)(reception.player),
+        target: (0, _1.transformToCourtTarget)(reception.target),
+        modifier: reception.modifier,
+        order: reception.order,
+        score: reception.score,
+        activeTraits: reception.Traits.map(_1.transformToTrait)
     });
 }
 exports.transformToReception = transformToObject;

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

@@ -42,6 +42,10 @@ function transformFromServeType(type) {
     return service_1.ServeTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
+    const eventTraits = event.activeTraits.map(trait => ({
+        event_id: event.id,
+        trait_id: trait.id
+    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
@@ -52,7 +56,8 @@ function transformToAttributes(event, rallyId) {
         target: (0, _1.transformFromCourtTarget)(event.target),
         failure: transformToServeFailure(event.failure),
         type: transformToServeType(event.type),
-        event_type: (0, _1.transformFromEventType)(event.eventType)
+        event_type: (0, _1.transformFromEventType)(event.eventType),
+        EventTraits: eventTraits
     };
 }
 exports.transformFromServe = transformToAttributes;
@@ -67,7 +72,7 @@ function transformToObject(serve) {
         modifier: serve.modifier,
         order: serve.order,
         score: serve.score,
-        activeTraits: []
+        activeTraits: serve.Traits.map(_1.transformToTrait)
     });
 }
 exports.transformToServe = transformToObject;

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

@@ -40,6 +40,10 @@ function transformFromSetType(type) {
     return service_1.SetTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
+    const eventTraits = event.activeTraits.map(trait => ({
+        event_id: event.id,
+        trait_id: trait.id
+    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
@@ -50,7 +54,8 @@ function transformToAttributes(event, rallyId) {
         target: (0, _1.transformFromCourtTarget)(event.target),
         failure: transformToSetFailure(event.failure),
         type: transformToSetType(event.type),
-        event_type: (0, _1.transformFromEventType)(event.eventType)
+        event_type: (0, _1.transformFromEventType)(event.eventType),
+        EventTraits: eventTraits
     };
 }
 exports.transformFromSet = transformToAttributes;
@@ -65,7 +70,7 @@ function transformToObject(set) {
         modifier: set.modifier,
         order: set.order,
         score: set.score,
-        activeTraits: []
+        activeTraits: set.Traits.map(_1.transformToTrait)
     });
 }
 exports.transformToSet = transformToObject;

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

@@ -44,6 +44,10 @@ function transformFromSpikeType(type) {
     return service_1.SpikeTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
+    const eventTraits = event.activeTraits.map(trait => ({
+        event_id: event.id,
+        trait_id: trait.id
+    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
@@ -54,7 +58,8 @@ function transformToAttributes(event, rallyId) {
         target: (0, _1.transformFromCourtTarget)(event.target),
         failure: transformToSpikeFailure(event.failure),
         type: transformToSpikeType(event.type),
-        event_type: (0, _1.transformFromEventType)(event.eventType)
+        event_type: (0, _1.transformFromEventType)(event.eventType),
+        EventTraits: eventTraits
     };
 }
 exports.transformFromSpike = transformToAttributes;
@@ -69,7 +74,7 @@ function transformToObject(spike) {
         modifier: spike.modifier,
         order: spike.order,
         score: spike.score,
-        activeTraits: []
+        activeTraits: spike.Traits.map(_1.transformToTrait)
     });
 }
 exports.transformToSpike = transformToObject;

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

@@ -50,6 +50,7 @@ export function initModels(sequelize) {
         foreignKey: 'event_id',
         otherKey: 'trait_id'
     });
+    Block.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });
@@ -172,6 +173,7 @@ export function initModels(sequelize) {
         foreignKey: 'event_id',
         otherKey: 'trait_id'
     });
+    Reception.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });
@@ -198,6 +200,7 @@ export function initModels(sequelize) {
         foreignKey: 'event_id',
         otherKey: 'trait_id'
     });
+    Serve.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_id' });
     Set.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Set.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
     Set.belongsToMany(Trait, {
@@ -206,6 +209,7 @@ export function initModels(sequelize) {
         foreignKey: 'event_id',
         otherKey: 'trait_id'
     });
+    Set.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_id' });
     Spike.belongsTo(Player, { as: 'player', foreignKey: 'player_id' });
     Spike.belongsTo(Rally, { as: 'rally', foreignKey: 'rally_id' });
     Spike.belongsToMany(Trait, {
@@ -214,6 +218,7 @@ export function initModels(sequelize) {
         foreignKey: 'event_id',
         otherKey: 'trait_id'
     });
+    Spike.hasMany(EventTrait, { as: 'EventTraits', foreignKey: 'event_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' });

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, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
 export interface BlockAttributes {
     event_id: string;
     rally_id: string;
@@ -15,6 +15,7 @@ export interface BlockAttributes {
     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';
@@ -67,5 +68,16 @@ 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>;
+    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/reception.d.ts

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
 export interface ReceptionAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface ReceptionAttributes {
     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';
@@ -48,5 +49,16 @@ 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>;
+    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/serve.d.ts

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
 export interface ServeAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface ServeAttributes {
     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';
@@ -48,5 +49,16 @@ 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>;
+    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/set.d.ts

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
 export interface SetAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface SetAttributes {
     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';
@@ -48,5 +49,16 @@ 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>;
+    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/spike.d.ts

@@ -1,6 +1,6 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
+import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
 export interface SpikeAttributes {
     event_id: string;
     rally_id: string;
@@ -12,6 +12,7 @@ export interface SpikeAttributes {
     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';
@@ -48,5 +49,16 @@ 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>;
+    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;
 }

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

@@ -1,5 +1,5 @@
 import { Block, BlockFailureEnum, BlockTypeEnum } from '../../service';
-import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer } from '.';
+import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer, transformToTrait } from '.';
 function transformToBlockFailure(failure) {
     switch (failure) {
         case BlockFailureEnum.NO_FAILURE:
@@ -39,6 +39,10 @@ function transformFromBlockType(type) {
     return BlockTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
+    const eventTraits = event.activeTraits.map(trait => ({
+        event_id: event.id,
+        trait_id: trait.id
+    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
@@ -52,7 +56,8 @@ function transformToAttributes(event, rallyId) {
         event_type: transformFromEventType(event.eventType),
         blocker_1: event.blockers[0]?.id,
         blocker_2: event.blockers[1]?.id,
-        blocker_3: event.blockers[2]?.id
+        blocker_3: event.blockers[2]?.id,
+        EventTraits: eventTraits
     };
 }
 function transformToObject(model) {
@@ -67,7 +72,7 @@ function transformToObject(model) {
         order: model.order,
         score: model.score,
         blockers: [],
-        activeTraits: []
+        activeTraits: model.Traits.map(transformToTrait)
     });
     if (model.Blocker_1 != null)
         block.blockers.push(transformToPlayer(model.Blocker_1));

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

@@ -2,6 +2,6 @@ import { Reception } from '../../service';
 import { ReceptionAttributes, ReceptionModel } from '../models';
 import { APIReception } from '../../api';
 declare function transformToAttributes(event: Reception, rallyId: string): ReceptionAttributes;
-declare function transformToObject(event: ReceptionModel): Reception;
+declare function transformToObject(reception: ReceptionModel): Reception;
 declare function transformToAPIObject(event: ReceptionModel): APIReception;
 export { transformToObject as transformToReception, transformToAPIObject as transformToAPIReception, transformToAttributes as transformFromReception };

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

@@ -1,5 +1,5 @@
 import { Reception, ReceptionFailureEnum, ReceptionTypeEnum } from '../../service';
-import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer } from '.';
+import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer, transformToTrait } from '.';
 function transformToReceptionFailure(failure) {
     switch (failure) {
         case ReceptionFailureEnum.NO_FAILURE:
@@ -37,6 +37,10 @@ function transformFromReceptionType(type) {
     return ReceptionTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
+    const eventTraits = event.activeTraits.map(trait => ({
+        event_id: event.id,
+        trait_id: trait.id
+    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
@@ -47,21 +51,22 @@ function transformToAttributes(event, rallyId) {
         target: transformFromCourtTarget(event.target),
         failure: transformToReceptionFailure(event.failure),
         type: transformToReceptionType(event.type),
-        event_type: transformFromEventType(event.eventType)
+        event_type: transformFromEventType(event.eventType),
+        EventTraits: eventTraits
     };
 }
-function transformToObject(event) {
+function transformToObject(reception) {
     return new Reception({
-        id: event.event_id,
-        eventType: transformToEventType(event.event_type),
-        failure: transformFromReceptionFailure(event.failure),
-        type: transformFromReceptionType(event.type),
-        player: transformToPlayer(event.player),
-        target: transformToCourtTarget(event.target),
-        modifier: event.modifier,
-        order: event.order,
-        score: event.score,
-        activeTraits: []
+        id: reception.event_id,
+        eventType: transformToEventType(reception.event_type),
+        failure: transformFromReceptionFailure(reception.failure),
+        type: transformFromReceptionType(reception.type),
+        player: transformToPlayer(reception.player),
+        target: transformToCourtTarget(reception.target),
+        modifier: reception.modifier,
+        order: reception.order,
+        score: reception.score,
+        activeTraits: reception.Traits.map(transformToTrait)
     });
 }
 function transformToAPIObject(event) {

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

@@ -1,5 +1,5 @@
 import { Serve, ServeFailureEnum, ServeTypeEnum } from '../../service';
-import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer } from '.';
+import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer, transformToTrait } from '.';
 function transformToServeFailure(failure) {
     switch (failure) {
         case ServeFailureEnum.NO_FAILURE:
@@ -39,6 +39,10 @@ function transformFromServeType(type) {
     return ServeTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
+    const eventTraits = event.activeTraits.map(trait => ({
+        event_id: event.id,
+        trait_id: trait.id
+    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
@@ -49,7 +53,8 @@ function transformToAttributes(event, rallyId) {
         target: transformFromCourtTarget(event.target),
         failure: transformToServeFailure(event.failure),
         type: transformToServeType(event.type),
-        event_type: transformFromEventType(event.eventType)
+        event_type: transformFromEventType(event.eventType),
+        EventTraits: eventTraits
     };
 }
 function transformToObject(serve) {
@@ -63,7 +68,7 @@ function transformToObject(serve) {
         modifier: serve.modifier,
         order: serve.order,
         score: serve.score,
-        activeTraits: []
+        activeTraits: serve.Traits.map(transformToTrait)
     });
 }
 function transformToAPIObject(event) {

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

@@ -1,5 +1,5 @@
 import { Set, SetFailureEnum, SetTypeEnum } from '../../service';
-import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer } from '.';
+import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer, transformToTrait } from '.';
 function transformToSetFailure(failure) {
     switch (failure) {
         case SetFailureEnum.NO_FAILURE:
@@ -37,6 +37,10 @@ function transformFromSetType(type) {
     return SetTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
+    const eventTraits = event.activeTraits.map(trait => ({
+        event_id: event.id,
+        trait_id: trait.id
+    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
@@ -47,7 +51,8 @@ function transformToAttributes(event, rallyId) {
         target: transformFromCourtTarget(event.target),
         failure: transformToSetFailure(event.failure),
         type: transformToSetType(event.type),
-        event_type: transformFromEventType(event.eventType)
+        event_type: transformFromEventType(event.eventType),
+        EventTraits: eventTraits
     };
 }
 function transformToObject(set) {
@@ -61,7 +66,7 @@ function transformToObject(set) {
         modifier: set.modifier,
         order: set.order,
         score: set.score,
-        activeTraits: []
+        activeTraits: set.Traits.map(transformToTrait)
     });
 }
 function transformToAPIObject(event) {

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

@@ -1,5 +1,5 @@
 import { Spike, SpikeFailureEnum, SpikeTypeEnum } from '../../service';
-import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer } from '.';
+import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer, transformToTrait } from '.';
 function transformToSpikeFailure(failure) {
     switch (failure) {
         case SpikeFailureEnum.NO_FAILURE:
@@ -41,6 +41,10 @@ function transformFromSpikeType(type) {
     return SpikeTypeEnum[type];
 }
 function transformToAttributes(event, rallyId) {
+    const eventTraits = event.activeTraits.map(trait => ({
+        event_id: event.id,
+        trait_id: trait.id
+    }));
     return {
         event_id: event.id,
         player_id: event.player.id,
@@ -51,7 +55,8 @@ function transformToAttributes(event, rallyId) {
         target: transformFromCourtTarget(event.target),
         failure: transformToSpikeFailure(event.failure),
         type: transformToSpikeType(event.type),
-        event_type: transformFromEventType(event.eventType)
+        event_type: transformFromEventType(event.eventType),
+        EventTraits: eventTraits
     };
 }
 function transformToObject(spike) {
@@ -65,7 +70,7 @@ function transformToObject(spike) {
         modifier: spike.modifier,
         order: spike.order,
         score: spike.score,
-        activeTraits: []
+        activeTraits: spike.Traits.map(transformToTrait)
     });
 }
 function transformToAPIObject(event) {

package/package.json

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