volleyballsimtypes 0.0.157 → 0.0.159

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

@@ -16,7 +16,7 @@ function initModels(sequelize) {
     const LeagueSeason = models_1.LeagueSeasonModel.initModel(sequelize);
     const Match = models_1.MatchModel.initModel(sequelize);
     const MatchRating = models_1.MatchRatingModel.initModel(sequelize);
-    const MatchResultView = models_1.MatchResultViewModel.initModel(sequelize);
+    const MatchResult = models_1.MatchResultModel.initModel(sequelize);
     const MatchSet = models_1.MatchSetModel.initModel(sequelize);
     const MatchSetStats = models_1.MatchSetStatsModel.initModel(sequelize);
     const PerformanceStats = models_1.PerformanceStatsModel.initModel(sequelize);
@@ -72,9 +72,9 @@ function initModels(sequelize) {
     Match.hasMany(MatchRating, { as: 'MatchRatings', foreignKey: 'match_id' });
     Match.hasMany(MatchSet, { as: 'MatchSets', foreignKey: 'match_id' });
     Match.hasOne(CompetitionMatch, { as: 'CompetitionMatch', foreignKey: 'match_id' });
-    Match.hasOne(models_1.MatchResultViewModel, { as: 'MatchResult', foreignKey: 'match_id' });
-    MatchResultView.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
-    MatchResultView.belongsTo(Team, { as: 'WinnerTeam', foreignKey: 'winner_team_id' });
+    Match.hasOne(MatchResult, { as: 'MatchResult', foreignKey: 'match_id' });
+    MatchResult.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
+    MatchResult.belongsTo(Team, { as: 'WinnerTeam', foreignKey: 'winner_team_id' });
     MatchRating.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
     MatchRating.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     MatchSet.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
@@ -164,7 +164,7 @@ function initModels(sequelize) {
     Team.hasMany(MatchRating, { as: 'MatchRatings', foreignKey: 'team_id' });
     Team.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'team_id' });
     Team.hasMany(Rally, { as: 'Rallies', foreignKey: 'serving_team' });
-    Team.hasMany(MatchResultView, { as: 'WonMatches', foreignKey: 'winner_team_id' });
+    Team.hasMany(MatchResult, { as: 'WonMatches', foreignKey: 'winner_team_id' });
     Trait.belongsToMany(Player, {
         as: 'Players',
         through: PlayerTrait,
@@ -187,6 +187,7 @@ function initModels(sequelize) {
         LeagueSeason,
         Match,
         MatchRating,
+        MatchResult,
         MatchSet,
         MatchSetStats,
         PerformanceStats,

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

@@ -11,7 +11,7 @@ export * from './league';
 export * from './league-season';
 export * from './match';
 export * from './match-rating';
-export * from './match-result-view';
+export * from './match-result';
 export * from './match-set';
 export * from './match-set-stats';
 export * from './performance-stats';

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

@@ -27,7 +27,7 @@ __exportStar(require("./league"), exports);
 __exportStar(require("./league-season"), exports);
 __exportStar(require("./match"), exports);
 __exportStar(require("./match-rating"), exports);
-__exportStar(require("./match-result-view"), exports);
+__exportStar(require("./match-result"), exports);
 __exportStar(require("./match-set"), exports);
 __exportStar(require("./match-set-stats"), exports);
 __exportStar(require("./performance-stats"), exports);

package/dist/cjs/src/data/models/{match-result-view.d.ts → match-result.d.ts}

@@ -8,9 +8,9 @@ export interface MatchResultAttributes {
     winner_team_id: string | null;
 }
 export type MatchResultPk = 'match_id';
-export type MatchResultId = MatchResultViewModel[MatchResultPk];
+export type MatchResultId = MatchResultModel[MatchResultPk];
 export type MatchResultCreationAttributes = MatchResultAttributes;
-export declare class MatchResultViewModel extends Model<MatchResultAttributes, MatchResultCreationAttributes> implements MatchResultAttributes {
+export declare class MatchResultModel extends Model<MatchResultAttributes, MatchResultCreationAttributes> implements MatchResultAttributes {
     match_id: string;
     home_score: number;
     away_score: number;
@@ -23,5 +23,5 @@ export declare class MatchResultViewModel extends Model<MatchResultAttributes, M
     getWinnerTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
     setWinnerTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;
     createWinnerTeam: Sequelize.BelongsToCreateAssociationMixin<TeamModel>;
-    static initModel(sequelize: Sequelize.Sequelize): typeof MatchResultViewModel;
+    static initModel(sequelize: Sequelize.Sequelize): typeof MatchResultModel;
 }

package/dist/cjs/src/data/models/{match-result-view.js → match-result.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MatchResultViewModel = void 0;
+exports.MatchResultModel = void 0;
 const sequelize_1 = require("sequelize");
-class MatchResultViewModel extends sequelize_1.Model {
+class MatchResultModel extends sequelize_1.Model {
     static initModel(sequelize) {
-        return MatchResultViewModel.init({
+        return MatchResultModel.init({
             match_id: {
                 type: sequelize_1.DataTypes.UUID,
                 allowNull: false,
@@ -28,11 +28,11 @@ class MatchResultViewModel extends sequelize_1.Model {
             schema: 'public',
             timestamps: false,
             indexes: [{
-                    name: 'MatchResultView_pk',
+                    name: 'MatchResult_pk',
                     unique: true,
                     fields: [{ name: 'match_id' }]
                 }]
         });
     }
 }
-exports.MatchResultViewModel = MatchResultViewModel;
+exports.MatchResultModel = MatchResultModel;

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

@@ -1,7 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultViewModel, MatchSetAttributes, MatchSetId, MatchSetModel, TeamId, TeamModel } from '.';
 import { Status } from '../common';
+import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultModel, MatchSetAttributes, MatchSetId, MatchSetModel, TeamId, TeamModel } from '.';
 export interface MatchAttributes {
     match_id: string;
     home_team: string;
@@ -23,10 +23,10 @@ export declare class MatchModel extends Model<MatchAttributes, MatchCreationAttr
     getCompetitionMatch: Sequelize.HasOneGetAssociationMixin<CompetitionMatchModel>;
     setCompetitionMatch: Sequelize.HasOneSetAssociationMixin<CompetitionMatchModel, CompetitionMatchId>;
     createCompetitionMatch: Sequelize.HasOneCreateAssociationMixin<CompetitionMatchModel>;
-    MatchResultView: MatchResultViewModel;
-    getMatchResultView: Sequelize.HasOneGetAssociationMixin<MatchResultViewModel>;
-    setMatchResultView: Sequelize.HasOneSetAssociationMixin<MatchResultViewModel, MatchResultId>;
-    createMatchResultView: Sequelize.HasOneCreateAssociationMixin<MatchResultViewModel>;
+    MatchResult: MatchResultModel;
+    getMatchResult: Sequelize.HasOneGetAssociationMixin<MatchResultModel>;
+    setMatchResult: Sequelize.HasOneSetAssociationMixin<MatchResultModel, MatchResultId>;
+    createMatchResult: Sequelize.HasOneCreateAssociationMixin<MatchResultModel>;
     MatchRatings: MatchRatingModel[];
     getMatchRatings: Sequelize.HasManyGetAssociationsMixin<MatchRatingModel>;
     setMatchRatings: Sequelize.HasManySetAssociationsMixin<MatchRatingModel, MatchRatingId>;

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

@@ -24,9 +24,9 @@ function transformToObject(model) {
         scheduledDate: new Date(model.scheduled_date),
         sets,
         status: model.status,
-        homeScore: model.MatchResultView?.home_score,
-        awayScore: model.MatchResultView?.away_score,
-        winner: model.MatchResultView?.WinnerTeam != null ? (0, team_1.transformToTeam)(model.MatchResultView.WinnerTeam) : undefined
+        homeScore: model.MatchResult?.home_score,
+        awayScore: model.MatchResult?.away_score,
+        winner: model.MatchResult?.WinnerTeam != null ? (0, team_1.transformToTeam)(model.MatchResult.WinnerTeam) : undefined
     });
 }
 exports.transformToMatch = transformToObject;

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

@@ -1,4 +1,4 @@
-import { CoachModel, CompetitionChampionModel, CompetitionMatchModel, CompetitionModel, CompetitionTeamsModel, CountryModel, DraftModel, DraftPickModel, IterationModel, LeagueModel, LeagueSeasonModel, MatchModel, MatchRatingModel, MatchResultViewModel, MatchSetModel, MatchSetStatsModel, PerformanceStatsModel, PlayerModel, PlayerTeamModel, PlayerTraitModel, RallyModel, SetPositionModel, TeamModel, TraitModel, UserModel } from './models';
+import { CoachModel, CompetitionChampionModel, CompetitionMatchModel, CompetitionModel, CompetitionTeamsModel, CountryModel, DraftModel, DraftPickModel, IterationModel, LeagueModel, LeagueSeasonModel, MatchModel, MatchRatingModel, MatchResultModel, MatchSetModel, MatchSetStatsModel, PerformanceStatsModel, PlayerModel, PlayerTeamModel, PlayerTraitModel, RallyModel, SetPositionModel, TeamModel, TraitModel, UserModel } from './models';
 export function initModels(sequelize) {
     const Coach = CoachModel.initModel(sequelize);
     const Country = CountryModel.initModel(sequelize);
@@ -13,7 +13,7 @@ export function initModels(sequelize) {
     const LeagueSeason = LeagueSeasonModel.initModel(sequelize);
     const Match = MatchModel.initModel(sequelize);
     const MatchRating = MatchRatingModel.initModel(sequelize);
-    const MatchResultView = MatchResultViewModel.initModel(sequelize);
+    const MatchResult = MatchResultModel.initModel(sequelize);
     const MatchSet = MatchSetModel.initModel(sequelize);
     const MatchSetStats = MatchSetStatsModel.initModel(sequelize);
     const PerformanceStats = PerformanceStatsModel.initModel(sequelize);
@@ -69,9 +69,9 @@ export function initModels(sequelize) {
     Match.hasMany(MatchRating, { as: 'MatchRatings', foreignKey: 'match_id' });
     Match.hasMany(MatchSet, { as: 'MatchSets', foreignKey: 'match_id' });
     Match.hasOne(CompetitionMatch, { as: 'CompetitionMatch', foreignKey: 'match_id' });
-    Match.hasOne(MatchResultViewModel, { as: 'MatchResult', foreignKey: 'match_id' });
-    MatchResultView.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
-    MatchResultView.belongsTo(Team, { as: 'WinnerTeam', foreignKey: 'winner_team_id' });
+    Match.hasOne(MatchResult, { as: 'MatchResult', foreignKey: 'match_id' });
+    MatchResult.belongsTo(Match, { as: 'Match', foreignKey: 'match_id' });
+    MatchResult.belongsTo(Team, { as: 'WinnerTeam', foreignKey: 'winner_team_id' });
     MatchRating.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
     MatchRating.belongsTo(Team, { as: 'team', foreignKey: 'team_id' });
     MatchSet.belongsTo(Match, { as: 'match', foreignKey: 'match_id' });
@@ -161,7 +161,7 @@ export function initModels(sequelize) {
     Team.hasMany(MatchRating, { as: 'MatchRatings', foreignKey: 'team_id' });
     Team.hasMany(PlayerTeam, { as: 'PlayerTeams', foreignKey: 'team_id' });
     Team.hasMany(Rally, { as: 'Rallies', foreignKey: 'serving_team' });
-    Team.hasMany(MatchResultView, { as: 'WonMatches', foreignKey: 'winner_team_id' });
+    Team.hasMany(MatchResult, { as: 'WonMatches', foreignKey: 'winner_team_id' });
     Trait.belongsToMany(Player, {
         as: 'Players',
         through: PlayerTrait,
@@ -184,6 +184,7 @@ export function initModels(sequelize) {
         LeagueSeason,
         Match,
         MatchRating,
+        MatchResult,
         MatchSet,
         MatchSetStats,
         PerformanceStats,

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

@@ -11,7 +11,7 @@ export * from './league';
 export * from './league-season';
 export * from './match';
 export * from './match-rating';
-export * from './match-result-view';
+export * from './match-result';
 export * from './match-set';
 export * from './match-set-stats';
 export * from './performance-stats';

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

@@ -11,7 +11,7 @@ export * from './league';
 export * from './league-season';
 export * from './match';
 export * from './match-rating';
-export * from './match-result-view';
+export * from './match-result';
 export * from './match-set';
 export * from './match-set-stats';
 export * from './performance-stats';

package/dist/esm/src/data/models/{match-result-view.d.ts → match-result.d.ts}

@@ -8,9 +8,9 @@ export interface MatchResultAttributes {
     winner_team_id: string | null;
 }
 export type MatchResultPk = 'match_id';
-export type MatchResultId = MatchResultViewModel[MatchResultPk];
+export type MatchResultId = MatchResultModel[MatchResultPk];
 export type MatchResultCreationAttributes = MatchResultAttributes;
-export declare class MatchResultViewModel extends Model<MatchResultAttributes, MatchResultCreationAttributes> implements MatchResultAttributes {
+export declare class MatchResultModel extends Model<MatchResultAttributes, MatchResultCreationAttributes> implements MatchResultAttributes {
     match_id: string;
     home_score: number;
     away_score: number;
@@ -23,5 +23,5 @@ export declare class MatchResultViewModel extends Model<MatchResultAttributes, M
     getWinnerTeam: Sequelize.BelongsToGetAssociationMixin<TeamModel>;
     setWinnerTeam: Sequelize.BelongsToSetAssociationMixin<TeamModel, TeamId>;
     createWinnerTeam: Sequelize.BelongsToCreateAssociationMixin<TeamModel>;
-    static initModel(sequelize: Sequelize.Sequelize): typeof MatchResultViewModel;
+    static initModel(sequelize: Sequelize.Sequelize): typeof MatchResultModel;
 }

package/dist/esm/src/data/models/{match-result-view.js → match-result.js}

@@ -1,7 +1,7 @@
 import { DataTypes, Model } from 'sequelize';
-export class MatchResultViewModel extends Model {
+export class MatchResultModel extends Model {
     static initModel(sequelize) {
-        return MatchResultViewModel.init({
+        return MatchResultModel.init({
             match_id: {
                 type: DataTypes.UUID,
                 allowNull: false,
@@ -25,7 +25,7 @@ export class MatchResultViewModel extends Model {
             schema: 'public',
             timestamps: false,
             indexes: [{
-                    name: 'MatchResultView_pk',
+                    name: 'MatchResult_pk',
                     unique: true,
                     fields: [{ name: 'match_id' }]
                 }]

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

@@ -1,7 +1,7 @@
 import * as Sequelize from 'sequelize';
 import { Model } from 'sequelize';
-import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultViewModel, MatchSetAttributes, MatchSetId, MatchSetModel, TeamId, TeamModel } from '.';
 import { Status } from '../common';
+import { CompetitionMatchId, CompetitionMatchModel, MatchRatingId, MatchRatingModel, MatchResultId, MatchResultModel, MatchSetAttributes, MatchSetId, MatchSetModel, TeamId, TeamModel } from '.';
 export interface MatchAttributes {
     match_id: string;
     home_team: string;
@@ -23,10 +23,10 @@ export declare class MatchModel extends Model<MatchAttributes, MatchCreationAttr
     getCompetitionMatch: Sequelize.HasOneGetAssociationMixin<CompetitionMatchModel>;
     setCompetitionMatch: Sequelize.HasOneSetAssociationMixin<CompetitionMatchModel, CompetitionMatchId>;
     createCompetitionMatch: Sequelize.HasOneCreateAssociationMixin<CompetitionMatchModel>;
-    MatchResultView: MatchResultViewModel;
-    getMatchResultView: Sequelize.HasOneGetAssociationMixin<MatchResultViewModel>;
-    setMatchResultView: Sequelize.HasOneSetAssociationMixin<MatchResultViewModel, MatchResultId>;
-    createMatchResultView: Sequelize.HasOneCreateAssociationMixin<MatchResultViewModel>;
+    MatchResult: MatchResultModel;
+    getMatchResult: Sequelize.HasOneGetAssociationMixin<MatchResultModel>;
+    setMatchResult: Sequelize.HasOneSetAssociationMixin<MatchResultModel, MatchResultId>;
+    createMatchResult: Sequelize.HasOneCreateAssociationMixin<MatchResultModel>;
     MatchRatings: MatchRatingModel[];
     getMatchRatings: Sequelize.HasManyGetAssociationsMixin<MatchRatingModel>;
     setMatchRatings: Sequelize.HasManySetAssociationsMixin<MatchRatingModel, MatchRatingId>;

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

@@ -20,9 +20,9 @@ function transformToObject(model) {
         scheduledDate: new Date(model.scheduled_date),
         sets,
         status: model.status,
-        homeScore: model.MatchResultView?.home_score,
-        awayScore: model.MatchResultView?.away_score,
-        winner: model.MatchResultView?.WinnerTeam != null ? transformToTeam(model.MatchResultView.WinnerTeam) : undefined
+        homeScore: model.MatchResult?.home_score,
+        awayScore: model.MatchResult?.away_score,
+        winner: model.MatchResult?.WinnerTeam != null ? transformToTeam(model.MatchResult.WinnerTeam) : undefined
     });
 }
 export { transformToObject as transformToMatch, transformToAttributes as transformFromMatch };

package/package.json

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