Merge branch 'jak103:main' into main

app/src/models/AuditLog.ts

@@ -1,13 +1,14 @@
-import type { DbModel } from './DbModel'
+import { AuditLogId } from './ids'
 import type { User } from './index'
 
 /**
  * @unused We could use this if we need an admin frontend.
  */
-export interface AuditLog extends DbModel {
+export interface AuditLog {
   user: User
   action: string
   table: string
+  id: AuditLogId
 }
 
 export type { AuditLogId } from './ids'

app/src/models/Game.ts

@@ -1,5 +1,5 @@
-import { RosterId, SeasonId, TeamRecordId, UserId, VenueId } from './ids'
-import type { DbModel, Roster, TeamRecord, User, Venue } from './index'
+import { RosterId, SeasonId, TeamId, UserId, VenueId } from './ids'
+import type { DbModel, Roster, Team, User, Venue } from './index'
 import { TimeString } from './types/timeString'
 
 
@@ -17,28 +17,28 @@ export interface Game extends DbModel {
   status: GameStatus
 
   // TODO: This might change to home: { ... } and away: { ... }
-  home_team_record: TeamRecord
-  home_team_record_id: TeamRecordId
-  home_team_roster: Roster
-  home_team_roster_id: RosterId
+  home_team: Team
+  home_team_id: TeamId
+  home_team_roster?: Roster
+  home_team_roster_id?: RosterId
   home_team_locker_room: string
   home_team_shots_on_goal: number
   home_team_score: number
 
-  away_team_record: TeamRecord
-  away_team_record_id: TeamRecordId
-  away_team_roster: Roster
-  away_team_roster_id: RosterId
+  away_team: Team
+  away_team_id: TeamId
+  away_team_roster?: Roster
+  away_team_roster_id?: RosterId
   away_team_locker_room: string
   away_team_shots_on_goal: number
   away_team_score: number
 
-  score_keeper: User
-  score_keeper_id: UserId
-  primary_referee: User
-  primary_referee_id: UserId
-  secondary_referee: User
-  secondary_referee_id: UserId
+  score_keeper?: User
+  score_keeper_id?: UserId
+  primary_referee?: User
+  primary_referee_id?: UserId
+  secondary_referee?: User
+  secondary_referee_id?: UserId
 }
 
 export type { GameId } from './ids'

app/src/models/Goals.ts

@@ -1,16 +1,16 @@
-import type { DbModel, Game, TeamRecord } from './index'
-import type { UserId, GameId, TeamRecordId } from './ids'
+import type { DbModel, Game, Team } from './index'
+import type { UserId, GameId, TeamId } from './ids'
 
 export interface Goals extends DbModel {
   user_id: UserId
   game_id: GameId
   game: Game
-  team_record_id: TeamRecordId
-  team_record: TeamRecord
+  team_id: TeamId
+  team: Team
   duration: number
   period: number
   assist1_id: UserId
   assist2_id: UserId
-  player_differential: number
-  is_penalty_shot: boolean
+  playerdifferential: number
+  ispenaltyshot: boolean
 }

app/src/models/League.ts

@@ -0,0 +1,11 @@
+import type { DbModel, Team } from './index'
+import type { LeagueGuid, SeasonId } from './ids'
+
+export interface League extends DbModel {
+  correlation_id: LeagueGuid
+  season_id: SeasonId
+  name: string
+  teams: Array<Team>
+}
+
+export type { LeagueId, LeagueGuid } from './ids'

app/src/models/Logo.ts

@@ -1,2 +1 @@
 export type Logo = HTMLImageElement
-export type { LogoId } from './ids'

app/src/models/Penalty.ts

@@ -1,4 +1,4 @@
-import type { GameId, PenaltyTypeId, TeamRecordId, UserId } from './ids'
+import type { GameId, PenaltyTypeId, TeamId, UserId } from './ids'
 import type { DbModel, User } from './index'
 
 export interface PenaltyType extends DbModel {
@@ -11,10 +11,11 @@ export interface PenaltyType extends DbModel {
 
 export interface Penalty extends DbModel {
   player_id: UserId
-  team_id: TeamRecordId
+  team_id: TeamId
   game_id: GameId
   period: number
-  game_time: number
+  /** Penalty.duration === game time */
+  duration: number
   created_by: UserId
   penalty_type: PenaltyType
   penalty_type_id: PenaltyTypeId

app/src/models/Roster.ts

@@ -2,7 +2,7 @@ import type { DbModel, User } from './index'
 import type { UserId } from './ids'
 
 export interface Roster extends DbModel {
-  players: Array<User>
+  players?: Array<User>
   captain: User
   captain_id: UserId
 }

app/src/models/Season.ts

@@ -1,13 +1,13 @@
 import type { TimeString } from './types/timeString'
-import type { DbModel, Registration, Game, LeagueRecord } from './index'
+import type { DbModel, Registration, Game, League } from './index'
 
 export interface Season extends DbModel {
   name: string
   start: TimeString
   end: TimeString
   registrations: Array<Registration>
   schedule: Array<Game>
-  leagues: Array<LeagueRecord>
+  leagues: Array<League>
 }
 
 export type { SeasonId } from './ids'

app/src/models/ShotOnGoal.ts

@@ -1,9 +1,9 @@
 import type { DbModel } from './index'
-import type { GameId, TeamRecordId, UserId } from './ids'
+import type { GameId, TeamId, UserId } from './ids'
 
 export interface ShotOnGoal extends DbModel {
   game_id: GameId
-  team_id: TeamRecordId
+  team_id: TeamId
   shot_time: number
   scorekeeper: UserId
 }

app/src/models/Team.ts

@@ -0,0 +1,17 @@
+import type { DbModel, League, Roster } from './index'
+import type { LeagueId, LogoId, RosterId, TeamGuid } from './ids'
+
+export interface Team extends DbModel {
+  correlation_id: TeamGuid
+  name: string
+  logo_id: LogoId
+  color: string
+  league_id: LeagueId
+  league: League
+  roster?: Roster
+  roster_id?: RosterId
+  wins: number
+  losses: number
+}
+
+export type { TeamId, TeamGuid } from './ids'

app/src/models/User.ts

@@ -1,4 +1,4 @@
-import type { DbModel, TeamRecord } from './index'
+import type { DbModel, Team } from './index'
 import type { Role } from './KeyRecord'
 import type { TimeString } from './types/timeString'
 
@@ -9,7 +9,7 @@ export interface User extends DbModel {
   phone: string
   roles: Array<Role>
   skill_level: number
-  current_teams: Array<TeamRecord>
+  current_teams: Array<Team>
   /** dob === Date of Birth */
   dob: TimeString
 }

app/src/models/ids.ts

@@ -8,7 +8,7 @@ export type PenaltyTypeId = Branded<unknown, 'penalty_type_id'>
 export type RegistrationId = Branded<unknown, 'registration_id'>
 export type LogoId = Branded<unknown, 'logo_id'>
 export type AuditLogId = Branded<unknown, 'audit_log_id'>
-export type LeagueRecordId = Branded<unknown, 'league_record_id'>
-export type TeamRecordId = Branded<unknown, 'team_record_id'>
+export type LeagueId = Branded<unknown, 'league_id'>
+export type TeamId = Branded<unknown, 'team_id'>
 export type LeagueGuid = Branded<unknown, 'league_guid'>
 export type TeamGuid = Branded<unknown, 'team_guid'>

app/src/models/index.ts

@@ -3,15 +3,15 @@ export type { DbModel } from './DbModel'
 export type { Game, GameStatus } from './Game'
 export type { Goals } from './Goals'
 export type { KeyRecord, Role } from './KeyRecord'
-export type { LeagueRecord } from './LeagueRecord'
+export type { League } from './League'
 export type { Logo } from './Logo'
 export type { NotificationSubscription, NotifTopic } from './NotificationSubscription'
 export type { Penalty, PenaltyType } from './Penalty'
 export type { Registration } from './Registration'
 export type { Roster } from './Roster'
 export type { Season } from './Season'
 export type { ShotOnGoal } from './ShotOnGoal'
-export type { TeamRecord } from './TeamRecord'
+export type { Team } from './Team'
 export type { User } from './User'
 export type { Venue } from './Venue'
 

backend/internal/models/shotongoal.go

@@ -5,7 +5,7 @@ type ShotOnGoal struct {
 	GameId      uint `json:"game_id" gorm:"not_null"`
 	TeamId      uint `json:"team_id" gorm:"not_null"`
 	ShotTime    uint `json:"shot_time" gorm:"not_null"`
-	Scorekeeper uint `json:"scorekeeper gorm:"not_null"`
+	Scorekeeper uint `json:"scorekeeper" gorm:"not_null"`
 }
 
 // Should overide GOs incorrect pluralization