import smudging, etc, toward build

Author: NiloCK

packages/db/src/core/index.ts

@@ -2,3 +2,4 @@
 // This will be populated with interface definitions extracted from the Vue package
 export * from './types';
 export * from './interfaces';
+export * from './types-legacy';

packages/db/src/index.ts

@@ -1,6 +1,3 @@
 // Re-export everything from the core and pouch implementations
 export * from './core';
 export * from './pouch';
-
-// Default exports - currently PouchDB implementation
-export * from './pouch';

packages/db/src/core/contentSource.ts renamed to packages/db/src/pouch/contentSource.ts

@@ -1,6 +1,6 @@
 import { StudentClassroomDB } from './classroomDB';
 import { CourseDB } from './courseDB';
-import { ScheduledCard } from './userDB';
+import { ScheduledCard, User } from './userDB';
 
 export type StudySessionFailedItem = StudySessionFailedNewItem | StudySessionFailedReviewItem;
 
@@ -48,11 +48,16 @@ export interface StudyContentSource {
   getNewCards(n?: number): Promise<StudySessionNewItem[]>;
 }
 
-export async function getStudySource(source: ContentSourceID): Promise<StudyContentSource> {
+export async function getStudySource(
+  source: ContentSourceID,
+  user: User
+): Promise<StudyContentSource> {
   if (source.type === 'classroom') {
     return await StudentClassroomDB.factory(source.id);
   } else {
     // if (source.type === 'course') - removed so tsc is certain something returns
-    return new CourseDB(source.id);
+    return new CourseDB(source.id, async () => {
+      return user;
+    });
   }
 }

packages/db/src/pouch/courseDB.ts

@@ -37,9 +37,9 @@ function randIntWeightedTowardZero(n: number) {
 }
 
 export class CourseDB implements StudyContentSource {
-  private log(msg: string): void {
-    log(`CourseLog: ${this.id}\n  ${msg}`);
-  }
+  // private log(msg: string): void {
+  //   log(`CourseLog: ${this.id}\n  ${msg}`);
+  // }
 
   private db: PouchDB.Database;
   private id: string;
@@ -95,7 +95,7 @@ export class CourseDB implements StudyContentSource {
         contentSourceID: this.id,
         cardID: r.cardId,
         courseID: r.courseId,
-        qualifiedID: r.courseId + '-' + r.cardId,
+        qualifiedID: `${r.courseId}-${r.cardId}`,
         reviewID: r._id,
         status: 'review',
       };
@@ -150,10 +150,15 @@ export class CourseDB implements StudyContentSource {
     const ret: CourseElo[] = [];
     docs.rows.forEach((r) => {
       // [ ] remove these ts-ignore directives.
-      if (r.doc && r.doc.elo) {
-        ret.push(toCourseElo(r.doc.elo));
+      if (isSuccessRow(r)) {
+        if (r.doc && r.doc.elo) {
+          ret.push(toCourseElo(r.doc.elo));
+        } else {
+          console.warn('no elo data for card: ' + r.id);
+          ret.push(blankCourseElo());
+        }
       } else {
-        console.warn('no elo data for card: ' + r.id);
+        console.warn('no elo data for card: ' + JSON.stringify(r));
         ret.push(blankCourseElo());
       }
     });
@@ -204,13 +209,17 @@ export class CourseDB implements StudyContentSource {
     });
     const ret: { [card: string]: string[] } = {};
     cards.rows.forEach((r) => {
-      ret[r.id] = r.doc!.id_displayable_data;
+      if (isSuccessRow(r)) {
+        ret[r.id] = r.doc!.id_displayable_data;
+      }
     });
 
     await Promise.all(
       cards.rows.map((r) => {
         return async () => {
-          ret[r.id] = r.doc!.id_displayable_data;
+          if (isSuccessRow(r)) {
+            ret[r.id] = r.doc!.id_displayable_data;
+          }
         };
       })
     );
@@ -283,7 +292,7 @@ export class CourseDB implements StudyContentSource {
       return {
         courseID: this.id,
         cardID: split[1],
-        qualifiedID: c,
+        qualifiedID: `${split[0]}-${split[1]}`,
         contentSourceType: 'course',
         contentSourceID: this.id,
         status: 'new',
@@ -431,7 +440,14 @@ export async function getCourseQuestionTypes(courseID: string) {
 
 export async function getCourseConfig(courseID: string) {
   const config = await getCourseConfigs([courseID]);
-  return config.rows[0].doc;
+  let first = config.rows[0];
+  if (!first) {
+    throw new Error(`Course config not found for course ID: ${courseID}`);
+  } else if (isSuccessRow(first)) {
+    return first.doc;
+  } else {
+    throw new Error(`Course config not found for course ID: ${courseID}`);
+  }
 }
 
 // todo: this is actually returning full tag docs now.
@@ -576,3 +592,30 @@ export async function getCourseConfigs(ids: string[]) {
     keys: ids,
   });
 }
+
+function isSuccessRow<T>(
+  row:
+    | {
+        key: PouchDB.Core.DocumentKey;
+        error: 'not_found';
+      }
+    | {
+        doc?: PouchDB.Core.ExistingDocument<PouchDB.Core.AllDocsMeta & T> | null | undefined;
+        id: PouchDB.Core.DocumentId;
+        key: PouchDB.Core.DocumentKey;
+        value: {
+          rev: PouchDB.Core.RevisionId;
+          deleted?: boolean | undefined;
+        };
+      }
+): row is {
+  doc?: PouchDB.Core.ExistingDocument<PouchDB.Core.AllDocsMeta & T> | null | undefined;
+  id: PouchDB.Core.DocumentId;
+  key: PouchDB.Core.DocumentKey;
+  value: {
+    rev: PouchDB.Core.RevisionId;
+    deleted?: boolean | undefined;
+  };
+} {
+  return 'doc' in row && row.doc !== null && row.doc !== undefined;
+}

packages/db/src/pouch/index.ts

@@ -225,3 +225,10 @@ export function getStartAndEndKeys(key: string) {
     endkey: key + '\ufff0',
   };
 }
+
+//////////////////////
+// Package exports
+//////////////////////
+
+export * from './userDB';
+export * from './courseDB';