musora-content-services 2.104.9 → 2.105.0

package/.claude/settings.local.json

@@ -1,9 +1,18 @@
 {
   "permissions": {
     "allow": [
-      "Bash(rg:*)",
-      "Bash(npm run lint:*)"
+      "Bash(find:*)",
+      "Bash(docker exec:*)",
+      "Bash(npm test:*)",
+      "WebSearch",
+      "WebFetch(domain:watermelondb.dev)",
+      "WebFetch(domain:github.com)",
+      "Bash(git checkout:*)",
+      "Bash(npm run doc:*)",
+      "Bash(cat:*)",
+      "Bash(tr:*)"
     ],
-    "deny": []
+    "deny": [],
+    "ask": []
   }
 }

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.105.0](https://github.com/railroadmedia/musora-content-services/compare/v2.104.9...v2.105.0) (2025-12-17)
+
+
+### Features
+
+* Remove xp and total_xp ([#656](https://github.com/railroadmedia/musora-content-services/issues/656)) ([e6238a6](https://github.com/railroadmedia/musora-content-services/commit/e6238a605e095dc81e152c25f0abf4885b2bb091))
+* update type for method progress card ([#662](https://github.com/railroadmedia/musora-content-services/issues/662)) ([ad2d6df](https://github.com/railroadmedia/musora-content-services/commit/ad2d6df35b321afd7df1a302ee6bfbcbce1a31b7))
+
+
+### Bug Fixes
+
+* Minor progress fixes ([#654](https://github.com/railroadmedia/musora-content-services/issues/654)) ([202cceb](https://github.com/railroadmedia/musora-content-services/commit/202ccebc85d119ce9a63007e600a8fd92c3f94d7))
+
 ### [2.104.9](https://github.com/railroadmedia/musora-content-services/compare/v2.104.8...v2.104.9) (2025-12-17)
 
 ### [2.104.8](https://github.com/railroadmedia/musora-content-services/compare/v2.104.7...v2.104.8) (2025-12-16)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.104.9",
+  "version": "2.105.0",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",

package/src/contentTypeConfig.js

@@ -425,8 +425,6 @@ export let contentTypeConfig = {
       '"instructors": instructor[]->name',
       `"description": ${descriptionField}`,
       `"resource": ${resourcesField}`,
-      'xp',
-      'total_xp',
       `"lessons": child[]->{
                 "id": railcontent_id,
                 title,
@@ -515,11 +513,9 @@ export let contentTypeConfig = {
   pack: {
     fields: [
       '"lesson_count": coalesce(count(child[]->.child[]->), 0)',
-      'xp',
       `"description": ${descriptionField}`,
       '"instructors": instructor[]->{ "id": railcontent_id, name, "thumbnail_url": thumbnail_url.asset->url }',
       '"logo_image_url": logo_image_url.asset->url',
-      'total_xp',
       `"resources": ${resourcesField}`,
       '"thumbnail": thumbnail.asset->url',
       '"light_mode_logo": light_mode_logo_url.asset->url',
@@ -552,7 +548,6 @@ export let contentTypeConfig = {
       '"light_mode_logo": light_mode_logo_url.asset->url',
       '"dark_mode_logo": dark_mode_logo_url.asset->url',
       `"description": ${descriptionField}`,
-      'total_xp',
     ],
     childFields: [`"description": ${descriptionField}`],
   },
@@ -574,7 +569,6 @@ export let contentTypeConfig = {
                 title,
                 "type": _type,
                 "description": ${descriptionField},
-                xp,
                 web_url_path,
                 "url": web_url_path,
             }`,
@@ -586,8 +580,6 @@ export let contentTypeConfig = {
       '"instructors": instructor[]->name',
       `"description": ${descriptionField}`,
       `"resource": ${resourcesField}`,
-      'xp',
-      'total_xp',
       `"lessons": child[]->{
                 "id": railcontent_id,
                 title,

package/src/services/awards/award-callbacks.js

@@ -21,6 +21,7 @@ let progressUpdateCallback = null
  * - `awardId` - Unique Sanity award ID
  * - `name` - Display name of the award
  * - `badge` - URL to badge image
+ * - `contentType` - Content type ('guided-course' or 'learning-path-v2')
  * - `completed_at` - ISO timestamp
  * - `isCompleted` - Boolean indicating the award is completed (always true for granted awards)
  * - `completion_data.message` - Pre-generated congratulations message
@@ -72,6 +73,7 @@ export function registerAwardCallback(callback) {
       awardId: awardId,
       name: definition.name,
       badge: definition.badge,
+      contentType: definition.content_type,
       completed_at: completionData.completed_at,
       isCompleted: true,
       completionData: {

package/src/services/awards/award-query.js

@@ -136,9 +136,7 @@ export async function getContentAwards(contentId) {
         instructorName: def.instructor_name,
         progressPercentage: userProgress?.progress_percentage ?? 0,
         isCompleted: userProgress ? UserAwardProgressRepository.isCompleted(userProgress) : false,
-        completedAt: userProgress?.completed_at
-          ? new Date(userProgress.completed_at).toISOString()
-          : null,
+        completedAt: userProgress?.completed_at,
         completionData
       }
     })
@@ -168,8 +166,7 @@ export async function getContentAwards(contentId) {
  * - Badge and award images for display
  * - Completion date for "Earned on X" display
  * - `completionData.message` - Pre-generated congratulations text
- * - `completionData.practice_minutes` - Total practice time for this award
- * - `completionData.days_user_practiced` - Days spent earning this award
+ * - `completionData.XXX` - other fields are award type dependant
  *
  * Returns empty array `[]` on error (never throws).
  *
@@ -226,16 +223,14 @@ export async function getContentAwards(contentId) {
  */
 export async function getCompletedAwards(brand = null, options = {}) {
   try {
-    const allProgress = await db.userAwardProgress.getAll()
+    const allProgress = await db.userAwardProgress.getCompleted()
 
     const completed = allProgress.data.filter(p =>
       p.progress_percentage === 100 && p.completed_at !== null
     )
-
     let awards = await Promise.all(
       completed.map(async (progress) => {
         const definition = await awardDefinitions.getById(progress.award_id)
-
         if (!definition) {
           return null
         }
@@ -243,24 +238,24 @@ export async function getCompletedAwards(brand = null, options = {}) {
         if (brand && definition.brand !== brand) {
           return null
         }
-
-        const completionData = enhanceCompletionData(progress.completion_data)
-
+        const completionData = definition.type === awardDefinitions.CONTENT_AWARD ? enhanceCompletionData(progress.completion_data) : progress.completion_data;
+        const hasCertificate = definition.type === awardDefinitions.CONTENT_AWARD
         return {
           awardId: progress.award_id,
           awardTitle: definition.name,
+          awardType: definition.type,
           badge: definition.badge,
           award: definition.award,
           brand: definition.brand,
+          hasCertificate: hasCertificate,
           instructorName: definition.instructor_name,
           progressPercentage: progress.progress_percentage,
           isCompleted: true,
-          completedAt: new Date(progress.completed_at * 1000).toISOString(),
+          completedAt: progress.completed_at,
           completionData
         }
       })
     )
-
     awards = awards.filter(award => award !== null)
 
     awards.sort((a, b) => new Date(b.completedAt).getTime() - new Date(a.completedAt).getTime())
@@ -269,7 +264,6 @@ export async function getCompletedAwards(brand = null, options = {}) {
       const offset = options.offset || 0
       awards = awards.slice(offset, offset + options.limit)
     }
-
     return awards
   } catch (error) {
     console.error('Failed to get completed awards:', error)

package/src/services/awards/internal/award-definitions.js

@@ -9,6 +9,9 @@
 const STORAGE_KEY = 'musora_award_definitions_last_fetch'
 
 class AwardDefinitionsService {
+
+  CONTENT_AWARD = 'content-award'
+  EXP_AWARD  = 'exp-award'
   constructor() {
     /** @type {AwardDefinitionsMap} */
     this.definitions = new Map()
@@ -90,7 +93,7 @@ class AwardDefinitionsService {
         bypassPermissions: true,
       }).buildFilter()
 
-      const query = `*[_type == 'content-award'] {
+      const query = `*[_type in ['content-award', 'exp-award']] {
         _id,
         is_active,
         name,
@@ -107,7 +110,7 @@ class AwardDefinitionsService {
         'child_ids': content->child[${childFilter}]->railcontent_id,
       }`
 
-      const awards = await fetchSanity(query, true, { processNeedAccess: false })
+      const awards = await fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
 
       this.definitions.clear()
       this.contentIndex.clear()

package/src/services/awards/internal/award-manager.js

@@ -99,7 +99,7 @@ export class AwardManager {
     const popupMessage = AwardMessageGenerator.generatePopupMessage(completionData)
 
     await db.userAwardProgress.recordAwardProgress(award._id, 100, {
-      completedAt: Date.now(),
+      completedAt: new Date().toISOString(),
       completionData,
       progressData,
       immediate: true

package/src/services/awards/internal/certificate-builder.js

@@ -39,10 +39,7 @@ export async function buildCertificateData(awardId) {
   return {
     userId: globalConfig.sessionConfig.userId,
     userName: userData?.display_name || userData?.name || 'User',
-    completedAt: userProgress.data.completed_at
-      ? new Date(userProgress.data.completed_at * 1000).toISOString()
-      : new Date().toISOString(),
-
+    completedAt: userProgress.data?.completed_at ?? new Date().toISOString(),
     awardId: awardDef._id,
     awardType: awardDef.type || 'content-award',
     awardTitle: awardDef.name,

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

@@ -65,6 +65,7 @@ export interface AwardCallbackPayload {
   awardId: string
   name: string
   badge: string
+  contentType: string
   completed_at: string
   isCompleted: boolean
   completion_data: AwardCompletionData

package/src/services/awards/types.js

@@ -37,10 +37,12 @@
  * @typedef {Object} AwardInfo
  * @property {string} awardId - Unique Sanity award ID
  * @property {string} awardTitle - Display name of the award
+ * @property {string} awardType - Type of the award
+ * @property {boolean} hasCertificate - flag to indicate if the award includes a downloadable certificate
  * @property {string} badge - URL to badge image
  * @property {string} award - URL to award image
- * @property {string} brand - Brand (drumeo, pianote, guitareo, singeo)
- * @property {string} instructorName - Name of the instructor
+ * @property {string} brand - Brand (drumeo, pianote, guitareo, singeo, playbass)
+ * @property {string|null} instructorName - Name of the instructor
  * @property {number} progressPercentage - Completion percentage (0-100). Progress is tracked per collection context for learning paths.
  * @property {boolean} isCompleted - Whether the award is fully completed
  * @property {string|null} completedAt - ISO timestamp of completion, or null if not completed
@@ -73,6 +75,7 @@
  * @property {string} awardId - Unique Sanity award ID
  * @property {string} name - Display name of the award
  * @property {string} badge - URL to badge image
+ * @property {string} contentType - Content type ('guided-course' or 'learning-path-v2')
  * @property {string} completed_at - ISO timestamp of completion
  * @property {AwardCompletionData} completion_data - Practice statistics
  */

package/src/services/contentProgress.js

@@ -6,6 +6,7 @@ import { getNextLessonLessonParentTypes } from '../contentTypeConfig.js'
 import { emitContentCompleted } from './progress-events'
 import {getDailySession} from "./content-org/learning-paths.ts";
 import {getToday} from "./dateUtils.js";
+import { fetchBrandsByContentIds } from './sanity.js'
 
 const STATE_STARTED = STATE.STARTED
 const STATE_COMPLETED = STATE.COMPLETED
@@ -316,48 +317,25 @@ async function getByIdsAndCollections(tuples, dataKey, defaultValue) {
 }
 
 export async function getAllStarted(limit = null) {
-  return db.contentProgress.startedIds(limit).then((r) => r.data.map((id) => parseInt(id)))
+  return db.contentProgress.startedIds(limit)
 }
 
 export async function getAllCompleted(limit = null) {
-  return db.contentProgress.completedIds(limit).then((r) => r.data.map((id) => parseInt(id)))
+  return db.contentProgress.completedIds(limit)
 }
 
 export async function getAllCompletedByIds(contentIds) {
   return db.contentProgress.completedByContentIds(normalizeContentIds(contentIds))
 }
 
+/**
+ * Fetches content **IDs** for items that were started or completed.
+ */
 export async function getAllStartedOrCompleted({
-  onlyIds = true,
   brand = null,
   limit = null,
 } = {}) {
-  const agoInSeconds = Math.floor(Date.now() / 1000) - 60 * 24 * 60 * 60 // 60 days in seconds
-  const filters = {
-    brand: brand ?? undefined,
-    updatedAfter: agoInSeconds,
-    limit: limit ?? undefined,
-  }
-
-  if (onlyIds) {
-    return db.contentProgress
-      .startedOrCompletedIds(filters)
-      .then((r) => r.data.map((id) => parseInt(id)))
-  } else {
-    return db.contentProgress.startedOrCompleted(filters).then((r) => {
-      return Object.fromEntries(
-        r.data.map((p) => [
-          p.content_id,
-          {
-            last_update: p.updated_at,
-            progress: p.progress_percent,
-            status: p.state,
-            brand: p.content_brand,
-          },
-        ])
-      )
-    })
-  }
+  return await _getAllStartedOrCompleted({ brand, limit }).then(recs => recs.map(rec => rec.content_id))
 }
 
 /**
@@ -378,11 +356,41 @@ export async function getAllStartedOrCompleted({
  * console.log(progressMap[123]); // => 52
  */
 export async function getStartedOrCompletedProgressOnly({ brand = undefined } = {}) {
-  return db.contentProgress.startedOrCompleted({ brand: brand }).then((r) => {
-    return Object.fromEntries(r.data.map((p) => [p.content_id, p.progress_percent]))
+  return _getAllStartedOrCompleted({ brand }).then((r) => {
+    return Object.fromEntries(r.map((p) => [p.content_id, p.progress_percent]))
   })
 }
 
+async function _getAllStartedOrCompleted({
+  brand = null,
+  limit = null,
+} = {}) {
+  const agoInSeconds = Math.floor(Date.now() / 1000) - 60 * 24 * 60 * 60 // 60 days in seconds
+  const baseFilters = {
+    updatedAfter: agoInSeconds,
+  }
+
+  if (!brand) {
+    return await db.contentProgress.startedOrCompleted({ ...baseFilters, limit }).then(r => r.data)
+  }
+
+  // content_brand can be null (i.e., when progress records created locally)
+  // TODO: eventually put content metadata into watermelon so we can
+  // always have brand info in progress records and avoid all this
+
+  // for now though, null-ish brands shouldn't be too numerous, so safe to have undefined limit
+  const [strictRecs, looseRecs] = await Promise.all([
+    db.contentProgress.startedOrCompleted({ ...baseFilters, brand, limit }),
+    db.contentProgress.startedOrCompleted({ ...baseFilters, brand: null, limit: undefined })
+  ]);
+
+  const map = await fetchBrandsByContentIds(looseRecs.data.map(r => r.content_id));
+  const filteredLooseRecs = looseRecs.data.filter(r => map[r.content_id] === brand).map(r => ({ ...r, content_brand: brand }));
+
+  const records = [...strictRecs.data, ...filteredLooseRecs].sort((a, b) => b.updated_at - a.updated_at).slice(0, limit || undefined);
+  return records;
+}
+
 /**
  * Record watch session
  * @return {string} sessionId - provide in future calls to update progress

package/src/services/progress-row/method-card.js

@@ -98,7 +98,7 @@ export async function getMethodCard(brand) {
       action = nextLesson
         ? getMethodActionCTA(nextLesson)
         : {
-            type: 'method',
+            type: 'method-complete',
             brand,
           }
     }

package/src/services/sanity.js

@@ -2083,3 +2083,26 @@ export async function fetchOwnedContent(
 
   return fetchSanity(query, true)
 }
+
+/**
+ * Fetch brands for given content IDs.
+ *
+ * @param {Array<number>} contentIds - Array of railcontent IDs
+ * @returns {Promise<Object>} - A promise that resolves to an object mapping content IDs to brands
+ */
+export async function fetchBrandsByContentIds(contentIds) {
+  if (!contentIds || contentIds.length === 0) {
+    return {}
+  }
+  const idsString = contentIds.join(',')
+  const query = `*[railcontent_id in [${idsString}]]{
+      railcontent_id,
+      brand
+    }`
+  const results = await fetchSanity(query, true)
+  const brandMap = {}
+  results.forEach((item) => {
+    brandMap[item.railcontent_id] = item.brand
+  })
+  return brandMap
+}