expose more files, add more fixes

Author: NiloCK

packages/db/src/pouch/classroomDB.ts

@@ -1,5 +1,5 @@
 import { ENV } from '@vue-skuilder/common';
-import { ClassroomConfig } from '../server/types';
+import { ClassroomConfig } from '@vue-skuilder/common';
 import moment from 'moment';
 import pouch from 'pouchdb-browser';
 import {
@@ -10,8 +10,7 @@ import {
 } from '.';
 import { StudyContentSource, StudySessionNewItem, StudySessionReviewItem } from './contentSource';
 import { CourseDB, getTag } from './courseDB';
-import { ScheduledCard } from './userDB';
-import { getCurrentUser } from '@/stores/useAuthStore';
+import { ScheduledCard, User } from './userDB';
 
 const classroomLookupDBTitle = 'classdb-lookup';
 export const CLASSROOM_CONFIG = 'ClassroomConfig';
@@ -52,9 +51,9 @@ interface ContentBase {
 }
 
 abstract class ClassroomDBBase {
-  public _id: string;
-  protected _db: PouchDB.Database;
-  protected _cfg: ClassroomConfig;
+  public _id!: string;
+  protected _db!: PouchDB.Database;
+  protected _cfg!: ClassroomConfig;
   protected _initComplete: boolean = false;
 
   protected readonly _content_prefix: string = 'content';
@@ -99,12 +98,14 @@ abstract class ClassroomDBBase {
 }
 
 export class StudentClassroomDB extends ClassroomDBBase implements StudyContentSource {
-  private readonly _prefix: string = 'content';
-  private userMessages: PouchDB.Core.Changes<object>;
+  // private readonly _prefix: string = 'content';
+  private userMessages!: PouchDB.Core.Changes<object>;
+  private _user: User;
 
-  private constructor(classID: string) {
+  private constructor(classID: string, user: User) {
     super();
     this._id = classID;
+    this._user = user;
     this.init();
   }
 
@@ -129,8 +130,8 @@ export class StudentClassroomDB extends ClassroomDBBase implements StudyContentS
     }
   }
 
-  public static async factory(classID: string): Promise<StudentClassroomDB> {
-    const ret = new StudentClassroomDB(classID);
+  public static async factory(classID: string, user: User): Promise<StudentClassroomDB> {
+    const ret = new StudentClassroomDB(classID, user);
     await ret.init();
     return ret;
   }
@@ -142,7 +143,7 @@ export class StudentClassroomDB extends ClassroomDBBase implements StudyContentS
   }
 
   public async getPendingReviews(): Promise<(StudySessionReviewItem & ScheduledCard)[]> {
-    const u = await getCurrentUser();
+    const u = this._user;
     return (await u.getPendingReviews())
       .filter((r) => r.scheduledFor === 'classroom' && r.schedulingAgentId === this._id)
       .map((r) => {
@@ -160,7 +161,7 @@ export class StudentClassroomDB extends ClassroomDBBase implements StudyContentS
   }
 
   public async getNewCards(): Promise<StudySessionNewItem[]> {
-    const activeCards = await (await getCurrentUser()).getActiveCards();
+    const activeCards = await this._user.getActiveCards();
     const now = moment.utc();
     const assigned = await this.getAssignedContent();
     const due = assigned.filter((c) => now.isAfter(moment.utc(c.activeOn, REVIEW_TIME_FORMAT)));
@@ -173,7 +174,7 @@ export class StudentClassroomDB extends ClassroomDBBase implements StudyContentS
       const content = due[i];
 
       if (content.type === 'course') {
-        const db = new CourseDB(content.courseID);
+        const db = new CourseDB(content.courseID, async () => this._user);
         ret = ret.concat(await db.getNewCards());
       } else if (content.type === 'tag') {
         const tagDoc = await getTag(content.courseID, content.tagID);
@@ -212,7 +213,7 @@ export class StudentClassroomDB extends ClassroomDBBase implements StudyContentS
  * Interface for managing a classroom.
  */
 export default class TeacherClassroomDB extends ClassroomDBBase {
-  private _stuDb: PouchDB.Database;
+  private _stuDb!: PouchDB.Database;
 
   private constructor(classID: string) {
     super();

packages/db/src/pouch/contentSource.ts

@@ -53,7 +53,7 @@ export async function getStudySource(
   user: User
 ): Promise<StudyContentSource> {
   if (source.type === 'classroom') {
-    return await StudentClassroomDB.factory(source.id);
+    return await StudentClassroomDB.factory(source.id, user);
   } else {
     // if (source.type === 'course') - removed so tsc is certain something returns
     return new CourseDB(source.id, async () => {

packages/db/src/pouch/courseAPI.ts

@@ -1,14 +1,14 @@
 import pouch from 'pouchdb-browser';
 import { pouchDBincludeCredentialsConfig } from '.';
-import ENV from '@vue-skuilder/common';
+import { ENV } from '@vue-skuilder/common';
 // import { DataShape } from '../base-course/Interfaces/DataShape';
 import { NameSpacer, ShapeDescriptor } from '@vue-skuilder/common';
 import { CourseConfig, DataShape } from '@vue-skuilder/common';
 import { CourseElo, blankCourseElo, toCourseElo } from '@vue-skuilder/common';
 import { CourseDB, createTag, updateCardElo } from './courseDB';
 import { CardData, DisplayableData, DocType, Tag } from '../core/types-legacy';
 import { prepareNote55 } from '@vue-skuilder/common';
-
+import { User } from './userDB';
 /**
  *
  * @param courseID id of the course (quilt) being added to
@@ -162,7 +162,7 @@ export async function addTagToCard(
   // In this case, should be converted to a server-request
   const prefixedTagID = getTagID(tagID);
   const courseDB = getCourseDB(courseID);
-  const courseApi = new CourseDB(courseID);
+  const courseApi = new CourseDB(courseID, async () => User.Dummy());
   try {
     console.log(`Applying tag ${tagID} to card ${courseID + '-' + cardID}...`);
     const tag = await courseDB.get<Tag>(prefixedTagID);

packages/db/src/pouch/index.ts

@@ -232,3 +232,6 @@ export function getStartAndEndKeys(key: string) {
 
 export * from './userDB';
 export * from './courseDB';
+export * from './courseAPI';
+export * from './classroomDB';
+export * from './contentSource';

packages/db/src/pouch/userDB.ts

@@ -106,6 +106,11 @@ export interface ScheduledCard {
 export class User {
   private static _instance: User;
   private static _initialized: boolean = false;
+
+  public static Dummy(): User {
+    return new User('DummyUser');
+  }
+
   static readonly DOC_IDS = {
     CONFIG: 'CONFIG',
     COURSE_REGISTRATIONS: 'CourseRegistrations',