musora-content-services 2.107.4 → 2.107.6

package/src/services/sanity.js

@@ -927,7 +927,7 @@ export async function fetchLessonContent(railContentId, { addParent = false } =
     "instructor": ${instructorField},
     ${assignmentsField}
     video,
-    length_in_seconds,
+    "length_in_seconds": coalesce(soundslice[0].soundslice_length_in_second, length_in_seconds),
     mp3_no_drums_no_click_url,
     mp3_no_drums_yes_click_url,
     mp3_yes_drums_no_click_url,

package/src/services/sync/manager.ts

@@ -14,9 +14,6 @@ import { inBoundary } from './errors/boundary'
 import createStoresFromConfig from './store-configs'
 import { contentProgressObserver } from '../awards/internal/content-progress-observer'
 
-import { onProgressSaved, onContentCompleted } from '../progress-events'
-import { onContentCompletedLearningPathListener } from '../content-org/learning-paths'
-
 export default class SyncManager {
   private static counter = 0
   private static instance: SyncManager | null = null
@@ -137,7 +134,6 @@ export default class SyncManager {
     contentProgressObserver.start(this.database).catch((error) => {
       this.telemetry.error('[SyncManager] Failed to start contentProgressObserver', error)
     })
-    onContentCompleted(onContentCompletedLearningPathListener)
 
     const teardown = async () => {
       this.telemetry.debug('[SyncManager] Tearing down')

package/src/services/sync/repositories/base.ts

@@ -96,10 +96,10 @@ export default class SyncRepository<TModel extends BaseModel> {
     )
   }
 
-  protected async upsertOne(id: RecordId, builder: (record: TModel) => void) {
+  protected async upsertOne(id: RecordId, builder: (record: TModel) => void, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
       { name: `upsertOne:${this.store.model.table}`, op: 'upsert' },
-      (span) => this._respondToWrite(() => this.store.upsertOne(id, builder, span), span)
+      (span) => this._respondToWrite(() => this.store.upsertOne(id, builder, span, {skipPush}), span)
     )
   }
 
@@ -110,24 +110,24 @@ export default class SyncRepository<TModel extends BaseModel> {
     )
   }
 
-  protected async upsertSome(builders: Record<RecordId, (record: TModel) => void>) {
+  protected async upsertSome(builders: Record<RecordId, (record: TModel) => void>, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
       { name: `upsertSome:${this.store.model.table}`, op: 'upsert' },
-      (span) => this._respondToWrite(() => this.store.upsertSome(builders, span), span)
+      (span) => this._respondToWrite(() => this.store.upsertSome(builders, span, {skipPush}), span)
     )
   }
 
-  protected async upsertSomeTentative(builders: Record<RecordId, (record: TModel) => void>) {
+  protected async upsertSomeTentative(builders: Record<RecordId, (record: TModel) => void>, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
       { name: `upsertSomeTentative:${this.store.model.table}`, op: 'upsert' },
-      (span) => this._respondToWrite(() => this.store.upsertSomeTentative(builders, span), span)
+      (span) => this._respondToWrite(() => this.store.upsertSomeTentative(builders, span, {skipPush}), span)
     )
   }
 
-  protected async deleteOne(id: RecordId) {
+  protected async deleteOne(id: RecordId, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
       { name: `delete:${this.store.model.table}`, op: 'delete' },
-      (span) => this._respondToWriteIds(() => this.store.deleteOne(id, span), span)
+      (span) => this._respondToWriteIds(() => this.store.deleteOne(id, span, {skipPush}), span)
     )
   }
 
@@ -244,4 +244,8 @@ export default class SyncRepository<TModel extends BaseModel> {
     }
     return result
   }
+
+  protected async _requestPushUnsynced() {
+    await this.store.pushUnsyncedWithRetry()
+  }
 }

package/src/services/sync/repositories/content-progress.ts

@@ -133,7 +133,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     }
   }
 
-  recordProgress(contentId: number, collection: CollectionParameter | null, progressPct: number, resumeTime?: number) {
+  recordProgress(contentId: number, collection: CollectionParameter | null, progressPct: number, resumeTime?: number, {skipPush = false} = {}) {
     const id = ProgressRepository.generateId(contentId, collection)
 
     const result = this.upsertOne(id, (r) => {
@@ -146,7 +146,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       if (typeof resumeTime != 'undefined') {
         r.resume_time_seconds = Math.floor(resumeTime)
       }
-    })
+    }, { skipPush })
 
     // Emit event AFTER database write completes
     result.then(() => {
@@ -176,7 +176,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
   recordProgressMany(
     contentProgresses: Record<string, number>, // Accept plain object
     collection: CollectionParameter | null,
-    tentative: boolean
+    { tentative = true, skipPush = false }: { tentative?: boolean; skipPush?: boolean } = {}
   ) {
 
     const data = Object.fromEntries(
@@ -192,14 +192,18 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       ])
     )
     return tentative
-      ? this.upsertSomeTentative(data)
-      : this.upsertSome(data)
+      ? this.upsertSomeTentative(data, { skipPush })
+      : this.upsertSome(data, { skipPush })
 
     //todo add event emitting for bulk updates?
   }
 
