@vue-skuilder/db 0.1.18 → 0.1.21

package/tests/core/navigators/CompositeGenerator.test.ts

@@ -1,8 +1,11 @@
-import { describe, it, expect } from 'vitest';
-import CompositeGenerator, { AggregationMode } from '../../../src/core/navigators/CompositeGenerator';
+import { describe, it, expect, vi } from 'vitest';
+import CompositeGenerator, {
+  AggregationMode,
+} from '../../../src/core/navigators/generators/CompositeGenerator';
 import { ContentNavigator, WeightedCard } from '../../../src/core/navigators/index';
-import { StudySessionNewItem, StudySessionReviewItem } from '../../../src/core';
-import { ScheduledCard } from '../../../src/core/types/user';
+import { GeneratorContext } from '../../../src/core/navigators/generators/types';
+import { UserDBInterface } from '../../../src/core/interfaces/userDB';
+import { CourseDBInterface } from '../../../src/core/interfaces/courseDB';
 
 // Test helper to create weighted cards with provenance
 function makeWeightedCard(
@@ -31,39 +34,45 @@ function makeWeightedCard(
 
 // Mock ContentNavigator for testing
 class MockGenerator extends ContentNavigator {
+  name: string = 'MockGenerator';
   private mockWeightedCards: WeightedCard[] = [];
-  private mockNewCards: StudySessionNewItem[] = [];
-  private mockReviews: (StudySessionReviewItem & ScheduledCard)[] = [];
 
   setWeightedCards(cards: WeightedCard[]) {
     this.mockWeightedCards = cards;
   }
 
-  setNewCards(cards: StudySessionNewItem[]) {
-    this.mockNewCards = cards;
-  }
-
-  setReviews(reviews: (StudySessionReviewItem & ScheduledCard)[]) {
-    this.mockReviews = reviews;
-  }
-
   async getWeightedCards(limit: number): Promise<WeightedCard[]> {
     return this.mockWeightedCards.slice(0, limit);
   }
+}
 
-  async getNewCards(n?: number): Promise<StudySessionNewItem[]> {
-    return n ? this.mockNewCards.slice(0, n) : this.mockNewCards;
-  }
+// Create a mock context for tests
+function createMockContext(): GeneratorContext {
+  const mockUser = {
+    getCourseRegDoc: vi.fn().mockResolvedValue({
+      elo: { global: { score: 1000, count: 10 }, tags: {} },
+    }),
+  } as unknown as UserDBInterface;
 
-  async getPendingReviews(): Promise<(StudySessionReviewItem & ScheduledCard)[]> {
-    return this.mockReviews;
-  }
+  const mockCourse = {
+    getCourseID: vi.fn().mockReturnValue('test-course'),
+  } as unknown as CourseDBInterface;
+
+  return {
+    user: mockUser,
+    course: mockCourse,
+    userElo: 1000,
+  };
 }
 
 describe('CompositeGenerator', () => {
+  const mockContext = createMockContext();
+
   describe('constructor', () => {
     it('throws error when no generators provided', () => {
-      expect(() => new CompositeGenerator([])).toThrow('CompositeGenerator requires at least one generator');
+      expect(() => new CompositeGenerator([])).toThrow(
+        'CompositeGenerator requires at least one generator'
+      );
     });
 
     it('accepts single generator', () => {
@@ -87,7 +96,7 @@ describe('CompositeGenerator', () => {
       ]);
 
       const composite = new CompositeGenerator([generator]);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(2);
       expect(result[0].cardId).toBe('card-1');
@@ -105,7 +114,7 @@ describe('CompositeGenerator', () => {
       ]);
 
       const composite = new CompositeGenerator([generator]);
-      const result = await composite.getWeightedCards(2);
+      const result = await composite.getWeightedCards(2, mockContext);
 
       expect(result).toHaveLength(2);
       expect(result[0].cardId).toBe('card-1');
@@ -128,7 +137,7 @@ describe('CompositeGenerator', () => {
       ]);
 
       const composite = new CompositeGenerator([gen1, gen2], AggregationMode.AVERAGE);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       // Should have 3 unique cards
       expect(result).toHaveLength(3);
@@ -148,7 +157,7 @@ describe('CompositeGenerator', () => {
       gen2.setWeightedCards([makeWeightedCard('card-1', 'course-1', 0.9, 'new')]);
 
       const composite = new CompositeGenerator([gen1, gen2], AggregationMode.MAX);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(1);
       expect(result[0].score).toBe(0.9);
@@ -164,7 +173,7 @@ describe('CompositeGenerator', () => {
       gen2.setWeightedCards([makeWeightedCard('card-1', 'course-1', 0.6, 'new')]);
 
       const composite = new CompositeGenerator([gen1, gen2], AggregationMode.AVERAGE);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(1);
       expect(result[0].score).toBeCloseTo(0.7); // (0.8 + 0.6) / 2
@@ -181,7 +190,7 @@ describe('CompositeGenerator', () => {
       gen3.setWeightedCards([makeWeightedCard('card-1', 'course-1', 0.6, 'new')]);
 
       const composite = new CompositeGenerator([gen1, gen2, gen3], AggregationMode.AVERAGE);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(1);
       expect(result[0].score).toBeCloseTo(0.7); // (0.9 + 0.6 + 0.6) / 3
@@ -197,7 +206,7 @@ describe('CompositeGenerator', () => {
       gen2.setWeightedCards([makeWeightedCard('card-1', 'course-1', 0.6, 'new')]);
 
       const composite = new CompositeGenerator([gen1, gen2]); // default mode
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(1);
       // avg = (0.8 + 0.6) / 2 = 0.7
@@ -217,7 +226,7 @@ describe('CompositeGenerator', () => {
       gen3.setWeightedCards([makeWeightedCard('card-1', 'course-1', 0.6, 'new')]);
 
       const composite = new CompositeGenerator([gen1, gen2, gen3]);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(1);
       // avg = 0.6
@@ -234,7 +243,7 @@ describe('CompositeGenerator', () => {
       gen2.setWeightedCards([makeWeightedCard('card-2', 'course-1', 0.6, 'new')]);
 
       const composite = new CompositeGenerator([gen1, gen2]);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(2);
       // No boost for single-generator cards
@@ -254,7 +263,7 @@ describe('CompositeGenerator', () => {
       gen2.setWeightedCards([makeWeightedCard('card-1', 'course-1', 0.9, 'new')]);
 
       const composite = new CompositeGenerator([gen1, gen2]);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(1);
       // avg = 0.9, boost = 1.1, result = 0.99 (would be 0.99, not clamped)
@@ -273,7 +282,7 @@ describe('CompositeGenerator', () => {
       gen3.setWeightedCards([makeWeightedCard('card-1', 'course-1', 1.0, 'new')]);
 
       const composite = new CompositeGenerator([gen1, gen2, gen3]);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(1);
       // avg = 1.0, boost = 1.2, result would be 1.2 but clamped to 1.0
@@ -291,7 +300,7 @@ describe('CompositeGenerator', () => {
       ]);
 
       const composite = new CompositeGenerator([gen1]);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(3);
       expect(result[0].cardId).toBe('card-high');
@@ -307,12 +316,10 @@ describe('CompositeGenerator', () => {
       ]);
 
       const gen2 = new MockGenerator();
-      gen2.setWeightedCards([
-        makeWeightedCard('card-boosted', 'course-1', 0.5, 'new'),
-      ]);
+      gen2.setWeightedCards([makeWeightedCard('card-boosted', 'course-1', 0.5, 'new')]);
 
       const composite = new CompositeGenerator([gen1, gen2]);
-      const result = await composite.getWeightedCards(10);
+      const result = await composite.getWeightedCards(10, mockContext);
 
       expect(result).toHaveLength(2);
       // card-boosted: avg=0.5, boost=1.1, final=0.55
@@ -321,135 +328,4 @@ describe('CompositeGenerator', () => {
       expect(result[1].cardId).toBe('card-boosted');
     });
   });
-
-  describe('getNewCards', () => {
-    it('deduplicates new cards by cardID', async () => {
-      const gen1 = new MockGenerator();
-      gen1.setNewCards([
-        {
-          cardID: 'card-1',
-          courseID: 'course-1',
-          contentSourceType: 'course',
-          contentSourceID: 'course-1',
-          status: 'new',
-        },
-        {
-          cardID: 'card-2',
-          courseID: 'course-1',
-          contentSourceType: 'course',
-          contentSourceID: 'course-1',
-          status: 'new',
-        },
-      ]);
-
-      const gen2 = new MockGenerator();
-      gen2.setNewCards([
-        {
-          cardID: 'card-1',
-          courseID: 'course-1',
-          contentSourceType: 'course',
-          contentSourceID: 'course-1',
-          status: 'new',
-        },
-        {
-          cardID: 'card-3',
-          courseID: 'course-1',
-          contentSourceType: 'course',
-          contentSourceID: 'course-1',
-          status: 'new',
-        },
-      ]);
-
-      const composite = new CompositeGenerator([gen1, gen2]);
-      const result = await composite.getNewCards();
-
-      expect(result).toHaveLength(3);
-      const cardIds = result.map((c) => c.cardID);
-      expect(cardIds).toContain('card-1');
-      expect(cardIds).toContain('card-2');
-      expect(cardIds).toContain('card-3');
-    });
-
-    it('respects limit parameter', async () => {
-      const gen1 = new MockGenerator();
-      gen1.setNewCards([
-        {
-          cardID: 'card-1',
-          courseID: 'course-1',
-          contentSourceType: 'course',
-          contentSourceID: 'course-1',
-          status: 'new',
-        },
-        {
-          cardID: 'card-2',
-          courseID: 'course-1',
-          contentSourceType: 'course',
-          contentSourceID: 'course-1',
-          status: 'new',
-        },
-        {
-          cardID: 'card-3',
-          courseID: 'course-1',
-          contentSourceType: 'course',
-          contentSourceID: 'course-1',
-          status: 'new',
-        },
-      ]);
-
-      const composite = new CompositeGenerator([gen1]);
-      const result = await composite.getNewCards(2);
-
-      expect(result).toHaveLength(2);
-    });
-  });
-
-  describe('getPendingReviews', () => {
-    it('deduplicates reviews by cardID', async () => {
-      const review1: StudySessionReviewItem & ScheduledCard = {
-        cardID: 'card-1',
-        courseID: 'course-1',
-        contentSourceType: 'course',
-        contentSourceID: 'course-1',
-        status: 'review',
-        reviewID: 'review-1',
-        _id: 'scheduled-1',
-        cardId: 'card-1',
-        courseId: 'course-1',
-        scheduledFor: 'course',
-        schedulingAgentId: 'agent-1',
-        reviewTime: new Date(),
-        scheduledAt: new Date(),
-      } as unknown as StudySessionReviewItem & ScheduledCard;
-
-      const review2: StudySessionReviewItem & ScheduledCard = {
-        cardID: 'card-2',
-        courseID: 'course-1',
-        contentSourceType: 'course',
-        contentSourceID: 'course-1',
-        status: 'review',
-        reviewID: 'review-2',
-        _id: 'scheduled-2',
-        cardId: 'card-2',
-        courseId: 'course-1',
-        scheduledFor: 'course',
-        schedulingAgentId: 'agent-1',
-        reviewTime: new Date(),
-        scheduledAt: new Date(),
-      } as unknown as StudySessionReviewItem & ScheduledCard;
-
-      const gen1 = new MockGenerator();
-      gen1.setReviews([review1, review2]);
-
-      const gen2 = new MockGenerator();
-      gen2.setReviews([review1]); // Duplicate review1
-
-      const composite = new CompositeGenerator([gen1, gen2]);
-      const result = await composite.getPendingReviews();
-
-      expect(result).toHaveLength(2);
-      const cardIds = result.map((c) => c.cardID);
-      expect(cardIds).toContain('card-1');
-      expect(cardIds).toContain('card-2');
-    });
-  });
 });

package/tests/core/navigators/Pipeline.test.ts

@@ -2,8 +2,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { Pipeline } from '../../../src/core/navigators/Pipeline';
 import { WeightedCard, ContentNavigator } from '../../../src/core/navigators/index';
 import { CardFilter, FilterContext } from '../../../src/core/navigators/filters/types';
-import { StudySessionNewItem, StudySessionReviewItem } from '../../../src/core/interfaces/contentSource';
-import { ScheduledCard } from '../../../src/core/types/user';
+
 import { CourseDBInterface } from '../../../src/core/interfaces/courseDB';
 import { UserDBInterface } from '../../../src/core/interfaces/userDB';
 
@@ -15,6 +14,7 @@ import { UserDBInterface } from '../../../src/core/interfaces/userDB';
  * Mock generator that returns predefined weighted cards
  */
 class MockGenerator extends ContentNavigator {
+  name: string = 'MockGenerator';
   private cards: WeightedCard[];
 
   constructor(cards: WeightedCard[]) {
@@ -25,14 +25,6 @@ class MockGenerator extends ContentNavigator {
   async getWeightedCards(limit: number): Promise<WeightedCard[]> {
     return this.cards.slice(0, limit);
   }
-
-  async getNewCards(_n?: number): Promise<StudySessionNewItem[]> {
-    return [];
-  }
-
-  async getPendingReviews(): Promise<(StudySessionReviewItem & ScheduledCard)[]> {
-    return [];
-  }
 }
 
 /**
@@ -102,6 +94,8 @@ function createMockContext(): { user: UserDBInterface; course: CourseDBInterface
 
   const mockCourse = {
     getCourseID: vi.fn().mockReturnValue('test-course'),
+    getCourseConfig: vi.fn().mockResolvedValue({ name: 'Test Course', id: 'test-course' }),
+    getAppliedTagsBatch: vi.fn().mockResolvedValue(new Map()),
   } as unknown as CourseDBInterface;
 
   return { user: mockUser, course: mockCourse };
@@ -156,11 +150,7 @@ describe('Pipeline', () => {
     });
 
     it('should sort cards by score descending', async () => {
-      const cards = [
-        createCard('low', 0.3),
-        createCard('high', 0.9),
-        createCard('mid', 0.6),
-      ];
+      const cards = [createCard('low', 0.3), createCard('high', 0.9), createCard('mid', 0.6)];
       const generator = new MockGenerator(cards);
       const pipeline = new Pipeline(generator, [], mockUser, mockCourse);
 
@@ -225,10 +215,7 @@ describe('Pipeline', () => {
     });
 
     it('should remove zero-score cards after filtering', async () => {
-      const cards = [
-        createCard('keep', 0.8),
-        createCard('block', 0.9),
-      ];
+      const cards = [createCard('keep', 0.8), createCard('block', 0.9)];
       const generator = new MockGenerator(cards);
       const filter = createBlockingFilter('Blocker', ['block']);
       const pipeline = new Pipeline(generator, [filter], mockUser, mockCourse);
@@ -325,59 +312,6 @@ describe('Pipeline', () => {
     });
   });
 
-  describe('legacy API compatibility', () => {
-    it('should delegate getNewCards to generator', async () => {
-      const mockNewCards: StudySessionNewItem[] = [
-        {
-          cardID: 'new-1',
-          courseID: 'test-course',
-          contentSourceType: 'course',
-          contentSourceID: 'test-course',
-          status: 'new',
-        },
-      ];
-
-      const generator = new MockGenerator([]);
-      generator.getNewCards = vi.fn().mockResolvedValue(mockNewCards);
-
-      const pipeline = new Pipeline(generator, [], mockUser, mockCourse);
-      const result = await pipeline.getNewCards(10);
-
-      expect(generator.getNewCards).toHaveBeenCalledWith(10);
-      expect(result).toEqual(mockNewCards);
-    });
-
-    it('should delegate getPendingReviews to generator', async () => {
-      const mockReviews: (StudySessionReviewItem & ScheduledCard)[] = [
-        {
-          cardID: 'review-1',
-          courseID: 'test-course',
-          contentSourceType: 'course',
-          contentSourceID: 'test-course',
-          status: 'review',
-          qualifiedID: 'test-course-review-1',
-          reviewID: 'SCHEDULED_CARD-review-1',
-          _id: 'SCHEDULED_CARD-review-1',
-          cardId: 'review-1',
-          courseId: 'test-course',
-          reviewTime: '2024-01-15T12:00:00Z',
-          scheduledAt: '2024-01-14T12:00:00Z',
-          scheduledFor: 'course',
-          schedulingAgentId: 'test-course',
-        },
-      ];
-
-      const generator = new MockGenerator([]);
-      generator.getPendingReviews = vi.fn().mockResolvedValue(mockReviews);
-
-      const pipeline = new Pipeline(generator, [], mockUser, mockCourse);
-      const result = await pipeline.getPendingReviews();
-
-      expect(generator.getPendingReviews).toHaveBeenCalled();
-      expect(result).toEqual(mockReviews);
-    });
-  });
-
   describe('over-fetching', () => {
     it('should over-fetch from generator based on filter count', async () => {
       const manyCards = Array.from({ length: 20 }, (_, i) =>

package/tests/core/navigators/PipelineAssembler.test.ts

@@ -8,7 +8,7 @@ import { DocType } from '../../../src/core';
 import { Pipeline } from '../../../src/core/navigators/Pipeline';
 
 // Mock the dynamic import in ContentNavigator.create
-vi.mock('../../../src/core/navigators/elo', () => ({
+vi.mock('../../../src/core/navigators/generators/elo', () => ({
   default: class MockELONavigator {
     name = 'ELO';
     constructor(
@@ -19,16 +19,10 @@ vi.mock('../../../src/core/navigators/elo', () => ({
     async getWeightedCards() {
       return [];
     }
-    async getNewCards() {
-      return [];
-    }
-    async getPendingReviews() {
-      return [];
-    }
   },
 }));
 
-vi.mock('../../../src/core/navigators/srs', () => ({
+vi.mock('../../../src/core/navigators/generators/srs', () => ({
   default: class MockSRSNavigator {
     name = 'SRS';
     constructor(
@@ -39,36 +33,10 @@ vi.mock('../../../src/core/navigators/srs', () => ({
     async getWeightedCards() {
       return [];
     }
-    async getNewCards() {
-      return [];
-    }
-    async getPendingReviews() {
-      return [];
-    }
-  },
-}));
-
-vi.mock('../../../src/core/navigators/hardcodedOrder', () => ({
-  default: class MockHardcodedOrderNavigator {
-    name = 'Hardcoded Order';
-    constructor(
-      public user: any,
-      public course: any,
-      public strategyData: any
-    ) {}
-    async getWeightedCards() {
-      return [];
-    }
-    async getNewCards() {
-      return [];
-    }
-    async getPendingReviews() {
-      return [];
-    }
   },
 }));
 
-vi.mock('../../../src/core/navigators/hierarchyDefinition', () => ({
+vi.mock('../../../src/core/navigators/filters/hierarchyDefinition', () => ({
   default: class MockHierarchyDefinitionNavigator {
     name = 'Hierarchy Definition';
     constructor(
@@ -84,16 +52,10 @@ vi.mock('../../../src/core/navigators/hierarchyDefinition', () => ({
     async getWeightedCards() {
       throw new Error('Filter should not be used as generator');
     }
-    async getNewCards() {
-      return [];
-    }
-    async getPendingReviews() {
-      return [];
-    }
   },
 }));
 
-vi.mock('../../../src/core/navigators/interferenceMitigator', () => ({
+vi.mock('../../../src/core/navigators/filters/interferenceMitigator', () => ({
   default: class MockInterferenceMitigatorNavigator {
     name = 'Interference Mitigator';
     constructor(
@@ -109,16 +71,10 @@ vi.mock('../../../src/core/navigators/interferenceMitigator', () => ({
     async getWeightedCards() {
       throw new Error('Filter should not be used as generator');
     }
-    async getNewCards() {
-      return [];
-    }
-    async getPendingReviews() {
-      return [];
-    }
   },
 }));
 
-vi.mock('../../../src/core/navigators/relativePriority', () => ({
+vi.mock('../../../src/core/navigators/filters/relativePriority', () => ({
   default: class MockRelativePriorityNavigator {
     name = 'Relative Priority';
     constructor(
@@ -134,12 +90,6 @@ vi.mock('../../../src/core/navigators/relativePriority', () => ({
     async getWeightedCards() {
       throw new Error('Filter should not be used as generator');
     }
-    async getNewCards() {
-      return [];
-    }
-    async getPendingReviews() {
-      return [];
-    }
   },
 }));
 
@@ -157,6 +107,7 @@ describe('PipelineAssembler', () => {
 
   const mockCourse = {
     getCourseID: vi.fn().mockReturnValue('test-course'),
+    getCourseConfig: vi.fn().mockResolvedValue({ name: 'Test Course', id: 'test-course' }),
     getCardEloData: vi.fn().mockResolvedValue([]),
     getAppliedTags: vi.fn().mockResolvedValue({ rows: [] }),
   };
@@ -305,15 +256,14 @@ describe('PipelineAssembler', () => {
   describe('complex scenarios', () => {
     it('handles multiple generators and multiple filters', async () => {
       const elo = createStrategy('elo', 'elo');
-      const hardcoded = createStrategy('hardcoded', 'hardcodedOrder');
       const hierarchy = createStrategy('hierarchy', 'hierarchyDefinition');
       const relativePriority = createStrategy('priority', 'relativePriority');
 
-      const input = createInput([elo, hardcoded, hierarchy, relativePriority]);
+      const input = createInput([elo, hierarchy, relativePriority]);
       const result = await assembler.assemble(input);
 
       // Should have both generators
-      expect(result.generatorStrategies).toEqual([elo, hardcoded]);
+      expect(result.generatorStrategies).toEqual([elo]);
 
       // Should have both filters (sorted alphabetically)
       expect(result.filterStrategies.map((f) => f.name)).toEqual(['hierarchy', 'priority']);