Add Match and MatchParticipant

package.json

@@ -9,7 +9,8 @@
     "start": "node dist/src/server.js --omit=dev",
     "test": "tsc",
     "lint": "eslint .",
-    "format": "prettier --write ."
+    "format": "prettier --write .",
+    "import-all-matches": "tsx src/runImportAllTournaments.ts"
   },
   "keywords": [],
   "author": "",

prisma/schema.prisma

@@ -1,6 +1,6 @@
 generator client {
-  provider = "prisma-client-js"
-  engineType   = "binary"
+  provider   = "prisma-client-js"
+  engineType = "binary"
 }
 
 datasource db {
@@ -26,14 +26,99 @@ model FeatureToggle {
   enabled Boolean @default(true)
 }
 
-model TeamMatchData {
-  key           String        @id
+model Match {
+  key           String    @id
   tournamentKey String
-  matchNumber   Int           @db.SmallInt
-  teamNumber    Int
-  matchType     MatchType
-  scoutReports  ScoutReport[]
-  tournament    Tournament    @relation(fields: [tournamentKey], references: [key], onDelete: Cascade)
+  year          Int
+  compLevel     MatchType
+  setNumber     Int
+  matchNumber   Int
+  scheduledTime DateTime?
+  actualTime    DateTime?
+  redScore      Int?
+  blueScore     Int?
+  rawTba        String
+  createdAt     DateTime  @default(now())
+  updatedAt     DateTime  @updatedAt
+
+  tournament   Tournament                  @relation(fields: [tournamentKey], references: [key], onDelete: Cascade)
+  participants MatchParticipant[]
+  breakdowns   OfficialAllianceBreakdown[]
+  videos       MatchVideo[]
+
+  @@index([tournamentKey, compLevel, matchNumber])
+}
+
+model MatchParticipant {
+  matchKey     String
+  teamNumber   Int
+  alliance     AllianceColor
+  station      Int
+  teamMatchKey String?       @unique
+
+  match         Match          @relation(fields: [matchKey], references: [key], onDelete: Cascade)
+  teamMatchData TeamMatchData? @relation(fields: [teamMatchKey], references: [key])
+
+  @@id([matchKey, teamNumber])
+  @@index([teamNumber])
+}
+
+model OfficialAllianceBreakdown {
+  matchKey String
+  alliance AllianceColor
+
+  // autoCoralCount   Int?
+  // autoCoralPoints  Int?
+  // teleopCoralCount Int?
+  // teleopCoralPoints Int?
+
+  // autoL1 Int?
+  // autoL2 Int?
+  // autoL3 Int?
+  // autoL4 Int?
+
+  // teleopL1 Int?
+  // teleopL2 Int?
+  // teleopL3 Int?
+  // teleopL4 Int?
+
+  isConsistent Boolean?
+  raw          Json
+  fetchedAt    DateTime @default(now())
+  updatedAt    DateTime @updatedAt
+
+  match Match @relation(fields: [matchKey], references: [key], onDelete: Cascade)
+
+  @@id([matchKey, alliance])
+}
+
+model MatchVideo {
+  uuid        String   @id @default(uuid())
+  matchKey    String
+  type        String
+  externalKey String
+  createdAt   DateTime @default(now())
+
+  match Match @relation(fields: [matchKey], references: [key], onDelete: Cascade)
+
+  @@unique([matchKey, type, externalKey])
+  @@index([matchKey])
+}
+
+enum AllianceColor {
+  RED
+  BLUE
+}
+
+model TeamMatchData {
+  key              String            @id
+  tournamentKey    String
+  matchNumber      Int               @db.SmallInt
+  teamNumber       Int
+  matchType        MatchType
+  scoutReports     ScoutReport[]
+  matchParticipant MatchParticipant?
+  tournament       Tournament        @relation(fields: [tournamentKey], references: [key], onDelete: Cascade)
 
   @@index([tournamentKey, teamNumber])
 }
@@ -197,6 +282,7 @@ model Tournament {
   location              String?
   date                  String?
   mutablePicklists      MutablePicklist[]
+  matches               Match[]
   scouterScheduleShifts ScouterScheduleShift[]
   teamMatchData         TeamMatchData[]
   latestFetchETag       String?
@@ -234,6 +320,15 @@ model CachedAnalysis {
   tournamentDependencies String[] @default([])
 }
 
+model DataFetch {
+  key         String    @id
+  etag        String?
+  createdAt   DateTime  @default(now())
+  lastTried   DateTime?
+  lastFetched DateTime?
+  data        String?
+}
+
 enum Position {
   LEFT_TRENCH
   LEFT_BUMP

railway.json

@@ -22,7 +22,7 @@
     "restartPolicyType": "ON_FAILURE",
     "restartPolicyMaxRetries": 20,
     "healthcheckPath": "/status",
-    "healthcheckTimeout": 1000
+    "healthcheckTimeout": 30000
   },
 
   "environments": {

src/app.ts

@@ -11,6 +11,8 @@ import posthogReporter from "./lib/middleware/posthogMiddleware.js";
 
 import routes from "./routes/index.js";
 import path from "path";
+import importAllTournaments from "./lib/importAllTournaments.js";
+import { requireAuth } from "./lib/middleware/requireAuth.js";
 
 export const app = express();
 
@@ -44,3 +46,8 @@ app.use("/v1", routes); //theo was here
 app.get("/status", (req, res) => {
   res.status(200).send("Server running");
 });
+
+app.get("/import", requireAuth, async (req, res) => {
+  await importAllTournaments();
+  res.status(200).send("Import complete");
+});

src/handler/analysis/picklist/picklistShell.ts

@@ -1,6 +1,6 @@
 import prismaClient from "../../../prismaClient.js";
 import z from "zod";
-import { addTournamentMatches } from "../../manager/addTournamentMatches.js";
+import { importTournamentMatches } from "../../../lib/importTournamentMatches.js";
 import {
   Metric,
   metricsCategory,
@@ -122,7 +122,7 @@ export const picklistShell = createAnalysisHandler({
       },
     });
     if (!matches) {
-      await addTournamentMatches(query.tournamentKey);
+      await importTournamentMatches(query.tournamentKey);
     }
 
     // Teams to look at

src/handler/analysis/predictions/qualRankingPredictionLogic.ts

@@ -5,7 +5,7 @@ import { User } from "@prisma/client";
 import { alliancePage } from "./alliancePage.js";
 import z from "zod";
 import { runAnalysis } from "../analysisFunction.js";
-import { addTournamentMatches } from "../../manager/addTournamentMatches.js";
+import { importTournamentMatches } from "../../../lib/importTournamentMatches.js";
 
 type TeamRanking = {
   teamNumber: number;
@@ -46,7 +46,7 @@ const config = {
     let matchesResponse = null;
     let teamsResponse = null;
 
-    await addTournamentMatches(args.tournamentKey);
+    await importTournamentMatches(args.tournamentKey);
 
     const url = "https://www.thebluealliance.com/api/v3";
     try {