@natrave/shared-entities 1.1.2 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @natrave/shared-entities
 
+## 1.1.3
+
+### Patch Changes
+
+- f2cdf1f: adicionado novo formato de partidas fora ou em casa, adicionado logica de estagio da
+  partida e indicacao de round e mudanca das regras do campeonato para expectedTeams ao inves de
+  minTeams e maxTeams"
+- da171c8: refactor: substitui flags booleanas por enums de modo de disputa e permite
+  knockoutMatchMode ser null
+
 ## 1.1.2
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@natrave/shared-entities",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Entidades compartilhadass da NaTrave",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -25,13 +25,13 @@
   "devDependencies": {
     "@changesets/cli": "^2.28.1",
     "@eslint/js": "^9.23.0",
-    "@typescript-eslint/eslint-plugin": "^8.27.0",
-    "@typescript-eslint/parser": "^8.27.0",
+    "@typescript-eslint/eslint-plugin": "^8.28.0",
+    "@typescript-eslint/parser": "^8.28.0",
     "eslint": "^9.23.0",
     "eslint-config-prettier": "^10.1.1",
-    "eslint-import-resolver-typescript": "^4.2.2",
+    "eslint-import-resolver-typescript": "^4.2.3",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-prettier": "^5.2.4",
+    "eslint-plugin-prettier": "^5.2.5",
     "eslint-plugin-unused-imports": "^4.1.4",
     "husky": "^9.1.7",
     "lint-staged": "^15.5.0",
@@ -39,7 +39,7 @@
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "@natrave/tournaments-service-types": "^1.1.0",
+    "@natrave/tournaments-service-types": "^1.1.4",
     "reflect-metadata": "^0.2.2",
     "typeorm": "^0.3.21"
   },

package/src/tournaments/tournament-format-configs/tournament-format-config.entity.ts

@@ -1,5 +1,6 @@
 import {
   KnockoutPhase,
+  MatchLegMode,
   TournamentFormat,
   type ITournamentFormatConfig,
 } from '@natrave/tournaments-service-types';
@@ -38,17 +39,45 @@ export class TournamentFormatConfig implements ITournamentFormatConfig {
   @Column({ type: 'enum', enum: TournamentFormat })
   format: TournamentFormat;
 
-  @Column({ type: 'int', nullable: true })
-  numberOfGroups?: number;
+  @Column({ type: 'int', nullable: true, default: null })
+  numberOfGroups: number | null;
 
-  @Column({ name: 'is_group_home_and_away', type: 'boolean', default: false })
-  isGroupHomeAndAway?: boolean;
+  /**
+   * Modo de disputa na fase inicial do torneio (grupos ou round robin).
+   * Define se os jogos dessa fase serão disputados em ida única ou ida e volta.
+   * Caso não exista a fase de grupos ou round robin, deixamos como null
+   */
+  @Column({
+    name: 'initial_phase_match_mode',
+    type: 'enum',
+    enum: MatchLegMode,
+    nullable: true,
+    default: null,
+  })
+  initialPhaseMatchMode: MatchLegMode | null;
 
-  @Column({ name: 'knockout_start_phase', type: 'enum', enum: KnockoutPhase, nullable: true })
-  knockoutStartPhase?: KnockoutPhase;
+  @Column({
+    name: 'knockout_start_phase',
+    type: 'enum',
+    enum: KnockoutPhase,
+    nullable: true,
+    default: null,
+  })
+  knockoutStartPhase: KnockoutPhase | null;
 
-  @Column({ name: 'is_knockout_home_and_away', type: 'boolean', default: false })
-  isKnockoutHomeAndAway?: boolean;
+  /**
+   * Modo de disputa na fase knockout.
+   * Define se os jogos do knockout serão disputados em ida única ou ida e volta.
+   * Se o campeonato não tiver fase mata mata, deixamos como null
+   */
+  @Column({
+    name: 'knockout_match_mode',
+    type: 'enum',
+    enum: MatchLegMode,
+    nullable: true,
+    default: null,
+  })
+  knockoutMatchMode: MatchLegMode | null;
 
   @CreateDateColumn({ name: 'created_at', type: 'timestamptz' })
   createdAt: Date;

package/src/tournaments/tournament-matches/tournament-match.entity.ts

@@ -1,4 +1,4 @@
-import { ITournamentMatch } from '@natrave/tournaments-service-types';
+import { ITournamentMatch, TournamentMatchPhase } from '@natrave/tournaments-service-types';
 import {
   Entity,
   Column,
@@ -45,6 +45,25 @@ export class TournamentMatch implements ITournamentMatch {
   @Column({ name: 'match_date', type: 'timestamptz' })
   matchDate: Date;
 
+  /**
+   * Fase do torneio à qual a partida pertence.
+   *
+   * Pode representar uma fase de grupos (group_stage), round-robin, ou uma etapa do mata-mata
+   * (ex: round-of-16, quarter-final, semi-final, final).
+   * Esse campo é essencial para classificar e organizar as partidas dentro do contexto do torneio.
+   */
+  @Column({ type: 'enum', enum: TournamentMatchPhase })
+  phase: TournamentMatchPhase;
+
+  /**
+   * Indica a rodada ou o número do jogo dentro da fase.
+   *
+   * - Para fases de grupos ou round robin, representa o número da rodada.
+   * - Para fases knockout com jogos de ida e volta, indica se é o jogo de ida (1) ou de volta (2).
+   */
+  @Column({ name: 'round_indicator', type: 'int', default: 1 })
+  roundIndicator: number;
+
   @CreateDateColumn({ name: 'created_at', type: 'timestamptz' })
   createdAt: Date;
 

package/src/tournaments/tournament-rules/tournament-rule.entity.ts

@@ -22,7 +22,6 @@ import { Tournament } from 'tournaments/tournaments';
  * @public
  */
 @Entity('tournament_rules')
-@Check('CHK_TEAMS', '"max_teams" >= "min_teams"')
 @Check('CHK_PLAYERS_PER_TEAM', '"max_player_per_team" >= "min_player_per_team"')
 @Check('CHK_MIN_AGE', '"min_age" >= 0')
 @Check('CHK_MAX_AGE', '"max_age" IS NULL OR "max_age" > "min_age"')
@@ -45,11 +44,8 @@ export class TournamentRule implements ITournamentRule {
   @Column({ name: 'max_age', type: 'int', nullable: true })
   maxAge?: number;
 
-  @Column({ name: 'min_teams', type: 'int' })
-  minTeams: number;
-
-  @Column({ name: 'max_teams', type: 'int' })
-  maxTeams: number;
+  @Column({ name: 'expected_teams', type: 'int' })
+  expectedTeams: number;
 
   @Column({ type: 'varchar', length: 255, nullable: true })
   notes?: string;