musora-content-services 2.122.0 → 2.122.3

package/src/services/sanity.js

@@ -1192,7 +1192,7 @@ export async function fetchLiveEvent(brand, forcedContentId = null) {
     forcedContentId !== null
       ? `railcontent_id == ${forcedContentId}`
       : `status == 'scheduled'
-      && brand == '${brand}'
+      && (brand == '${brand}' || live_global_event == true)
       && defined(live_event_start_time)
       && live_event_start_time <= '${getSanityDate(startDateTemp, false)}'
       && live_event_end_time >= '${getSanityDate(endDateTemp, false)}'`

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

@@ -100,13 +100,6 @@ export default class SyncRepository<TModel extends BaseModel> {
     )
   }
 
-  protected async upsertOneTentative(id: RecordId, builder: (record: TModel) => void) {
-    return this.store.telemetry.trace(
-      { name: `upsertOneTentative:${this.store.model.table}`, op: 'upsert', attributes: { ...this.context.session.toJSON() } },
-      (span) => this._respondToWrite(() => this.store.upsertOneTentative(id, builder, span), span)
-    )
-  }
-
   protected async upsertSome(builders: Record<RecordId, (record: TModel) => void>, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
       { name: `upsertSome:${this.store.model.table}`, op: 'upsert', attributes: { ...this.context.session.toJSON() } },
@@ -114,13 +107,6 @@ export default class SyncRepository<TModel extends BaseModel> {
     )
   }
 
-  protected async upsertSomeTentative(builders: Record<RecordId, (record: TModel) => void>, { skipPush = false } = {}) {
-    return this.store.telemetry.trace(
-      { name: `upsertSomeTentative:${this.store.model.table}`, op: 'upsert', attributes: { ...this.context.session.toJSON() } },
-      (span) => this._respondToWrite(() => this.store.upsertSomeTentative(builders, span, {skipPush}), span)
-    )
-  }
-
   protected async deleteOne(id: RecordId, { skipPush = false } = {}) {
     return this.store.telemetry.trace(
       { name: `delete:${this.store.model.table}`, op: 'delete', attributes: { ...this.context.session.toJSON() } },
@@ -128,10 +114,10 @@ export default class SyncRepository<TModel extends BaseModel> {
     )
   }
 
-  protected async deleteSome(ids: RecordId[]) {
+  protected async deleteSome(ids: RecordId[], { skipPush = false } = {}) {
     return this.store.telemetry.trace(
       { name: `deleteSome:${this.store.model.table}`, op: 'delete', attributes: { ...this.context.session.toJSON() } },
-      (span) => this._respondToWriteIds(() => this.store.deleteSome(ids, span), span)
+      (span) => this._respondToWriteIds(() => this.store.deleteSome(ids, span, {skipPush}), span)
     )
   }
 

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

@@ -187,7 +187,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
   recordProgressMany(
     contentProgresses: Record<string, number>, // Accept plain object
     collection: CollectionParameter | null,
-    { tentative = true, skipPush = false, fromLearningPath = false }: { tentative?: boolean; skipPush?: boolean; fromLearningPath?: boolean } = {}
+    { skipPush = false, fromLearningPath = false }: { skipPush?: boolean; fromLearningPath?: boolean } = {}
   ) {
     if (collection?.type === COLLECTION_TYPE.LEARNING_PATH) {
       fromLearningPath = true
@@ -209,9 +209,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
         },
       ])
     )
-    return tentative
-      ? this.upsertSomeTentative(data, { skipPush })
-      : this.upsertSome(data, { skipPush })
+    return this.upsertSome(data, { skipPush })
 
     //todo add event emitting for bulk updates?
   }
@@ -220,6 +218,11 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     return this.deleteOne(ProgressRepository.generateId(contentId, collection), { skipPush })
   }
 
+  eraseProgressMany(contentIds: number[], collection: CollectionParameter | null, {skipPush = false} = {}) {
+    const ids = contentIds.map((id) => ProgressRepository.generateId(id, collection))
+    return this.deleteSome(ids, { skipPush })
+  }
+
   private static generateId(
     contentId: number,
     collection: CollectionParameter | null

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

@@ -354,7 +354,7 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
     })
   }
 
-  async deleteSome(ids: RecordId[], span?: Span) {
+  async deleteSome(ids: RecordId[], span?: Span, { skipPush = false } = {}) {
     return this.runScope.abortable(async () => {
       await this.telemeterizedWrite(span, async writer => {
         const existing = await this.queryRecords(Q.where('id', Q.oneOf(ids)))
@@ -364,7 +364,9 @@ export default class SyncStore<TModel extends BaseModel = BaseModel> {
 
       this.emit('deleted', ids)
 
-      this.pushUnsyncedWithRetry(span)
+      if (!skipPush) {
+        this.pushUnsyncedWithRetry(span)
+      }
       await this.ensurePersistence()
 
       return ids

package/.claude/settings.local.json

@@ -1,16 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Read(//app/musora-platform-backend/**)",
-      "Read(//app/musora-platform-frontend/**)",
-      "Bash(find:*)",
-      "Bash(sed:*)",
-      "Read(//app/**)",
-      "Bash(cat:*)",
-      "Bash(docker exec:*)",
-      "Bash(npm config:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

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);