Revert "Remove is_past from database and dynamically calculate value form current time"

This reverts commit fd713d2.

Author: chamika

worker/migrations/0001_remove_is_past.sql

@@ -19,6 +19,7 @@ CREATE TABLE IF NOT EXISTS fixtures (
   home_team TEXT NOT NULL,
   away_team TEXT NOT NULL,
   venue TEXT,
+  is_past INTEGER DEFAULT 0,
   created_at INTEGER NOT NULL,
   FOREIGN KEY (team_id) REFERENCES teams(id) ON DELETE CASCADE
 );

worker/migrations/README.md

@@ -99,24 +99,28 @@ describe('DatabaseService Integration Tests', () => {
 			expect(fixture.venue).toBe('Test Venue');
 		});
 
-		it('should create a fixture with all required fields', async () => {
-			const fixture = await db.createFixture(
+		it('should mark past fixtures correctly', async () => {
+			const pastFixture = await db.createFixture(
+				'team-123',
+				'2020-01-01',
+				'Jan 1 Wed 19:00',
+				'Home Team',
+				'Away Team'
+			);
+
+			expect(pastFixture.is_past).toBe(1);
+		});
+
+		it('should mark future fixtures correctly', async () => {
+			const futureFixture = await db.createFixture(
 				'team-123',
 				'2030-12-31',
 				'Dec 31 Wed 19:00',
 				'Home Team',
-				'Away Team',
-				'Test Venue'
+				'Away Team'
 			);
 
-			expect(fixture.id).toBeDefined();
-			expect(fixture.team_id).toBe('team-123');
-			expect(fixture.match_date).toBe('2030-12-31');
-			expect(fixture.day_time).toBe('Dec 31 Wed 19:00');
-			expect(fixture.home_team).toBe('Home Team');
-			expect(fixture.away_team).toBe('Away Team');
-			expect(fixture.venue).toBe('Test Venue');
-			expect(fixture.created_at).toBeDefined();
+			expect(futureFixture.is_past).toBe(0);
 		});
 
 		it('should get fixtures for a team', async () => {
@@ -129,6 +133,7 @@ describe('DatabaseService Integration Tests', () => {
 					home_team: 'Home Team 1',
 					away_team: 'Away Team 1',
 					venue: null,
+					is_past: 0,
 					created_at: Date.now()
 				},
 				{
@@ -139,6 +144,7 @@ describe('DatabaseService Integration Tests', () => {
 					home_team: 'Home Team 2',
 					away_team: 'Away Team 2',
 					venue: 'Test Venue',
+					is_past: 0,
 					created_at: Date.now()
 				}
 			];
@@ -364,7 +370,7 @@ describe('DatabaseService Integration Tests', () => {
 			);
 
 			expect(fixture.id).toBeDefined();
-			expect(fixture.match_date).toBe('2026-01-15');
+			expect(fixture.is_past).toBe(0);
 
 			// Create availability
 			await db.createAvailability(fixture.id, player1.id, true);
@@ -390,6 +396,7 @@ describe('DatabaseService Integration Tests', () => {
 				home_team: 'Home United',
 				away_team: 'Away City',
 				venue: 'Test Venue',
+				is_past: 0,
 				created_at: Date.now()
 			};
 
@@ -426,11 +433,12 @@ describe('DatabaseService Integration Tests', () => {
 			mockD1.prepare = () => ({
 				bind: (...params: any[]) => {
 					// Verify update was called with correct parameters
-					if (params.length === 3) {
+					if (params.length === 4) {
 						updateCalled = true;
 						expect(params[0]).toBe('2026-04-20'); // match_date
 						expect(params[1]).toBe('Apr 20 19:00'); // day_time
-						expect(params[2]).toBe(fixtureId);
+						expect(params[2]).toBe(0); // is_past (future date)
+						expect(params[3]).toBe(fixtureId);
 					}
 					return {
 						run: async () => ({ success: true })
@@ -443,6 +451,26 @@ describe('DatabaseService Integration Tests', () => {
 			expect(updateCalled).toBe(true);
 		});
 
+		it('should mark fixture as past when updating to past date', async () => {
+			const fixtureId = 'fixture-123';
+			let isPastValue: number | null = null;
+
+			mockD1.prepare = () => ({
+				bind: (...params: any[]) => {
+					if (params.length === 4) {
+						isPastValue = params[2]; // is_past parameter
+					}
+					return {
+						run: async () => ({ success: true })
+					};
+				}
+			});
+
+			await db.updateFixtureDate(fixtureId, '2025-01-01', 'Jan 1 20:00');
+
+			expect(isPastValue).toBe(1);
+		});
+
 		it('should clear availability for fixture', async () => {
 			const fixtureId = 'fixture-123';
 			let deleteCalled = false;
@@ -477,6 +505,7 @@ describe('DatabaseService Integration Tests', () => {
 				home_team: 'Home Team',
 				away_team: 'Away Team',
 				venue: null,
+				is_past: 0,
 				created_at: Date.now()
 			};
 

worker/schema.sql

@@ -1,5 +1,5 @@
-import type { Env, Team, FixtureRow, Player, Availability, FinalSelection } from './types';
-import { generateUUID, now } from './utils';
+import type { Env, Team, Fixture, Player, Availability, FinalSelection } from './types';
+import { generateUUID, now, isPastDate } from './utils';
 
 /**
  * Database service for D1 operations
@@ -52,16 +52,17 @@ export class DatabaseService {
     homeTeam: string,
     awayTeam: string,
     venue?: string
-  ): Promise<FixtureRow> {
+  ): Promise<Fixture> {
     const id = generateUUID();
     const timestamp = now();
+    const isPast = isPastDate(matchDate) ? 1 : 0;
 
     await this.db
       .prepare(`
-        INSERT INTO fixtures (id, team_id, match_date, day_time, home_team, away_team, venue, created_at)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+        INSERT INTO fixtures (id, team_id, match_date, day_time, home_team, away_team, venue, is_past, created_at)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
       `)
-      .bind(id, teamId, matchDate, dayTime, homeTeam, awayTeam, venue || null, timestamp)
+      .bind(id, teamId, matchDate, dayTime, homeTeam, awayTeam, venue || null, isPast, timestamp)
       .run();
 
     return {
@@ -72,41 +73,44 @@ export class DatabaseService {
       home_team: homeTeam,
       away_team: awayTeam,
       venue: venue || null,
+      is_past: isPast,
       created_at: timestamp
     };
   }
 
-  async getFixtures(teamId: string): Promise<FixtureRow[]> {
+  async getFixtures(teamId: string): Promise<Fixture[]> {
     const result = await this.db
       .prepare('SELECT * FROM fixtures WHERE team_id = ? ORDER BY match_date ASC')
       .bind(teamId)
-      .all<FixtureRow>();
+      .all<Fixture>();
 
     return result.results || [];
   }
 
-  async getFixture(fixtureId: string): Promise<FixtureRow | null> {
+  async getFixture(fixtureId: string): Promise<Fixture | null> {
     const result = await this.db
       .prepare('SELECT * FROM fixtures WHERE id = ?')
       .bind(fixtureId)
-      .first<FixtureRow>();
+      .first<Fixture>();
 
     return result;
   }
 
-  async getFixtureByTeams(teamId: string, homeTeam: string, awayTeam: string): Promise<FixtureRow | null> {
+  async getFixtureByTeams(teamId: string, homeTeam: string, awayTeam: string): Promise<Fixture | null> {
     const result = await this.db
       .prepare('SELECT * FROM fixtures WHERE team_id = ? AND home_team = ? AND away_team = ?')
       .bind(teamId, homeTeam, awayTeam)
-      .first<FixtureRow>();
+      .first<Fixture>();
 
     return result;
   }
 
   async updateFixtureDate(fixtureId: string, matchDate: string, dayTime: string): Promise<void> {
+    const isPast = isPastDate(matchDate) ? 1 : 0;
+
     await this.db
-      .prepare('UPDATE fixtures SET match_date = ?, day_time = ? WHERE id = ?')
-      .bind(matchDate, dayTime, fixtureId)
+      .prepare('UPDATE fixtures SET match_date = ?, day_time = ?, is_past = ? WHERE id = ?')
+      .bind(matchDate, dayTime, isPast, fixtureId)
       .run();
   }
 
@@ -235,13 +239,14 @@ export class DatabaseService {
     dayTime: string,
     playerIds: string[]
   ): Promise<void> {
+    const isPast = isPastDate(matchDate) ? 1 : 0;
     const timestamp = now();
 
     // Build batch of statements
     const statements = [
       // Update fixture date
-      this.db.prepare('UPDATE fixtures SET match_date = ?, day_time = ? WHERE id = ?')
-        .bind(matchDate, dayTime, fixtureId),
+      this.db.prepare('UPDATE fixtures SET match_date = ?, day_time = ?, is_past = ? WHERE id = ?')
+        .bind(matchDate, dayTime, isPast, fixtureId),
       // Clear availability
       this.db.prepare('DELETE FROM availability WHERE fixture_id = ?')
         .bind(fixtureId),
@@ -271,17 +276,18 @@ export class DatabaseService {
     awayTeam: string,
     venue: string | undefined,
     playerIds: string[]
-  ): Promise<FixtureRow> {
+  ): Promise<Fixture> {
     const fixtureId = generateUUID();
     const timestamp = now();
+    const isPast = isPastDate(matchDate) ? 1 : 0;
 
     // Build batch of statements
     const statements = [
       // Create fixture
       this.db.prepare(`
-        INSERT INTO fixtures (id, team_id, match_date, day_time, home_team, away_team, venue, created_at)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-      `).bind(fixtureId, teamId, matchDate, dayTime, homeTeam, awayTeam, venue || null, timestamp),
+        INSERT INTO fixtures (id, team_id, match_date, day_time, home_team, away_team, venue, is_past, created_at)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+      `).bind(fixtureId, teamId, matchDate, dayTime, homeTeam, awayTeam, venue || null, isPast, timestamp),
     ];
 
     // Add availability inserts for each player
@@ -304,6 +310,7 @@ export class DatabaseService {
       home_team: homeTeam,
       away_team: awayTeam,
       venue: venue || null,
+      is_past: isPast,
       created_at: timestamp
     };
   }