volleyballsimtypes 0.0.98 → 0.0.100

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/dist/cjs/src/api/events.d.ts +0 -2
  2. package/dist/cjs/src/data/init-models.js +0 -13
  3. package/dist/cjs/src/data/models/block.d.ts +1 -28
  4. package/dist/cjs/src/data/models/block.js +0 -8
  5. package/dist/cjs/src/data/models/index.d.ts +0 -1
  6. package/dist/cjs/src/data/models/index.js +0 -1
  7. package/dist/cjs/src/data/models/reception.d.ts +1 -28
  8. package/dist/cjs/src/data/models/reception.js +0 -8
  9. package/dist/cjs/src/data/models/serve.d.ts +1 -28
  10. package/dist/cjs/src/data/models/serve.js +0 -8
  11. package/dist/cjs/src/data/models/set.d.ts +1 -28
  12. package/dist/cjs/src/data/models/set.js +0 -8
  13. package/dist/cjs/src/data/models/spike.d.ts +1 -28
  14. package/dist/cjs/src/data/models/spike.js +0 -8
  15. package/dist/cjs/src/data/models/trait.d.ts +1 -23
  16. package/dist/cjs/src/data/models/trait.js +0 -20
  17. package/dist/cjs/src/data/transformers/block.js +4 -14
  18. package/dist/cjs/src/data/transformers/reception.js +4 -14
  19. package/dist/cjs/src/data/transformers/serve.js +4 -14
  20. package/dist/cjs/src/data/transformers/set.js +5 -15
  21. package/dist/cjs/src/data/transformers/spike.js +4 -14
  22. package/dist/cjs/src/data/transformers/trait.js +1 -6
  23. package/dist/cjs/src/service/match/__stubs__/index.js +0 -3
  24. package/dist/cjs/src/service/match/match-set.d.ts +0 -11
  25. package/dist/cjs/src/service/match/match-set.js +1 -30
  26. package/dist/cjs/src/service/match/match-set.test.js +0 -50
  27. package/dist/cjs/src/service/match/rally.d.ts +1 -15
  28. package/dist/cjs/src/service/match/rally.js +3 -31
  29. package/dist/cjs/src/service/match/rally.test.js +3 -50
  30. package/dist/esm/src/api/events.d.ts +0 -2
  31. package/dist/esm/src/data/init-models.js +1 -14
  32. package/dist/esm/src/data/models/block.d.ts +1 -28
  33. package/dist/esm/src/data/models/block.js +0 -8
  34. package/dist/esm/src/data/models/index.d.ts +0 -1
  35. package/dist/esm/src/data/models/index.js +0 -1
  36. package/dist/esm/src/data/models/reception.d.ts +1 -28
  37. package/dist/esm/src/data/models/reception.js +0 -8
  38. package/dist/esm/src/data/models/serve.d.ts +1 -28
  39. package/dist/esm/src/data/models/serve.js +0 -8
  40. package/dist/esm/src/data/models/set.d.ts +1 -28
  41. package/dist/esm/src/data/models/set.js +0 -8
  42. package/dist/esm/src/data/models/spike.d.ts +1 -28
  43. package/dist/esm/src/data/models/spike.js +0 -8
  44. package/dist/esm/src/data/models/trait.d.ts +1 -23
  45. package/dist/esm/src/data/models/trait.js +0 -20
  46. package/dist/esm/src/data/transformers/block.js +5 -15
  47. package/dist/esm/src/data/transformers/reception.js +5 -15
  48. package/dist/esm/src/data/transformers/serve.js +5 -15
  49. package/dist/esm/src/data/transformers/set.js +6 -16
  50. package/dist/esm/src/data/transformers/spike.js +5 -15
  51. package/dist/esm/src/data/transformers/trait.js +1 -6
  52. package/dist/esm/src/service/match/__stubs__/index.js +0 -3
  53. package/dist/esm/src/service/match/match-set.d.ts +0 -11
  54. package/dist/esm/src/service/match/match-set.js +0 -29
  55. package/dist/esm/src/service/match/match-set.test.js +1 -51
  56. package/dist/esm/src/service/match/rally.d.ts +1 -15
  57. package/dist/esm/src/service/match/rally.js +1 -29
  58. package/dist/esm/src/service/match/rally.test.js +2 -49
  59. package/package.json +1 -1
  60. package/dist/cjs/src/data/models/event-trait.d.ts +0 -50
  61. package/dist/cjs/src/data/models/event-trait.js +0 -77
  62. package/dist/esm/src/data/models/event-trait.d.ts +0 -50
  63. package/dist/esm/src/data/models/event-trait.js +0 -73
