better better

3 files changed, 115 insertions, 26 deletions

diff --git a/src/lib/db/index.ts b/src/lib/db/index.ts
index 5c13f85..2212583 100644
--- a/src/lib/db/index.ts
+++ b/src/lib/db/index.ts
@@ -3,7 +3,7 @@ import { getDBOffset, wordFactorial } from "../utils";
 import type { AddSense, AddWord, Result, State } from "../types";
 import { DEFAULT_SRS } from "../services/srs";
 import { DBWord, WordData } from "@/zoom/logic/types";
-import { DeckResponse } from "../types/cards";
+import { CardResponse, DeckResponse } from "../types/cards";
 
 const PAGE_SIZE = 100;
 
@@ -506,6 +506,110 @@ class DatabaseHandler {
     `);
     return query.all({ cid, userid });
   }
+
+  /**
+   * Fetch a single card by ID with all related data
+   * @param cardId Card ID
+   * @param userId User ID
+   * @returns Card data with progress and expression information
+   */
+  fetchCardById(cardId: number, userId: number): Result<CardResponse> {
+    console.time("fetchCardById-total");
+
+    // Query to fetch card with expression and progress data
+    const query = this.db.query(`
+      SELECT 
+        cards.id as cid, cards.text, cards.note,
+        up.id as upid,
+        up.repetition_count,
+        up.ease_factor,
+        up.interval,
+        up.next_review_date,
+        up.last_reviewed,
+        up.is_mastered,
+        e.id as eid,
+        e.*,
+        (CASE WHEN bm.word_id IS NULL THEN 0 ELSE 1 END) as is_bookmarked,
+        (SELECT
+          json_group_array(json_object(
+            'pos', pos,
+            'senses', s.senses,
+            'forms', forms,
+            'etymology', etymology,
+            'related', related)
+          )
+          FROM senses s WHERE s.parent_id = e.id
+        ) as senses_array
+      FROM cards
+      JOIN cards_expressions ce ON cards.id = ce.card_id
+      JOIN expressions e ON e.id = ce.expression_id
+      LEFT JOIN user_progress up ON up.card_id = cards.id AND up.user_id = ?
+      LEFT JOIN bookmarks bm ON bm.word_id = e.id AND bm.user_id = ?
+      WHERE cards.id = ?
+    `);
+
+    const result = query.get(userId, userId, cardId);
+
+    if (!result) {
+      console.timeEnd("fetchCardById-total");
+      return { error: "Card not found" };
+    }
+
+    console.time("fetchCardById-json-processing");
+
+    // Process the row into a CardResponse object
+    const row: any = result;
+
+    // Process sense data
+    const sense_array = JSON.parse(row.senses_array);
+    const senses = sense_array.map((s: any) => {
+      const senses = JSON.parse(s.senses);
+      const related = JSON.parse(s.related);
+      const forms = JSON.parse(s.forms);
+      return { ...s, senses, related, forms };
+    });
+
+    // Create expression object
+    const expression = {
+      isBookmarked: row.is_bookmarked > 0,
+      ipa: JSON.parse(row.ipa),
+      prosody: JSON.parse(row.prosody),
+      syllables: row.syllables,
+      frequency: row.frequency,
+      type: row.type,
+      lang: row.lang,
+      spelling: row.spelling,
+      id: row.eid,
+      confidence: row.confidence,
+      senses,
+    };
+
+    // Create progress object (default if not exists)
+    const progress = !row.upid
+      ? DEFAULT_SRS
+      : {
+          repetitionCount: row.repetition_count,
+          easeFactor: row.ease_factor,
+          interval: row.interval,
+          nextReviewDate: row.next_review_date,
+          lastReviewed: row.last_reviewed,
+          isMastered: row.is_mastered,
+        };
+
+    // Create card response
+    const card = {
+      text: row.text,
+      note: row.note,
+      id: row.cid,
+      expression,
+      progress,
+    };
+
+    console.timeEnd("fetchCardById-json-processing");
+    console.timeEnd("fetchCardById-total");
+
+    return { ok: card };
+  }
   //
   // write
   //
diff --git a/src/lib/server/cookie.ts b/src/lib/server/cookie.ts
index 32894b9..80f8f9f 100644
--- a/src/lib/server/cookie.ts
+++ b/src/lib/server/cookie.ts
@@ -7,16 +7,14 @@ const cookieMiddleware: Middleware = () => {
     // Parse incoming cookies
     const cookies = cookie.parse(ctx.req.headers.cookie || "");
     const coki = cookies.sorlang;
-    
+
     // If cookie exists, fetch user data and set in context
     if (coki) {
       const userRow = db.fetchCookie(coki);
-      if (userRow) {
-        ctx.data.user = { id: userRow.id, name: userRow.name };
-        console.log("User authenticated:", userRow.name);
-      }
+      if (userRow) ctx.data.user = { id: userRow.id, name: userRow.name };
+      // console.log("User authenticated:", userRow.name);
     }
-    
+
     // Uncomment to enable redirection for unauthenticated users
     /*
     if (!ctx.data.user && ctx.req.url.pathname !== "/login") {
@@ -27,9 +25,9 @@ const cookieMiddleware: Middleware = () => {
       return;
     }
     */
-    
+
     await next();
-    
+
     // Cookie setting is now handled by setCookieMiddleware
   };
 };
diff --git a/src/lib/services/srs_study.ts b/src/lib/services/srs_study.ts
index 9223722..0930795 100644
--- a/src/lib/services/srs_study.ts
+++ b/src/lib/services/srs_study.ts
@@ -309,27 +309,14 @@ export class SRSStudyService {
     // Record the attempt
     this.recordAttempt(userId, cardId, accuracy > 0.6 ? 1 : 0, reviewTime);
 
-    // Fetch updated card data
-    const updatedDeckResponse = this.db.fetchLesson({
-      userId,
-      lessonId: 0, // We don't care about lesson context here
-      count: 1,
-      page: 1,
-    });
+    // Fetch updated card data using the fetchCardById method
+    const updatedCardResponse = this.db.fetchCardById(cardId, userId);
 
-    if ("error" in updatedDeckResponse) {
+    if ("error" in updatedCardResponse) {
       return { error: "Failed to fetch updated card data" };
     }
 
-    // Find the updated card
-    const updatedCard = updatedDeckResponse.ok.cards.find(
-      (c) => c.id === cardId,
-    );
-    if (!updatedCard) {
-      return { error: "Failed to retrieve updated card" };
-    }
-
-    return updatedCard;
+    return updatedCardResponse.ok;
   }
 
   /**