-  eraseProgress(contentId: number, collection: CollectionParameter | null) {
-    return this.deleteOne(ProgressRepository.generateId(contentId, collection))
+  eraseProgress(contentId: number, collection: CollectionParameter | null, {skipPush = false} = {}) {
+    return this.deleteOne(ProgressRepository.generateId(contentId, collection), { skipPush })
+  }
+
+  async requestPushUnsynced() {
+    await this._requestPushUnsynced()
   }
 
   private static generateId(

package/src/services/sync/store/index.ts

@@ -235,7 +235,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
     })
   }
 
-  async upsertSome(builders: Record<RecordId, (record: TModel) => void>, span?: Span) {
+  async upsertSome(builders: Record<RecordId, (record: TModel) => void>, span?: Span, { skipPush = false } = {}) {
     if (Object.keys(builders).length === 0) return []
 
     return await this.runScope.abortable(async () => {
@@ -298,29 +298,31 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
 
       this.emit('upserted', records)
 
-      this.pushUnsyncedWithRetry(span)
+      if (!skipPush) {
+        this.pushUnsyncedWithRetry(span)
+      }
       await this.ensurePersistence()
 
       return records.map((record) => this.modelSerializer.toPlainObject(record))
     })
   }
 
-  async upsertSomeTentative(builders: Record<RecordId, (record: TModel) => void>, span?: Span) {
+  async upsertSomeTentative(builders: Record<RecordId, (record: TModel) => void>, span?: Span, { skipPush = false } = {}) {
     return this.upsertSome(Object.fromEntries(Object.entries(builders).map(([id, builder]) => [id, record => {
       builder(record)
       record._raw._status = 'synced'
-    }])), span)
+    }])), span, {skipPush})
   }
 
-  async upsertOne(id: RecordId, builder: (record: TModel) => void, span?: Span) {
-    return this.upsertSome({ [id]: builder }, span).then(r => r[0])
+  async upsertOne(id: RecordId, builder: (record: TModel) => void, span?: Span, { skipPush = false } = {}) {
+    return this.upsertSome({ [id]: builder }, span, {skipPush}).then(r => r[0])
   }
 
   async upsertOneTentative(id: string, builder: (record: TModel) => void, span?: Span) {
     return this.upsertSomeTentative({ [id]: builder }, span).then(r => r[0])
   }
 
-  async deleteOne(id: RecordId, span?: Span) {
+  async deleteOne(id: RecordId, span?: Span, { skipPush = false } = {}) {
     return await this.runScope.abortable(async () => {
       let record: TModel | null = null
 
@@ -345,7 +347,9 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
 
       this.emit('deleted', [id])
 
-      this.pushUnsyncedWithRetry(span)
+      if (!skipPush) {
+        this.pushUnsyncedWithRetry(span)
+      }
       await this.ensurePersistence()
 
       return id
@@ -477,7 +481,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
     )()
   }
 
-  private async pushUnsyncedWithRetry(span?: Span) {
+  public async pushUnsyncedWithRetry(span?: Span) {
     const records = await this.queryMaybeDeletedRecords(Q.where('_status', Q.notEq('synced')))
 
     if (records.length) {

package/.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules

package/check_content.js

@@ -1,30 +0,0 @@
-const { initializeService } = require('./src/services/config.js');
-const { fetchByRailContentIds } = require('./src/services/sanity.js');
-require('dotenv/config');
-
-async function checkContent() {
-  initializeService({
-    sanityConfig: {
-      token: process.env.SANITY_TOKEN,
-      projectId: process.env.SANITY_PROJECT_ID,
-      dataset: process.env.SANITY_DATASET,
-      version: process.env.SANITY_VERSION || '2021-06-07',
-    },
-    railcontentConfig: {
-      token: process.env.RAILCONTENT_TOKEN,
-      userId: process.env.RAILCONTENT_USER_ID,
-      baseUrl: process.env.RAILCONTENT_BASE_URL,
-      authToken: process.env.RAILCONTENT_AUTH_TOKEN,
-    },
-    baseUrl: process.env.RAILCONTENT_BASE_URL,
-    localStorage: null,
-    isMA: false,
-  });
-
-  console.log('Checking railcontent_id: 421814');
-  const contents = await fetchByRailContentIds([421814]);
-  console.log('Results:', JSON.stringify(contents, null, 2));
-  console.log('Found:', contents.length, 'items');
-}
-
-checkContent().catch(console.error);

package/check_content.mjs

@@ -1,32 +0,0 @@
-import { initializeService } from './src/services/config.js';
-import { fetchByRailContentIds } from './src/services/sanity.js';
-import dotenv from 'dotenv';
-
-dotenv.config();
-
-async function checkContent() {
-  initializeService({
-    sanityConfig: {
-      token: process.env.SANITY_TOKEN,
-      projectId: process.env.SANITY_PROJECT_ID,
-      dataset: process.env.SANITY_DATASET,
-      version: process.env.SANITY_VERSION || '2021-06-07',
-    },
-    railcontentConfig: {
-      token: process.env.RAILCONTENT_TOKEN,
-      userId: process.env.RAILCONTENT_USER_ID,
-      baseUrl: process.env.RAILCONTENT_BASE_URL,
-      authToken: process.env.RAILCONTENT_AUTH_TOKEN,
-    },
-    baseUrl: process.env.RAILCONTENT_BASE_URL,
-    localStorage: null,
-    isMA: false,
-  });
-
-  console.log('Checking railcontent_id: 421814');
-  const contents = await fetchByRailContentIds([421814]);
-  console.log('Results:', JSON.stringify(contents, null, 2));
-  console.log('Found:', contents.length, 'items');
-}
-
-checkContent().catch(console.error);