@@ -1,6 +1,6 @@
1
1
  import * as Sequelize from 'sequelize';
2
2
  import { Model, Optional } from 'sequelize';
3
- import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
3
+ import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
4
4
  export interface BlockAttributes {
5
5
  event_id: string;
6
6
  rally_id: string;
@@ -13,9 +13,6 @@ export interface BlockAttributes {
13
13
  blocker_1?: string;
14
14
  blocker_2?: string;
15
15
  blocker_3?: string;
16
- modifier: number;
17
- score: number;
18
- EventTraits?: EventTraitAttributes[];
19
16
  }
20
17
  export type BlockType = 'NO_BLOCKER' | 'SINGLE' | 'DOUBLE' | 'TRIPLE';
21
18
  export type BlockFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'WIPE' | 'TOOL';
@@ -35,9 +32,6 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
35
32
  blocker_1?: string;
36
33
  blocker_2?: string;
37
34
  blocker_3?: string;
38
- modifier: number;
39
- score: number;
40
- EventTraits: EventTraitModel[];
41
35
  player: PlayerModel;
42
36
  getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
43
37
  setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -58,26 +52,5 @@ export declare class BlockModel extends Model<BlockAttributes, BlockCreationAttr
58
52
  getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
59
53
  setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
60
54
  createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
61
- Traits: TraitModel[];
62
- getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
63
- setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
64
- addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
65
- addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
66
- createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
67
- removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
68
- removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
69
- hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
70
- hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
71
- countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
72
- getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
73
- setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
74
- addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
75
- addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
76
- createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
77
- removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
78
- removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
79
- hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
80
- hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
81
- countEventTraits: Sequelize.HasManyCountAssociationsMixin;
82
55
  static initModel(sequelize: Sequelize.Sequelize): typeof BlockModel;
83
56
  }
@@ -66,14 +66,6 @@ export class BlockModel extends Model {
66
66
  model: 'Player',
67
67
  key: 'player_id'
68
68
  }
69
- },
70
- modifier: {
71
- type: DataTypes.REAL,
72
- allowNull: false
73
- },
74
- score: {
75
- type: DataTypes.REAL,
76
- allowNull: false
77
69
  }
78
70
  }, {
79
71
  sequelize,
@@ -4,7 +4,6 @@ export * from './country';
4
4
  export * from './draft';
5
5
  export * from './draft-pick';
6
6
  export * from './event';
7
- export * from './event-trait';
8
7
  export * from './iteration';
9
8
  export * from './league';
10
9
  export * from './libero-replacement';
@@ -4,7 +4,6 @@ export * from './country';
4
4
  export * from './draft';
5
5
  export * from './draft-pick';
6
6
  export * from './event';
7
- export * from './event-trait';
8
7
  export * from './iteration';
9
8
  export * from './league';
10
9
  export * from './libero-replacement';
@@ -1,6 +1,6 @@
1
1
  import * as Sequelize from 'sequelize';
2
2
  import { Model } from 'sequelize';
3
- import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
3
+ import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
4
4
  export interface ReceptionAttributes {
5
5
  event_id: string;
6
6
  rally_id: string;
@@ -10,9 +10,6 @@ export interface ReceptionAttributes {
10
10
  target: CourtTarget;
11
11
  order: number;
12
12
  player_id: string;
13
- modifier: number;
14
- score: number;
15
- EventTraits?: EventTraitAttributes[];
16
13
  }
17
14
  export type ReceptionFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'BAD_PASS';
18
15
  export type ReceptionType = 'DIG' | 'OVERHAND' | 'ONE_HAND' | 'OTHER_BODY_PART';
@@ -28,9 +25,6 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
28
25
  target: CourtTarget;
29
26
  order: number;
30
27
  player_id: string;
31
- modifier: number;
32
- score: number;
33
- EventTraits: EventTraitModel[];
34
28
  player: PlayerModel;
35
29
  getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
36
30
  setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class ReceptionModel extends Model<ReceptionAttributes, Reception
39
33
  getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
40
34
  setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
41
35
  createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
42
- Traits: TraitModel[];
43
- getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
44
- setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
45
- addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
46
- addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
47
- createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
48
- removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
49
- removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
50
- hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
51
- hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
52
- countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
53
- getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
54
- setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
55
- addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
56
- addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
57
- createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
58
- removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
59
- removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
60
- hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
61
- hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
62
- countEventTraits: Sequelize.HasManyCountAssociationsMixin;
63
36
  static initModel(sequelize: Sequelize.Sequelize): typeof ReceptionModel;
64
37
  }
@@ -42,14 +42,6 @@ export class ReceptionModel extends Model {
42
42
  model: 'Player',
43
43
  key: 'player_id'
44
44
  }
45
- },
46
- modifier: {
47
- type: DataTypes.REAL,
48
- allowNull: false
49
- },
50
- score: {
51
- type: DataTypes.REAL,
52
- allowNull: false
53
45
  }
