volleyballsimtypes 0.0.211 → 0.0.212

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

@@ -33,6 +33,7 @@ function initModels(sequelize) {
     Tactics.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Competition.belongsTo(Iteration, { as: 'Iteration', foreignKey: 'iteration' });
     Competition.hasMany(CompetitionMatch, { as: 'CompetitionMatches', foreignKey: 'competition_id' });
+    Competition.hasMany(CompetitionStandings, { as: 'CompetitionStandings', foreignKey: 'competition_id' });
     Competition.hasMany(CompetitionTeams, { as: 'CompetitionTeams', foreignKey: 'competition_id' });
     Competition.hasOne(CompetitionChampion, { as: 'CompetitionChampion', foreignKey: 'competition_id' });
     Competition.hasOne(DivisionSeason, { as: 'DivisionSeason', foreignKey: 'competition_id' });
@@ -153,6 +154,7 @@ function initModels(sequelize) {
     Team.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'team_id' });
     Team.hasMany(Rally, { as: 'Rallies', foreignKey: 'serving_team' });
     Team.hasMany(MatchResult, { as: 'WonMatches', foreignKey: 'winner_team_id' });
+    Team.hasMany(CompetitionStandings, { as: 'CompetitionStandings', foreignKey: 'team_id' });
     return {
         Competition,
         CompetitionChampion,

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

@@ -16,6 +16,7 @@ export * from './player';
 export * from './rally';
 export * from './season';
 export * from './season-match';
+export * from './standing';
 export * from './player-team';
 export * from './match-rating';
 export * from './team';

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

@@ -32,6 +32,7 @@ __exportStar(require("./player"), exports);
 __exportStar(require("./rally"), exports);
 __exportStar(require("./season"), exports);
 __exportStar(require("./season-match"), exports);
+__exportStar(require("./standing"), exports);
 __exportStar(require("./player-team"), exports);
 __exportStar(require("./match-rating"), exports);
 __exportStar(require("./team"), exports);

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

@@ -0,0 +1,4 @@
+import { CompetitionStandingsModel } from '../models';
+import { Standing } from '../../service';
+declare function transformToObject(model: CompetitionStandingsModel): Standing;
+export { transformToObject as transformToStanding };

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformToStanding = void 0;
+const service_1 = require("../../service");
+function transformToObject(model) {
+    return new service_1.Standing({
+        teamId: model.team_id,
+        won30: Number(model.won30),
+        won31: Number(model.won31),
+        won32: Number(model.won32),
+        lost03: Number(model.lost03),
+        lost13: Number(model.lost13),
+        lost23: Number(model.lost23),
+        pointsWon: Number(model.points_won),
+        pointsLost: Number(model.points_lost),
+        points: Number(model.points),
+        setsWon: Number(model.sets_won),
+        setsLost: Number(model.sets_lost),
+        matchesWon: Number(model.matches_won),
+        matchesLost: Number(model.matches_lost),
+        totalMatches: Number(model.total_matches)
+    });
+}
+exports.transformToStanding = transformToObject;

package/dist/cjs/src/service/competition/season.d.ts

@@ -11,6 +11,7 @@ interface SeasonOpts {
     readonly divisionId: string;
     readonly champion?: Team;
     readonly status: StatusEnum;
+    readonly standings?: Standing[];
 }
 export declare class Season {
     readonly id: string;
@@ -21,7 +22,7 @@ export declare class Season {
     readonly standings: Standing[];
     readonly status: StatusEnum;
     champion?: Team;
-    constructor({ id, iteration, teams, matches, champion, status, divisionId }: SeasonOpts);
+    constructor({ id, iteration, teams, matches, champion, status, divisionId, standings }: SeasonOpts);
     calculateStandings(): Standing[];
     updateStandings(): void;
 }

package/dist/cjs/src/service/competition/season.js

@@ -3,22 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Season = void 0;
 const standing_1 = require("./standing");
 class Season {
-    constructor({ id, iteration, teams, matches, champion, status, divisionId }) {
+    constructor({ id, iteration, teams, matches, champion, status, divisionId, standings }) {
         this.id = id;
         this.teams = teams;
         this.matches = matches;
         this.iteration = iteration;
         this.divisionId = divisionId;
         this.champion = champion;
-        this.standings = this.calculateStandings();
+        this.standings = standings ?? this.calculateStandings();
         this.status = status;
+        this.standings.sort(standing_1.Standing.sortFn);
     }
     calculateStandings() {
         return this.teams.map(team => {
-            const standing = new standing_1.Standing({ team });
+            const standing = new standing_1.Standing({ teamId: team.id });
             standing.calculateStanding(this.matches);
             return standing;
-        }).sort(standing_1.Standing.sortFn);
+        });
     }
     updateStandings() {
         if (this.matches == null || this.matches.length < 1)
@@ -26,7 +27,7 @@ class Season {
         const updated = this.calculateStandings();
         this.standings.splice(0, this.standings.length, ...updated);
         if (this.matches.every((match) => match.isOver())) {
-            this.champion = this.standings[0].team;
+            this.champion = this.teams.find((team) => team.id === this.standings[0].teamId);
         }
     }
 }

package/dist/cjs/src/service/competition/standing.d.ts

@@ -1,10 +1,23 @@
 import { Match } from '../match';
-import { Team } from '../team';
 interface StandingOpts {
-    readonly team: Team;
+    teamId: string;
+    won30?: number;
+    won31?: number;
+    won32?: number;
+    lost03?: number;
+    lost13?: number;
+    lost23?: number;
+    pointsWon?: number;
+    pointsLost?: number;
+    points?: number;
+    setsWon?: number;
+    setsLost?: number;
+    matchesWon?: number;
+    matchesLost?: number;
+    totalMatches?: number;
 }
 export declare class Standing {
-    readonly team: Team;
+    readonly teamId: string;
     won30: number;
     won31: number;
     won32: number;
@@ -21,7 +34,7 @@ export declare class Standing {
     matchesWon: number;
     matchesLost: number;
     totalMatches: number;
-    constructor({ team }: StandingOpts);
+    constructor(opts: StandingOpts);
     static sortFn(standingA: Standing, standingB: Standing): number;
     calculateStanding(matches: Match[]): void;
 }

package/dist/cjs/src/service/competition/standing.js

@@ -3,24 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Standing = void 0;
 const match_1 = require("../match");
 class Standing {
-    constructor({ team }) {
-        this.won30 = 0;
-        this.won31 = 0;
-        this.won32 = 0;
-        this.lost03 = 0;
-        this.lost13 = 0;
-        this.lost23 = 0;
-        this.pointsWon = 0;
-        this.pointsLost = 0;
-        this.points = 0;
-        this.pointsRatio = 0;
-        this.setsWon = 0;
-        this.setsLost = 0;
-        this.setsRatio = 0;
-        this.matchesWon = 0;
-        this.matchesLost = 0;
-        this.totalMatches = 0;
-        this.team = team;
+    constructor(opts) {
+        this.teamId = opts.teamId;
+        this.won30 = opts.won30 ?? 0;
+        this.won31 = opts.won31 ?? 0;
+        this.won32 = opts.won32 ?? 0;
+        this.lost03 = opts.lost03 ?? 0;
+        this.lost13 = opts.lost13 ?? 0;
+        this.lost23 = opts.lost23 ?? 0;
+        this.pointsWon = opts.pointsWon ?? 0;
+        this.pointsLost = opts.pointsLost ?? 0;
+        this.points = opts.points ?? 0;
+        this.pointsRatio = this.pointsWon / this.pointsLost;
+        this.setsWon = opts.setsWon ?? 0;
+        this.setsLost = opts.setsLost ?? 0;
+        this.setsRatio = this.setsWon / this.setsLost;
+        this.matchesWon = opts.matchesWon ?? 0;
+        this.matchesLost = opts.matchesLost ?? 0;
+        this.totalMatches = opts.totalMatches ?? 0;
     }
     static sortFn(standingA, standingB) {
         if (standingB.points > standingA.points)
@@ -39,12 +39,12 @@ class Standing {
             return 0;
     }
     calculateStanding(matches) {
-        matches = matches.filter(match => match.homeTeam.id === this.team.id || match.awayTeam.id === this.team.id)
+        matches = matches.filter(match => match.homeTeam.id === this.teamId || match.awayTeam.id === this.teamId)
             .filter(match => match.isOver());
         let teamSide;
         let otherSide;
         for (const match of matches) {
-            if (this.team.id === match.homeTeam.id) {
+            if (this.teamId === match.homeTeam.id) {
                 teamSide = match_1.MatchTeam.HOME;
                 otherSide = match_1.MatchTeam.AWAY;
             }
@@ -52,7 +52,7 @@ class Standing {
                 teamSide = match_1.MatchTeam.AWAY;
                 otherSide = match_1.MatchTeam.HOME;
             }
-            if (match.getWinner().id === this.team.id) {
+            if (match.getWinner().id === this.teamId) {
                 this[`won3${match.getTeamSets(otherSide)}`]++;
             }
             else {

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

@@ -30,6 +30,7 @@ export function initModels(sequelize) {
     Tactics.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     Competition.belongsTo(Iteration, { as: 'Iteration', foreignKey: 'iteration' });
     Competition.hasMany(CompetitionMatch, { as: 'CompetitionMatches', foreignKey: 'competition_id' });
+    Competition.hasMany(CompetitionStandings, { as: 'CompetitionStandings', foreignKey: 'competition_id' });
     Competition.hasMany(CompetitionTeams, { as: 'CompetitionTeams', foreignKey: 'competition_id' });
     Competition.hasOne(CompetitionChampion, { as: 'CompetitionChampion', foreignKey: 'competition_id' });
     Competition.hasOne(DivisionSeason, { as: 'DivisionSeason', foreignKey: 'competition_id' });
@@ -150,6 +151,7 @@ export function initModels(sequelize) {
     Team.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'team_id' });
     Team.hasMany(Rally, { as: 'Rallies', foreignKey: 'serving_team' });
     Team.hasMany(MatchResult, { as: 'WonMatches', foreignKey: 'winner_team_id' });
+    Team.hasMany(CompetitionStandings, { as: 'CompetitionStandings', foreignKey: 'team_id' });
     return {
         Competition,
         CompetitionChampion,

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

@@ -16,6 +16,7 @@ export * from './player';
 export * from './rally';
 export * from './season';
 export * from './season-match';
+export * from './standing';
 export * from './player-team';
 export * from './match-rating';
 export * from './team';

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

@@ -16,6 +16,7 @@ export * from './player';
 export * from './rally';
 export * from './season';
 export * from './season-match';
+export * from './standing';
 export * from './player-team';
 export * from './match-rating';
 export * from './team';

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

@@ -0,0 +1,4 @@
+import { CompetitionStandingsModel } from '../models';
+import { Standing } from '../../service';
+declare function transformToObject(model: CompetitionStandingsModel): Standing;
+export { transformToObject as transformToStanding };

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

@@ -0,0 +1,21 @@
+import { Standing } from '../../service';
+function transformToObject(model) {
+    return new Standing({
+        teamId: model.team_id,
+        won30: Number(model.won30),
+        won31: Number(model.won31),
+        won32: Number(model.won32),
+        lost03: Number(model.lost03),
+        lost13: Number(model.lost13),
+        lost23: Number(model.lost23),
+        pointsWon: Number(model.points_won),
+        pointsLost: Number(model.points_lost),
+        points: Number(model.points),
+        setsWon: Number(model.sets_won),
+        setsLost: Number(model.sets_lost),
+        matchesWon: Number(model.matches_won),
+        matchesLost: Number(model.matches_lost),
+        totalMatches: Number(model.total_matches)
+    });
+}
+export { transformToObject as transformToStanding };

package/dist/esm/src/service/competition/season.d.ts

@@ -11,6 +11,7 @@ interface SeasonOpts {
     readonly divisionId: string;
     readonly champion?: Team;
     readonly status: StatusEnum;
+    readonly standings?: Standing[];
 }
 export declare class Season {
     readonly id: string;
@@ -21,7 +22,7 @@ export declare class Season {
     readonly standings: Standing[];
     readonly status: StatusEnum;
     champion?: Team;
-    constructor({ id, iteration, teams, matches, champion, status, divisionId }: SeasonOpts);
+    constructor({ id, iteration, teams, matches, champion, status, divisionId, standings }: SeasonOpts);
     calculateStandings(): Standing[];
     updateStandings(): void;
 }

package/dist/esm/src/service/competition/season.js

@@ -1,21 +1,22 @@
 import { Standing } from './standing';
 export class Season {
-    constructor({ id, iteration, teams, matches, champion, status, divisionId }) {
+    constructor({ id, iteration, teams, matches, champion, status, divisionId, standings }) {
         this.id = id;
         this.teams = teams;
         this.matches = matches;
         this.iteration = iteration;
         this.divisionId = divisionId;
         this.champion = champion;
-        this.standings = this.calculateStandings();
+        this.standings = standings ?? this.calculateStandings();
         this.status = status;
+        this.standings.sort(Standing.sortFn);
     }
     calculateStandings() {
         return this.teams.map(team => {
-            const standing = new Standing({ team });
+            const standing = new Standing({ teamId: team.id });
             standing.calculateStanding(this.matches);
             return standing;
-        }).sort(Standing.sortFn);
+        });
     }
     updateStandings() {
         if (this.matches == null || this.matches.length < 1)
@@ -23,7 +24,7 @@ export class Season {
         const updated = this.calculateStandings();
         this.standings.splice(0, this.standings.length, ...updated);
         if (this.matches.every((match) => match.isOver())) {
-            this.champion = this.standings[0].team;
+            this.champion = this.teams.find((team) => team.id === this.standings[0].teamId);
         }
     }
 }

package/dist/esm/src/service/competition/standing.d.ts

@@ -1,10 +1,23 @@
 import { Match } from '../match';
-import { Team } from '../team';
 interface StandingOpts {
-    readonly team: Team;
+    teamId: string;
+    won30?: number;
+    won31?: number;
+    won32?: number;
+    lost03?: number;
+    lost13?: number;
+    lost23?: number;
+    pointsWon?: number;
+    pointsLost?: number;
+    points?: number;
+    setsWon?: number;
+    setsLost?: number;
+    matchesWon?: number;
+    matchesLost?: number;
+    totalMatches?: number;
 }
 export declare class Standing {
-    readonly team: Team;
+    readonly teamId: string;
     won30: number;
     won31: number;
     won32: number;
@@ -21,7 +34,7 @@ export declare class Standing {
     matchesWon: number;
     matchesLost: number;
     totalMatches: number;
-    constructor({ team }: StandingOpts);
+    constructor(opts: StandingOpts);
     static sortFn(standingA: Standing, standingB: Standing): number;
     calculateStanding(matches: Match[]): void;
 }

package/dist/esm/src/service/competition/standing.js

@@ -1,23 +1,23 @@
 import { MatchTeam } from '../match';
 export class Standing {
-    constructor({ team }) {
-        this.won30 = 0;
-        this.won31 = 0;
-        this.won32 = 0;
-        this.lost03 = 0;
-        this.lost13 = 0;
-        this.lost23 = 0;
-        this.pointsWon = 0;
-        this.pointsLost = 0;
-        this.points = 0;
-        this.pointsRatio = 0;
-        this.setsWon = 0;
-        this.setsLost = 0;
-        this.setsRatio = 0;
-        this.matchesWon = 0;
-        this.matchesLost = 0;
-        this.totalMatches = 0;
-        this.team = team;
+    constructor(opts) {
+        this.teamId = opts.teamId;
+        this.won30 = opts.won30 ?? 0;
+        this.won31 = opts.won31 ?? 0;
+        this.won32 = opts.won32 ?? 0;
+        this.lost03 = opts.lost03 ?? 0;
+        this.lost13 = opts.lost13 ?? 0;
+        this.lost23 = opts.lost23 ?? 0;
+        this.pointsWon = opts.pointsWon ?? 0;
+        this.pointsLost = opts.pointsLost ?? 0;
+        this.points = opts.points ?? 0;
+        this.pointsRatio = this.pointsWon / this.pointsLost;
+        this.setsWon = opts.setsWon ?? 0;
+        this.setsLost = opts.setsLost ?? 0;
+        this.setsRatio = this.setsWon / this.setsLost;
+        this.matchesWon = opts.matchesWon ?? 0;
+        this.matchesLost = opts.matchesLost ?? 0;
+        this.totalMatches = opts.totalMatches ?? 0;
     }
     static sortFn(standingA, standingB) {
         if (standingB.points > standingA.points)
@@ -36,12 +36,12 @@ export class Standing {
             return 0;
     }
     calculateStanding(matches) {
-        matches = matches.filter(match => match.homeTeam.id === this.team.id || match.awayTeam.id === this.team.id)
+        matches = matches.filter(match => match.homeTeam.id === this.teamId || match.awayTeam.id === this.teamId)
             .filter(match => match.isOver());
         let teamSide;
         let otherSide;
         for (const match of matches) {
-            if (this.team.id === match.homeTeam.id) {
+            if (this.teamId === match.homeTeam.id) {
                 teamSide = MatchTeam.HOME;
                 otherSide = MatchTeam.AWAY;
             }
@@ -49,7 +49,7 @@ export class Standing {
                 teamSide = MatchTeam.AWAY;
                 otherSide = MatchTeam.HOME;
             }
-            if (match.getWinner().id === this.team.id) {
+            if (match.getWinner().id === this.teamId) {
                 this[`won3${match.getTeamSets(otherSide)}`]++;
             }
             else {

package/package.json

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