musora-content-services 2.104.9 → 2.105.0

package/src/services/sync/models/ContentProgress.ts

@@ -52,11 +52,14 @@ export default class ContentProgress extends BaseModel<{
   set content_brand(value: string) {
     this._setRaw('content_brand', value)
   }
-  set state(value: STATE) {
-    this._setRaw('state', value)
-  }
+  // IMPORTANT: progress percent only moves forward and is clamped between 0 and 100
+  // also has implications for last-write-wins sync strategy
   set progress_percent(value: number) {
-    this._setRaw('progress_percent', Math.min(100, Math.max(0, value)))
+    const normalizedValue = Math.min(100, Math.max(0, value))
+    const percent = normalizedValue === 0 ? 0 : Math.max(normalizedValue, this.progress_percent)
+
+    this._setRaw('progress_percent', percent)
+    this._setRaw('state', percent === 100 ? STATE.COMPLETED : STATE.STARTED)
   }
   set collection_type(value: COLLECTION_TYPE) {
     this._setRaw('collection_type', value)

package/src/services/sync/models/UserAwardProgress.ts

@@ -5,7 +5,7 @@ import type { CompletionData } from '../../awards/types'
 export default class UserAwardProgress extends BaseModel<{
   award_id: string
   progress_percentage: number
-  completed_at: number | null
+  completed_at: string | null
   progress_data: string | null
   completion_data: string | null
 }> {
@@ -20,7 +20,7 @@ export default class UserAwardProgress extends BaseModel<{
   }
 
   get completed_at() {
-    return this._getRaw('completed_at') as number | null
+    return this._getRaw('completed_at') as string | null
   }
 
   get progress_data() {
@@ -41,7 +41,7 @@ export default class UserAwardProgress extends BaseModel<{
     this._setRaw('progress_percentage', value)
   }
 
-  set completed_at(value: number | null) {
+  set completed_at(value: string | null) {
     this._setRaw('completed_at', value)
   }
 

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

@@ -13,7 +13,7 @@ export interface CollectionParameter {
 export default class ProgressRepository extends SyncRepository<ContentProgress> {
   // null collection only
   async startedIds(limit?: number) {
-    return this.queryAllIds(...[
+    return this.queryAll(...[
       Q.where('collection_type', COLLECTION_TYPE.SELF),
       Q.where('collection_id', COLLECTION_ID_SELF),
 
@@ -21,12 +21,12 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       Q.sortBy('updated_at', 'desc'),
 
       ...(limit ? [Q.take(limit)] : []),
-    ])
+    ]).then((r) => r.data.map((r) => r.content_id))
   }
 
   // null collection only
   async completedIds(limit?: number) {
-    return this.queryAllIds(...[
+    return this.queryAll(...[
       Q.where('collection_type', COLLECTION_TYPE.SELF),
       Q.where('collection_id', COLLECTION_ID_SELF),
 
@@ -34,7 +34,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       Q.sortBy('updated_at', 'desc'),
 
       ...(limit ? [Q.take(limit)] : []),
-    ])
+    ]).then((r) => r.data.map((r) => r.content_id))
   }
 
   //this _specifically_ needs to get content_ids from ALL collection_types (including null)
@@ -50,17 +50,12 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     return this.queryAll(...this.startedOrCompletedClauses(opts))
   }
 
-  // null collection only
-  async startedOrCompletedIds(opts: Parameters<typeof this.startedOrCompletedClauses>[0] = {}) {
-    return this.queryAllIds(...this.startedOrCompletedClauses(opts))
-  }
-
   // null collection only
   private startedOrCompletedClauses(
     opts: {
-      brand?: string
-      updatedAfter?: number
-      limit?: number
+      brand?: string | null
+      updatedAfter?: number,
+      limit?: number,
     } = {}
   ) {
     const clauses: Q.Clause[] = [
@@ -75,7 +70,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       clauses.push(Q.where('updated_at', Q.gte(opts.updatedAfter)))
     }
 
-    if (opts.brand) {
+    if (typeof opts.brand != 'undefined') {
       clauses.push(Q.where('content_brand', opts.brand))
     }
 
@@ -146,7 +141,6 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       r.collection_type = collection?.type ?? COLLECTION_TYPE.SELF
       r.collection_id = collection?.id ?? COLLECTION_ID_SELF
 
-      r.state = progressPct === 100 ? STATE.COMPLETED : STATE.STARTED
       r.progress_percent = progressPct
 
       if (typeof resumeTime != 'undefined') {
@@ -193,7 +187,6 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
           r.collection_type = collection?.type ?? COLLECTION_TYPE.SELF
           r.collection_id = collection?.id ?? COLLECTION_ID_SELF
 
-          r.state = progressPct === 100 ? STATE.COMPLETED : STATE.STARTED
           r.progress_percent = progressPct
         },
       ])

package/src/services/sync/repositories/user-award-progress.ts

@@ -5,7 +5,7 @@ import type { AwardDefinition, CompletionData } from '../../awards/types'
 import type { ModelSerialized } from '../serializers'
 
 type AwardProgressData = {
-  completed_at: number | null
+  completed_at: string | null
   progress_percentage: number
 }
 
@@ -18,7 +18,7 @@ export default class UserAwardProgressRepository extends SyncRepository<UserAwar
     return progress.progress_percentage >= 0 && !UserAwardProgressRepository.isCompleted(progress)
   }
 
-  static completedAtDate(progress: { completed_at: number | null }): Date | null {
+  static completedAtDate(progress: { completed_at: string | null }): Date | null {
     return progress.completed_at ? new Date(progress.completed_at) : null
   }
 
@@ -73,7 +73,7 @@ export default class UserAwardProgressRepository extends SyncRepository<UserAwar
     awardId: string,
     progressPercentage: number,
     options?: {
-      completedAt?: number | null
+      completedAt?: string | null
       progressData?: any
       completionData?: CompletionData | null
       immediate?: boolean
@@ -104,7 +104,7 @@ export default class UserAwardProgressRepository extends SyncRepository<UserAwar
     completionData: CompletionData
   ) {
     return this.recordAwardProgress(awardId, 100, {
-      completedAt: Date.now(),
+      completedAt: new Date().toISOString(),
       completionData,
       immediate: true
     })

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

@@ -20,7 +20,7 @@ const contentProgressTable = tableSchema({
   name: SYNC_TABLES.CONTENT_PROGRESS,
   columns: [
     { name: 'content_id', type: 'number', isIndexed: true },
-    { name: 'content_brand', type: 'string', isIndexed: true },
+    { name: 'content_brand', type: 'string', isOptional: true, isIndexed: true },
     { name: 'collection_type', type: 'string', isOptional: true, isIndexed: true },
     { name: 'collection_id', type: 'number', isOptional: true, isIndexed: true },
     { name: 'state', type: 'string', isIndexed: true },
@@ -61,7 +61,7 @@ const userAwardProgressTable = tableSchema({
   columns: [
     { name: 'award_id', type: 'string', isIndexed: true },
     { name: 'progress_percentage', type: 'number' },
-    { name: 'completed_at', type: 'number', isOptional: true, isIndexed: true },
+    { name: 'completed_at', type: 'string', isOptional: true, isIndexed: true },
     { name: 'progress_data', type: 'string', isOptional: true },
     { name: 'completion_data', type: 'string', isOptional: true },
     { name: 'created_at', type: 'number' },

package/src/services/user/types.d.ts

@@ -42,9 +42,7 @@ export interface User {
   revenuecat_origin_app_user_id: string | null
   is_drumeo_lifetime_member: number
   access_level: string
-  total_xp: number
   brand_method_levels: BrandMethodLevels
-  brand_total_xp: BrandTotalXp
   brand_minutes_practiced: BrandTimePracticed
   brand_seconds_practiced: BrandTimePracticed
   guitar_playing_since_year: number | null

package/src/services/user/types.js

@@ -46,9 +46,7 @@
  * @property {string|null} revenuecat_origin_app_user_id
  * @property {number} is_drumeo_lifetime_member
  * @property {string} access_level
- * @property {number} total_xp
  * @property {BrandMethodLevels} brand_method_levels
- * @property {BrandTotalXp} brand_total_xp
  * @property {BrandTimePracticed} brand_minutes_practiced
  * @property {BrandTimePracticed} brand_seconds_practiced
  * @property {number|null} guitar_playing_since_year

package/src/services/userActivity.js

@@ -982,9 +982,9 @@ function generateContentsMap(contents, playlistsContents) {
 export async function getProgressRows({ brand = 'drumeo', limit = 8 } = {}) {
   // TODO slice progress to a reasonable number, say 100
   const methodCardPromise = getMethodCard(brand)
-  const [recentPlaylists, progressContents, userPinnedItem] = await Promise.all([
+  const [recentPlaylists, nonPlaylistContentIds, userPinnedItem] = await Promise.all([
     fetchUserPlaylists(brand, { sort: '-last_progress', limit: limit }),
-    getAllStartedOrCompleted({ onlyIds: false, brand: brand, limit }),
+    getAllStartedOrCompleted({ brand: brand, limit }),
     getUserPinnedItem(brand),
   ])
 
@@ -995,7 +995,6 @@ export async function getProgressRows({ brand = 'drumeo', limit = 8 } = {}) {
   )
 
   // todo post v2: refactor this once we migrate playlist progress tracking to new system
-  const nonPlaylistContentIds = Object.keys(progressContents)
   if (userPinnedItem?.progressType === 'content') {
     nonPlaylistContentIds.push(userPinnedItem.id)
   }

package/test/awards/award-completion-flow.test.js

@@ -91,7 +91,8 @@ describe('Award Completion Flow - E2E Scenarios', () => {
         definition: expect.objectContaining({
           name: testAward.name,
           badge: testAward.badge,
-          award: testAward.award
+          award: testAward.award,
+          content_type: expect.any(String)
         }),
         completionData: expect.objectContaining({
           content_title: expect.any(String),