54
46
  }, {
55
47
  sequelize,
@@ -1,6 +1,6 @@
1
1
  import * as Sequelize from 'sequelize';
2
2
  import { Model } from 'sequelize';
3
- import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
3
+ import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
4
4
  export interface ServeAttributes {
5
5
  event_id: string;
6
6
  rally_id: string;
@@ -9,10 +9,7 @@ export interface ServeAttributes {
9
9
  target: CourtTarget;
10
10
  order: number;
11
11
  player_id: string;
12
- modifier: number;
13
- score: number;
14
12
  type: ServeType;
15
- EventTraits?: EventTraitAttributes[];
16
13
  }
17
14
  export type ServeFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'NET' | 'OUT_OF_BOUNDS';
18
15
  export type ServeType = 'UNDERHAND' | 'OVERHAND_TOPSPIN' | 'OVERHAND_FLOAT' | 'JUMP_TOPSPIN' | 'JUMP_FLOAT';
@@ -27,10 +24,7 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
27
24
  target: CourtTarget;
28
25
  order: number;
29
26
  player_id: string;
30
- modifier: number;
31
- score: number;
32
27
  type: ServeType;
33
- EventTraits: EventTraitModel[];
34
28
  player: PlayerModel;
35
29
  getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
36
30
  setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class ServeModel extends Model<ServeAttributes, ServeCreationAttr
39
33
  getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
40
34
  setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
41
35
  createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
42
- Traits: TraitModel[];
43
- getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
44
- setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
45
- addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
46
- addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
47
- createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
48
- removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
49
- removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
50
- hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
51
- hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
52
- countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
53
- getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
54
- setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
55
- addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
56
- addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
57
- createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
58
- removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
59
- removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
60
- hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
61
- hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
62
- countEventTraits: Sequelize.HasManyCountAssociationsMixin;
63
36
  static initModel(sequelize: Sequelize.Sequelize): typeof ServeModel;
64
37
  }
@@ -39,14 +39,6 @@ export class ServeModel extends Model {
39
39
  key: 'player_id'
40
40
  }
41
41
  },
