@goscribe/server 1.1.2 → 1.1.4

package/dist/services/flashcard-progress.service.d.ts

@@ -94,7 +94,7 @@ export declare class FlashcardProgressService {
     /**
      * Get flashcards due for review, non-studied flashcards, and flashcards with low mastery
      */
-    getDueFlashcards(userId: string, workspaceId: string): Promise<({
+    getDueFlashcards(userId: string, workspaceId: string): Promise<(({
         artifact: {
             id: string;
             createdAt: Date;
@@ -119,6 +119,30 @@ export declare class FlashcardProgressService {
         front: string;
         back: string;
         tags: string[];
+    }) | {
+        artifact: {
+            id: string;
+            createdAt: Date;
+            updatedAt: Date;
+            title: string;
+            description: string | null;
+            workspaceId: string;
+            type: import("@prisma/client").$Enums.ArtifactType;
+            isArchived: boolean;
+            generating: boolean;
+            generatingMetadata: import("@prisma/client/runtime/library").JsonValue | null;
+            difficulty: import("@prisma/client").$Enums.Difficulty | null;
+            estimatedTime: string | null;
+            imageObjectKey: string | null;
+            createdById: string | null;
+        };
+        id: string;
+        createdAt: Date;
+        artifactId: string;
+        order: number;
+        front: string;
+        back: string;
+        tags: string[];
     })[]>;
     /**
      * Get user statistics for a flashcard set

package/dist/services/flashcard-progress.service.js

@@ -226,12 +226,23 @@ export class FlashcardProgressService {
     async getDueFlashcards(userId, workspaceId) {
         const now = new Date();
         const LOW_MASTERY_THRESHOLD = 50; // Consider mastery < 50 as low
-        // Get all flashcards in the workspace
+        // Get the latest artifact in the workspace
+        const latestArtifact = await this.db.artifact.findFirst({
+            where: {
+                workspaceId,
+                type: 'FLASHCARD_SET',
+            },
+            orderBy: {
+                updatedAt: 'desc',
+            },
+        });
+        if (!latestArtifact) {
+            return [];
+        }
+        // Get all flashcards from the latest artifact
         const allFlashcards = await this.db.flashcard.findMany({
             where: {
-                artifact: {
-                    workspaceId,
-                },
+                artifactId: latestArtifact.id,
             },
             include: {
                 artifact: true,
@@ -242,6 +253,7 @@ export class FlashcardProgressService {
                 },
             },
         });
+        console.log('allFlashcards', allFlashcards.length);
         const TAKE_NUMBER = (allFlashcards.length > 10) ? 10 : allFlashcards.length;
         // Get progress records for flashcards that are due or have low mastery
         const progressRecords = await this.db.flashcardProgress.findMany({
@@ -265,9 +277,7 @@ export class FlashcardProgressService {
                     }
                 ],
                 flashcard: {
-                    artifact: {
-                        workspaceId,
-                    },
+                    artifactId: latestArtifact.id,
                 },
             },
             include: {
@@ -279,6 +289,38 @@ export class FlashcardProgressService {
             },
             take: TAKE_NUMBER,
         });
+        console.log('TAKE_NUMBER', TAKE_NUMBER);
+        console.log('TAKE_NUMBER - progressRecords.length', TAKE_NUMBER - progressRecords.length);
+        console.log('progressRecords', progressRecords.map((progress) => progress.flashcard.id));
+        // Get flashcard IDs that already have progress records
+        const flashcardIdsWithProgress = new Set(progressRecords.map((progress) => progress.flashcard.id));
+        // Find flashcards without progress records (non-studied) to pad the results
+        const nonStudiedFlashcards = allFlashcards
+            .filter((flashcard) => !flashcardIdsWithProgress.has(flashcard.id))
+            .slice(0, TAKE_NUMBER - progressRecords.length);
+        // Create progress-like structures for non-studied flashcards
+        const progressRecordsPadding = nonStudiedFlashcards.map((flashcard) => {
+            const { progress, ...flashcardWithoutProgress } = flashcard;
+            return {
+                id: `temp-${flashcard.id}`,
+                userId,
+                flashcardId: flashcard.id,
+                timesStudied: 0,
+                timesCorrect: 0,
+                timesIncorrect: 0,
+                timesIncorrectConsecutive: 0,
+                easeFactor: 2.5,
+                interval: 0,
+                repetitions: 0,
+                masteryLevel: 0,
+                lastStudiedAt: null,
+                nextReviewAt: null,
+                flashcard: flashcardWithoutProgress,
+            };
+        });
+        console.log('progressRecordsPadding', progressRecordsPadding.length);
+        console.log('progressRecords', progressRecords.length);
+        const selectedCards = [...progressRecords, ...progressRecordsPadding];
         // Build result array: include progress records and non-studied flashcards
         const results = [];
         // Add flashcards with progress (due or low mastery)
@@ -286,30 +328,27 @@ export class FlashcardProgressService {
             results.push(progress);
         }
         // Sort by priority: due first (by nextReviewAt), then low mastery, then non-studied
-        results.sort((a, b) => {
-            // Due flashcards first (nextReviewAt <= now)
-            const aIsDue = a.nextReviewAt && a.nextReviewAt <= now;
-            const bIsDue = b.nextReviewAt && b.nextReviewAt <= now;
-            if (aIsDue && !bIsDue)
-                return -1;
-            if (!aIsDue && bIsDue)
-                return 1;
-            // Among due flashcards, sort by nextReviewAt
-            if (aIsDue && bIsDue && a.nextReviewAt && b.nextReviewAt) {
-                return a.nextReviewAt.getTime() - b.nextReviewAt.getTime();
-            }
-            // Then low mastery (lower mastery first)
-            if (a.masteryLevel !== b.masteryLevel) {
-                return a.masteryLevel - b.masteryLevel;
-            }
-            // Finally, non-studied (timesStudied === 0)
-            if (a.timesStudied === 0 && b.timesStudied !== 0)
-                return -1;
-            if (a.timesStudied !== 0 && b.timesStudied === 0)
-                return 1;
-            return 0;
-        });
-        return results.map((progress) => progress.flashcard);
+        // @todo: make an actual algorithm. research
+        // results.sort((a, b) => {
+        //   // Due flashcards first (nextReviewAt <= now)
+        //   const aIsDue = a.nextReviewAt && a.nextReviewAt <= now;
+        //   const bIsDue = b.nextReviewAt && b.nextReviewAt <= now;
+        //   // if (aIsDue && !bIsDue) return -1;
+        //   // if (!aIsDue && bIsDue) return 1;
+        //   // Among due flashcards, sort by nextReviewAt
+        //   if (aIsDue && bIsDue && a.nextReviewAt && b.nextReviewAt) {
+        //     return a.nextReviewAt.getTime() - b.nextReviewAt.getTime();
+        //   }
+        //   // Then low mastery (lower mastery first)
+        //   if (a.masteryLevel !== b.masteryLevel) {
+        //     return a.masteryLevel - b.masteryLevel;
+        //   }
+        //   // Finally, non-studied (timesStudied === 0)
+        //   if (a.timesStudied === 0 && b.timesStudied !== 0) return -1;
+        //   if (a.timesStudied !== 0 && b.timesStudied === 0) return 1;
+        //   return 0;
+        // });
+        return selectedCards.map((progress) => progress.flashcard);
     }
     /**
      * Get user statistics for a flashcard set

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goscribe/server",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@auth/express": "^0.11.0",
     "@auth/prisma-adapter": "^2.10.0",
-    "@goscribe/server": "^1.0.8",
+    "@goscribe/server": "^1.1.2",
     "@prisma/client": "^6.14.0",
     "@supabase/supabase-js": "^2.76.1",
     "@trpc/server": "^11.5.0",
@@ -42,6 +42,7 @@
     "pusher-js": "^8.4.0",
     "socket.io": "^4.8.1",
     "superjson": "^2.2.2",
+    "uuid": "^13.0.0",
     "zod": "^4.1.1"
   },
   "devDependencies": {