Fix new Copilot AI review comments

- Fix mock path mismatch in quizRepo.test.ts: mock now targets correct import path (app/repo/db)
- Replace hardcoded table names in adminRepo.ts with proper Drizzle SQL query
- Fix TypeScript error by replacing 'any' type with proper interface
- All 135 unit tests passing
- All linting and TypeScript checks passing
- Addresses all remaining Copilot AI review comments

Author: rgilks

app/repo/adminRepo.ts

@@ -10,19 +10,20 @@ export interface PaginatedTableData {
 }
 
 export const getAllTableNames = async (): Promise<string[]> => {
-  // For now, return a hardcoded list of known tables
-  // This avoids the raw SQL issue while maintaining functionality
-  const knownTables = [
-    'users',
-    'quiz',
-    'userLanguageProgress',
-    'questionFeedback',
-    'rateLimits',
-    'translationCache',
-    'aiApiUsage',
-  ];
+  try {
+    const db = await getDb();
+
+    // Use Drizzle's sql template to query SQLite system tables
+    const result = await db.all(sql`
+      SELECT name FROM sqlite_master
+      WHERE type='table' AND name NOT LIKE 'sqlite_%'
+    `);
 
-  return Promise.resolve(knownTables);
+    return result.map((row: { name: string }) => row.name);
+  } catch (error) {
+    console.error('[AdminRepository] Error fetching table names:', error);
+    throw error;
+  }
 };
 
 const validateTableName = async (tableName: string): Promise<void> => {

app/repo/quizRepo.test.ts

@@ -1,27 +1,9 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 
 // Mock the database
-vi.mock('app/lib/db', () => ({
+vi.mock('app/repo/db', () => ({
   default: vi.fn(),
   getDb: vi.fn(),
-  schema: {
-    quiz: {
-      id: 'id',
-      language: 'language',
-      level: 'level',
-      content: 'content',
-      createdAt: 'createdAt',
-      questionLanguage: 'questionLanguage',
-      userId: 'userId',
-    },
-    questionFeedback: {
-      id: 'id',
-      quizId: 'quizId',
-      userId: 'userId',
-      isGood: 'isGood',
-      submittedAt: 'submittedAt',
-    },
-  },
 }));
 
 describe('quizRepo', () => {
@@ -32,10 +14,10 @@ describe('quizRepo', () => {
   describe('getRandomGoodQuestion', () => {
     it('should handle database errors gracefully', async () => {
       const { getRandomGoodQuestion } = await import('app/repo/quizRepo');
-      const { getDb } = await import('app/lib/db');
+      const getDb = await import('app/repo/db');
 
       // Mock database error
-      vi.mocked(getDb).mockRejectedValue(new Error('Database error'));
+      vi.mocked(getDb.default).mockRejectedValue(new Error('Database error'));
 
       const result = await getRandomGoodQuestion('es', 'en', 'A1', 1, null);
 
@@ -44,7 +26,7 @@ describe('quizRepo', () => {
 
     it('should return undefined when no good questions found', async () => {
       const { getRandomGoodQuestion } = await import('app/repo/quizRepo');
-      const { getDb } = await import('app/lib/db');
+      const getDb = await import('app/repo/db');
 
       // Mock empty result
       const mockDb = {
@@ -55,7 +37,7 @@ describe('quizRepo', () => {
         orderBy: vi.fn().mockReturnThis(),
         limit: vi.fn().mockResolvedValue([]),
       };
-      vi.mocked(getDb).mockResolvedValue(mockDb as unknown);
+      vi.mocked(getDb.default).mockResolvedValue(mockDb as unknown);
 
       const result = await getRandomGoodQuestion('es', 'en', 'A1', 1, null);
 

migrations/0001_initial_schema.sql

@@ -1,80 +1,87 @@
 -- Initial schema migration for Comprehendo D1 database
 -- This migration creates all the required tables for the application
-
 CREATE TABLE IF NOT EXISTS quiz (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  language TEXT NOT NULL,
-  level TEXT NOT NULL,
-  content TEXT NOT NULL,
-  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-  question_language TEXT,
-  user_id INTEGER,
-  FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE SET NULL
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    language TEXT NOT NULL,
+    level TEXT NOT NULL,
+    content TEXT NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    question_language TEXT,
+    user_id INTEGER,
+    FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE
+    SET
+        NULL
 );
 
 CREATE TABLE IF NOT EXISTS users (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  provider_id TEXT NOT NULL,
-  provider TEXT NOT NULL,
-  name TEXT,
-  email TEXT,
-  image TEXT,
-  first_login TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-  last_login TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-  language TEXT DEFAULT 'en',
-  UNIQUE(provider_id, provider)
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    provider_id TEXT NOT NULL,
+    provider TEXT NOT NULL,
+    name TEXT,
+    email TEXT,
+    image TEXT,
+    first_login TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    last_login TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    language TEXT DEFAULT 'en',
+    UNIQUE(provider_id, provider)
 );
 
 CREATE TABLE IF NOT EXISTS user_language_progress (
-  user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-  language_code TEXT NOT NULL,
-  cefr_level TEXT NOT NULL DEFAULT 'A1',
-  correct_streak INTEGER NOT NULL DEFAULT 0,
-  last_practiced TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (user_id, language_code)
+    user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    language_code TEXT NOT NULL,
+    cefr_level TEXT NOT NULL DEFAULT 'A1',
+    correct_streak INTEGER NOT NULL DEFAULT 0,
+    last_practiced TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (user_id, language_code)
 );
 
 CREATE TABLE IF NOT EXISTS question_feedback (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  quiz_id INTEGER NOT NULL,
-  user_id INTEGER NOT NULL,
-  is_good INTEGER NOT NULL,
-  user_answer TEXT,
-  is_correct INTEGER,
-  submitted_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (quiz_id) REFERENCES quiz (id) ON DELETE CASCADE,
-  FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    quiz_id INTEGER NOT NULL,
+    user_id INTEGER NOT NULL,
+    is_good INTEGER NOT NULL,
+    user_answer TEXT,
+    is_correct INTEGER,
+    submitted_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (quiz_id) REFERENCES quiz (id) ON DELETE CASCADE,
+    FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
 );
 
 CREATE TABLE IF NOT EXISTS rate_limits (
-  ip_address TEXT PRIMARY KEY,
-  request_count INTEGER NOT NULL DEFAULT 1,
-  window_start_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+    ip_address TEXT PRIMARY KEY,
+    request_count INTEGER NOT NULL DEFAULT 1,
+    window_start_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
 CREATE TABLE IF NOT EXISTS translation_cache (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  source_word TEXT NOT NULL,
-  source_language TEXT NOT NULL,
-  target_language TEXT NOT NULL,
-  translated_text TEXT NOT NULL,
-  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE(source_word, source_language, target_language)
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    source_word TEXT NOT NULL,
+    source_language TEXT NOT NULL,
+    target_language TEXT NOT NULL,
+    translated_text TEXT NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE(source_word, source_language, target_language)
 );
 
 CREATE TABLE IF NOT EXISTS ai_api_usage (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  date TEXT NOT NULL,
-  request_count INTEGER NOT NULL DEFAULT 0,
-  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-  UNIQUE(date)
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    date TEXT NOT NULL,
+    request_count INTEGER NOT NULL DEFAULT 0,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE(date)
 );
 
 -- Create indexes for better performance
 CREATE INDEX IF NOT EXISTS idx_quiz_created_at ON quiz(created_at DESC);
+
 CREATE INDEX IF NOT EXISTS idx_users_last_login ON users(last_login DESC);
+
 CREATE INDEX IF NOT EXISTS idx_user_language_progress_last_practiced ON user_language_progress(last_practiced DESC);
+
 CREATE INDEX IF NOT EXISTS idx_question_feedback_quiz_id ON question_feedback (quiz_id);
+
 CREATE INDEX IF NOT EXISTS idx_question_feedback_user_id ON question_feedback (user_id);
+
 CREATE INDEX IF NOT EXISTS idx_translation_cache_lookup ON translation_cache(source_word, source_language, target_language);
-CREATE INDEX IF NOT EXISTS idx_ai_api_usage_date ON ai_api_usage(date);
+
+CREATE INDEX IF NOT EXISTS idx_ai_api_usage_date ON ai_api_usage(date);