42
- modifier: {
43
- type: DataTypes.REAL,
44
- allowNull: false
45
- },
46
- score: {
47
- type: DataTypes.REAL,
48
- allowNull: false
49
- },
50
42
  type: {
51
43
  type: DataTypes.ENUM('UNDERHAND', 'OVERHAND_TOPSPIN', 'OVERHAND_FLOAT', 'JUMP_TOPSPIN', 'JUMP_FLOAT'),
52
44
  allowNull: false
@@ -1,6 +1,6 @@
1
1
  import * as Sequelize from 'sequelize';
2
2
  import { Model } from 'sequelize';
3
- import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
3
+ import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
4
4
  export interface SetAttributes {
5
5
  event_id: string;
6
6
  rally_id: string;
@@ -10,9 +10,6 @@ export interface SetAttributes {
10
10
  target: CourtTarget;
11
11
  order: number;
12
12
  player_id: string;
13
- modifier: number;
14
- score: number;
15
- EventTraits?: EventTraitAttributes[];
16
13
  }
17
14
  export type SetFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'BAD_PASS';
18
15
  export type SetType = 'OVERHAND' | 'UNDERHAND' | 'SPIKE' | 'DUMP';
@@ -28,9 +25,6 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
28
25
  target: CourtTarget;
29
26
  order: number;
30
27
  player_id: string;
31
- modifier: number;
32
- score: number;
33
- EventTraits: EventTraitModel[];
34
28
  player: PlayerModel;
35
29
  getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
36
30
  setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class SetModel extends Model<SetAttributes, SetCreationAttributes
39
33
  getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
40
34
  setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
41
35
  createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
42
- Traits: TraitModel[];
43
- getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
44
- setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
45
- addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
46
- addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
47
- createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
48
- removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
49
- removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
50
- hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
51
- hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
52
- countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
53
- getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
54
- setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
55
- addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
56
- addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
57
- createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
58
- removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
59
- removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
60
- hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
61
- hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
62
- countEventTraits: Sequelize.HasManyCountAssociationsMixin;
63
36
  static initModel(sequelize: Sequelize.Sequelize): typeof SetModel;
64
37
  }
@@ -42,14 +42,6 @@ export class SetModel extends Model {
42
42
  model: 'Player',
43
43
  key: 'player_id'
44
44
  }
45
- },
46
- modifier: {
47
- type: DataTypes.REAL,
48
- allowNull: false
49
- },
50
- score: {
51
- type: DataTypes.REAL,
52
- allowNull: false
53
45
  }
54
46
  }, {
55
47
  sequelize,
@@ -1,6 +1,6 @@
1
1
  import * as Sequelize from 'sequelize';
2
2
  import { Model } from 'sequelize';
3
- import { CourtTarget, EventTraitAttributes, EventTraitId, EventTraitModel, EventType, PlayerId, PlayerModel, RallyId, RallyModel, TraitId, TraitModel } from '.';
3
+ import { CourtTarget, EventType, PlayerId, PlayerModel, RallyId, RallyModel } from '.';
4
4
  export interface SpikeAttributes {
5
5
  event_id: string;
6
6
  rally_id: string;
@@ -10,9 +10,6 @@ export interface SpikeAttributes {
10
10
  failure: SpikeFailure;
11
11
  order: number;
12
12
  player_id: string;
13
- modifier: number;
14
- score: number;
15
- EventTraits?: EventTraitAttributes[];
16
13
  }
17
14
  export type SpikeType = 'CROSS_SHOT' | 'LINE_SHOT' | 'TOOL_SHOT' | 'TIP' | 'DOWN_BALL' | 'OVERHAND';
18
15
  export type SpikeFailure = 'NO_FAILURE' | 'FAULT' | 'MISS' | 'OUT_OF_BOUNDS' | 'NET';
@@ -28,9 +25,6 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
28
25
  failure: SpikeFailure;
29
26
  order: number;
30
27
  player_id: string;
31
- modifier: number;
32
- score: number;
33
- EventTraits: EventTraitModel[];
34
28
  player: PlayerModel;
35
29
  getPlayer: Sequelize.BelongsToGetAssociationMixin<PlayerModel>;
36
30
  setPlayer: Sequelize.BelongsToSetAssociationMixin<PlayerModel, PlayerId>;
@@ -39,26 +33,5 @@ export declare class SpikeModel extends Model<SpikeAttributes, SpikeCreationAttr
39
33
  getRally: Sequelize.BelongsToGetAssociationMixin<RallyModel>;
40
34
  setRally: Sequelize.BelongsToSetAssociationMixin<RallyModel, RallyId>;
41
35
  createRally: Sequelize.BelongsToCreateAssociationMixin<RallyModel>;
42
- Traits: TraitModel[];
43
- getTraits: Sequelize.BelongsToManyGetAssociationsMixin<TraitModel>;
44
- setTraits: Sequelize.BelongsToManySetAssociationsMixin<TraitModel, TraitId>;
45
- addTrait: Sequelize.BelongsToManyAddAssociationMixin<TraitModel, TraitId>;
46
- addTraits: Sequelize.BelongsToManyAddAssociationsMixin<TraitModel, TraitId>;
47
- createTrait: Sequelize.BelongsToManyCreateAssociationMixin<TraitModel>;
48
- removeTrait: Sequelize.BelongsToManyRemoveAssociationMixin<TraitModel, TraitId>;
49
- removeTraits: Sequelize.BelongsToManyRemoveAssociationsMixin<TraitModel, TraitId>;
50
- hasTrait: Sequelize.BelongsToManyHasAssociationMixin<TraitModel, TraitId>;
51
- hasTraits: Sequelize.BelongsToManyHasAssociationsMixin<TraitModel, TraitId>;
52
- countTraits: Sequelize.BelongsToManyCountAssociationsMixin;
53
- getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
54
- setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
55
- addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
56
- addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
57
- createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
58
- removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
59
- removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
60
- hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
61
- hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
62
- countEventTraits: Sequelize.HasManyCountAssociationsMixin;
63
36
  static initModel(sequelize: Sequelize.Sequelize): typeof SpikeModel;
64
37
  }
@@ -42,14 +42,6 @@ export class SpikeModel extends Model {
42
42
  model: 'Player',
43
43
  key: 'player_id'
44
44
  }
45
- },
46
- modifier: {
47
- type: DataTypes.REAL,
48
- allowNull: false
49
- },
50
- score: {
51
- type: DataTypes.REAL,
52
- allowNull: false
53
45
  }
54
46
  }, {
55
47
  sequelize,
@@ -1,38 +1,16 @@
1
1
  import * as Sequelize from 'sequelize';
2
2
  import { Model } from 'sequelize';
3
- import { EventTraitId, EventTraitModel, PlayerId, PlayerModel, PlayerTraitId, PlayerTraitModel } from '.';
3
+ import { PlayerId, PlayerModel, PlayerTraitId, PlayerTraitModel } from '.';
4
4
  export interface TraitAttributes {
5
5
  trait_id: string;
6
6
  name: string;
7
- modifier: number;
8
- chance: number;
9
- threshold: number;
10
- weight: number;
11
- general_stat: GeneralStatType;
12
7
  }
13
8
  export type TraitPk = 'trait_id';
14
9
  export type TraitId = TraitModel[TraitPk];
15
10
  export type TraitCreationAttributes = TraitAttributes;
16
- export type GeneralStatType = 'Attack' | 'Defense' | 'Physical' | 'Serve';
17
11
  export declare class TraitModel extends Model<TraitAttributes, TraitCreationAttributes> implements TraitAttributes {
18
12
  trait_id: string;
19
13
  name: string;
20
- modifier: number;
21
- chance: number;
22
- threshold: number;
23
- weight: number;
24
- general_stat: GeneralStatType;
25
- EventTraits: EventTraitModel[];
26
- getEventTraits: Sequelize.HasManyGetAssociationsMixin<EventTraitModel>;
27
- setEventTraits: Sequelize.HasManySetAssociationsMixin<EventTraitModel, EventTraitId>;
28
- addEventTrait: Sequelize.HasManyAddAssociationMixin<EventTraitModel, EventTraitId>;
29
- addEventTraits: Sequelize.HasManyAddAssociationsMixin<EventTraitModel, EventTraitId>;
30
- createEventTrait: Sequelize.HasManyCreateAssociationMixin<EventTraitModel>;
31
- removeEventTrait: Sequelize.HasManyRemoveAssociationMixin<EventTraitModel, EventTraitId>;
32
- removeEventTraits: Sequelize.HasManyRemoveAssociationsMixin<EventTraitModel, EventTraitId>;
33
- hasEventTrait: Sequelize.HasManyHasAssociationMixin<EventTraitModel, EventTraitId>;
34
- hasEventTraits: Sequelize.HasManyHasAssociationsMixin<EventTraitModel, EventTraitId>;
35
- countEventTraits: Sequelize.HasManyCountAssociationsMixin;
36
14
  Players: PlayerModel[];
37
15
  getPlayers: Sequelize.BelongsToManyGetAssociationsMixin<PlayerModel>;
38
16
  setPlayers: Sequelize.BelongsToManySetAssociationsMixin<PlayerModel, PlayerId>;
@@ -10,26 +10,6 @@ export class TraitModel extends Model {
10
10
  name: {
11
11
  type: DataTypes.STRING,
12
12
  allowNull: false
13
- },
14
- modifier: {
15
- type: DataTypes.REAL,
16
- allowNull: false
17
- },
18
- chance: {
19
- type: DataTypes.REAL,
20
- allowNull: false
21
- },
22
- threshold: {
23
- type: DataTypes.INTEGER,
24
- allowNull: false
25
- },
26
- weight: {
27
- type: DataTypes.INTEGER,
28
- allowNull: false
29
- },
30
- general_stat: {
31
- type: DataTypes.ENUM('Attack', 'Defense', 'Physical', 'Serve'),
32
- allowNull: false
33
13
  }
34
14
  }, {
35
15
  sequelize,
@@ -1,5 +1,5 @@
1
1
  import { Block, BlockFailureEnum, BlockTypeEnum } from '../../service';
2
- import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer, transformToTrait } from '.';
2
+ import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer } from '.';
3
3
  function transformToBlockFailure(failure) {
4
4
  switch (failure) {
5
5
  case BlockFailureEnum.NO_FAILURE:
@@ -39,26 +39,18 @@ function transformFromBlockType(type) {
39
39
  return BlockTypeEnum[type];
40
40
  }
41
41
  function transformToAttributes(event, rallyId) {
42
- const eventTraits = event.activeTraits.map(trait => ({
43
- block_id: event.id,
44
- trait_id: trait.id,
45
- event_id: event.id
46
- }));
47
42
  return {
48
43
  event_id: event.id,
49
44
  player_id: event.player.id,
50
45
  rally_id: rallyId,
51
46
  order: event.order,
52
- modifier: event.modifier,
53
- score: event.score,
54
47
  target: transformFromCourtTarget(event.target),
55
48
  failure: transformToBlockFailure(event.failure),
56
49
  type: transformToBlockType(event.type),
57
50
  event_type: transformFromEventType(event.eventType),
58
51
  blocker_1: event.blockers[0]?.id,
59
52
  blocker_2: event.blockers[1]?.id,
60
- blocker_3: event.blockers[2]?.id,
61
- EventTraits: eventTraits
53
+ blocker_3: event.blockers[2]?.id
62
54
  };
63
55
  }
64
56
  function transformToObject(model) {
@@ -69,11 +61,11 @@ function transformToObject(model) {
69
61
  type: transformFromBlockType(model.type),
70
62
  player: transformToPlayer(model.player),
71
63
  target: transformToCourtTarget(model.target),
72
- modifier: model.modifier,
73
64
  order: model.order,
74
- score: model.score,
75
65
  blockers: [],
76
- activeTraits: model.Traits.map(transformToTrait)
66
+ modifier: 1,
67
+ score: 1,
68
+ activeTraits: []
77
69
  });
78
70
  if (model.Blocker_1 != null)
79
71
  block.blockers.push(transformToPlayer(model.Blocker_1));
@@ -91,9 +83,7 @@ function transformToAPIObject(model) {
91
83
  type: transformFromBlockType(model.type),
92
84
  playerId: model.player_id,
93
85
  target: transformToCourtTarget(model.target),
94
- modifier: model.modifier,
95
86
  order: model.order,
96
- score: model.score,
97
87
  blockers: []
98
88
  };
99
89
  if (model.blocker_1 != null)
@@ -1,5 +1,5 @@
1
1
  import { Reception, ReceptionFailureEnum, ReceptionTypeEnum } from '../../service';
2
- import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer, transformToTrait } from '.';
2
+ import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer } from '.';
3
3
  function transformToReceptionFailure(failure) {
4
4
  switch (failure) {
5
5
  case ReceptionFailureEnum.NO_FAILURE:
@@ -37,23 +37,15 @@ function transformFromReceptionType(type) {
37
37
  return ReceptionTypeEnum[type];
38
38
  }
39
39
  function transformToAttributes(event, rallyId) {
40
- const eventTraits = event.activeTraits.map(trait => ({
41
- event_id: event.id,
42
- reception_id: event.id,
43
- trait_id: trait.id
44
- }));
45
40
  return {
46
41
  event_id: event.id,
47
42
  player_id: event.player.id,
48
43
  rally_id: rallyId,
49
44
  order: event.order,
50
- modifier: event.modifier,
51
- score: event.score,
52
45
  target: transformFromCourtTarget(event.target),
53
46
  failure: transformToReceptionFailure(event.failure),
54
47
  type: transformToReceptionType(event.type),
55
48
  event_type: transformFromEventType(event.eventType),
56
- EventTraits: eventTraits
57
49
  };
58
50
  }
59
51
  function transformToObject(reception) {
@@ -64,10 +56,10 @@ function transformToObject(reception) {
64
56
  type: transformFromReceptionType(reception.type),
65
57
  player: transformToPlayer(reception.player),
66
58
  target: transformToCourtTarget(reception.target),
67
- modifier: reception.modifier,
68
59
  order: reception.order,
69
- score: reception.score,
70
- activeTraits: reception.Traits.map(transformToTrait)
60
+ modifier: 1,
61
+ score: 1,
62
+ activeTraits: []
71
63
  });
72
64
  }
73
65
  function transformToAPIObject(event) {
@@ -78,9 +70,7 @@ function transformToAPIObject(event) {
78
70
  type: transformFromReceptionType(event.type),
79
71
  playerId: event.player_id,
80
72
  target: transformToCourtTarget(event.target),
81
- modifier: event.modifier,
82
- order: event.order,
83
- score: event.score
73
+ order: event.order
84
74
  };
85
75
  }
86
76
  export { transformToObject as transformToReception, transformToAPIObject as transformToAPIReception, transformToAttributes as transformFromReception };
@@ -1,5 +1,5 @@
1
1
  import { Serve, ServeFailureEnum, ServeTypeEnum } from '../../service';
2
- import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer, transformToTrait } from '.';
2
+ import { transformFromCourtTarget, transformFromEventType, transformToCourtTarget, transformToEventType, transformToPlayer } from '.';
3
3
  function transformToServeFailure(failure) {
4
4
  switch (failure) {
5
5
  case ServeFailureEnum.NO_FAILURE:
@@ -39,23 +39,15 @@ function transformFromServeType(type) {
39
39
  return ServeTypeEnum[type];
40
40
  }
41
41
  function transformToAttributes(event, rallyId) {
42
- const eventTraits = event.activeTraits.map(trait => ({
43
- event_id: event.id,
44
- serve_id: event.id,
45
- trait_id: trait.id
46
- }));
47
42
  return {
48
43
  event_id: event.id,
49
44
  player_id: event.player.id,
50
45
  rally_id: rallyId,
51
46
  order: event.order,
52
- modifier: event.modifier,
53
- score: event.score,
54
47
  target: transformFromCourtTarget(event.target),
55
48
  failure: transformToServeFailure(event.failure),
56
49
  type: transformToServeType(event.type),
57
50
  event_type: transformFromEventType(event.eventType),
58
- EventTraits: eventTraits
59
51
  };
60
52
  }
61
53
  function transformToObject(serve) {
@@ -66,10 +58,10 @@ function transformToObject(serve) {
66
58
  type: transformFromServeType(serve.type),
67
59
  player: transformToPlayer(serve.player),
68
60
  target: transformToCourtTarget(serve.target),
69
- modifier: serve.modifier,
70
61
  order: serve.order,
71
- score: serve.score,
72
- activeTraits: serve.Traits.map(transformToTrait)
62
+ modifier: 1,
63
+ score: 1,
64
+ activeTraits: []
73
65
  });
74
66
  }
75
67
  function transformToAPIObject(event) {
@@ -80,9 +72,7 @@ function transformToAPIObject(event) {
80
72
  type: transformFromServeType(event.type),
81
73
  playerId: event.player_id,
82
74
  target: transformToCourtTarget(event.target),
83
- modifier: event.modifier,
84
- order: event.order,
85
- score: event.score
75
+ order: event.order
86
76
  };
87
77
  }
88
78
  export { transformToObject as transformToServe, transformToAPIObject as transformToAPIServe, transformToAttributes as transformFromServe };