musora-content-services 2.92.7 → 2.93.0

package/.github/workflows/docs.js.yml

@@ -39,14 +39,6 @@ jobs:
         with:
           node-version: '20'
 
-      - name: Install dependencies for v1
-        working-directory: main-content
-        run: npm ci
-
-      - name: Generate v1 documentation
-        working-directory: main-content
-        run: npm run doc
-
       - name: Install dependencies for v2
         working-directory: v2-content
         run: npm ci
@@ -58,8 +50,11 @@ jobs:
       - name: Combine v1 and v2 docs into deployment structure
         run: |
           mkdir -p _site
-          # Copy v1 docs to root
-          cp -r main-content/docs/* _site/
+          # Copy existing v1 docs from main branch (already committed)
+          if [ -d "main-content/docs" ]; then
+            cp -r main-content/docs/* _site/
+            echo "✅ Copied existing v1 docs from main branch"
+          fi
           # Copy v2 docs to /v2/ subdirectory
           mkdir -p _site/v2
           cp -r v2-content/docs/* _site/v2/

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.93.0](https://github.com/railroadmedia/musora-content-services/compare/v2.92.7...v2.93.0) (2025-12-02)
+
+
+### Features
+
+* **BEH-1192:** revise fetchLearningPathProgressCheckLessons ([#604](https://github.com/railroadmedia/musora-content-services/issues/604)) ([db8cb70](https://github.com/railroadmedia/musora-content-services/commit/db8cb70ed70f4341fdd4651cdd3fea2b8047dc21))
+
+
+### Bug Fixes
+
+* method progress card subtitle ([#608](https://github.com/railroadmedia/musora-content-services/issues/608)) ([3bbfb56](https://github.com/railroadmedia/musora-content-services/commit/3bbfb56fce08e0753e7708bdf2d1356000b1c398))
+* Pull in permission_v2 ([#602](https://github.com/railroadmedia/musora-content-services/issues/602)) ([289e32d](https://github.com/railroadmedia/musora-content-services/commit/289e32d08bd3a6448191b9f6034801e4cf8d40e5))
+
 ### [2.92.7](https://github.com/railroadmedia/musora-content-services/compare/v2.92.6...v2.92.7) (2025-12-02)
 
 

package/package.json

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

package/src/contentTypeConfig.js

@@ -61,7 +61,7 @@ export const DEFAULT_FIELDS = [
   `'genre': ${genreField}`,
   'status',
   "'slug' : slug.current",
-  "'permission_id': permission[]->railcontent_id",
+  "'permission_id': permission_v2",
   'child_count',
   '"parent_id": parent_content_data[0].id',
 ]
@@ -84,7 +84,7 @@ export const DEFAULT_CHILD_FIELDS = [
   `'genre': ${genreField}`,
   'status',
   "'slug' : slug.current",
-  "'permission_id': permission[]->railcontent_id",
+  "'permission_id': permission_v2",
   'child_count',
   '"parent_id": parent_content_data[0].id',
 ]

package/src/services/content-org/learning-paths.ts

@@ -11,6 +11,7 @@ import {
   getAllCompletedByIds,
   getProgressState,
 } from '../contentProgress.js'
+import { STATE } from '../sync/models/ContentProgress'
 
 const BASE_PATH: string = `/api/content-org`
 const LEARNING_PATHS_PATH = `${BASE_PATH}/v1/user/learning-paths`
@@ -225,29 +226,18 @@ export async function fetchLearningPathLessons(
  * For an array of contentIds, fetch any content progress with state=completed,
  * including other learning paths and a la carte progress.
  *
- * @param contentIds The array of content IDs within the learning path
- * @param learningPathId The learning path ID
- * @returns {Promise<Object>} Response object
- * @returns {Array} result.lessons - Array of all learning path lesson contentIds.
- * @returns {Array} result.completed_lessons - Array of learning path lesson contentIds that are completed.
- * @returns {Array} result.lessons_count - Count of learning path lessons.
- * @returns {Array} result.completed_lessons_count - Count of learning path completed lessons.
+ * @param {number[]} contentIds The array of content IDs within the learning path
+ * @returns {Promise<Object>} Object with content IDs as keys and the progress state as values
  */
-export async function fetchLearningPathProgressCheckLessons(
-  contentIds: number[],
-  learningPathId: number
-): Promise<object> {
-  let query = await getAllCompletedByIds(contentIds, {
-    id: learningPathId,
-    type: 'learning-path-v2',
-  })
-  let completedContentIds = query.data
-  return {
-    lessons: contentIds,
-    completed_lessons: completedContentIds,
-    lessons_count: contentIds.length,
-    completed_lessons_count: completedContentIds.length,
-  }
+export async function fetchLearningPathProgressCheckLessons(contentIds: number[]): Promise<Object> {
+  let query = await getAllCompletedByIds(contentIds)
+  let completedLessons = query.data.map(lesson => lesson.content_id)
+
+  return contentIds.reduce((obj, contentId) => {
+    let lessonIsCompleted = completedLessons.includes(contentId)
+    obj[contentId] = lessonIsCompleted ? STATE.COMPLETED : ""
+    return obj
+  }, {})
 }
 
 interface completeMethodIntroVideo {

package/src/services/contentProgress.js

@@ -162,18 +162,8 @@ export async function getAllCompleted(limit = null) {
   return db.contentProgress.completedIds(limit).then(r => r.data.map(id => parseInt(id)))
 }
 
-/**
- *
- * @param {array} contentIds List of content children within learning path
- * @param {object} collection Learning path object
- * @returns {Promise<array>} Filtered list of contentIds that are completed
- */
-export async function getAllCompletedByIds(contentIds, collection) {
-  // TODO - implement collection filtering
-  return db.contentProgress.queryAllIds(
-    Q.whereIn('content_id', contentIds),
-    Q.where('state', STATE_COMPLETED)
-  )
+export async function getAllCompletedByIds(contentIds) {
+  return db.contentProgress.completedByContentIds(contentIds)
 }
 
 export async function getAllStartedOrCompleted({

package/src/services/permissions/PermissionsV2Adapter.ts

@@ -51,9 +51,7 @@ export class PermissionsV2Adapter extends PermissionsAdapter {
     }
 
     // Get content's required permissions
-    const oldPermissions = content?.permission_id ?? []
-    const newPermissions = content?.permission_v2 ?? []
-    const contentPermissions = new Set([...oldPermissions, ...newPermissions])
+    const contentPermissions = new Set(content?.permission_id ?? [])
 
     // Content with no permissions is accessible to all
     if (contentPermissions.size === 0) {

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

@@ -2,16 +2,9 @@
  * @module ProgressRow
  */
 
-import {
-  getDailySession,
-  getActivePath,
-  resetAllLearningPaths,
-  startLearningPath,
-  fetchLearningPathLessons,
-} from '../content-org/learning-paths'
+import { getActivePath, fetchLearningPathLessons } from '../content-org/learning-paths'
 import { getToday } from '../dateUtils.js'
-import { fetchByRailContentId, fetchByRailContentIds, fetchMethodV2IntroVideo } from '../sanity'
-import { addContextToContent } from '../contentAggregator.js'
+import { fetchMethodV2IntroVideo } from '../sanity'
 import { getProgressState } from '../contentProgress'
 
 export async function getMethodCard(brand) {
@@ -21,6 +14,10 @@ export async function getMethodCard(brand) {
   if (introVideoProgressState !== 'completed') {
     //startLearningPath('drumeo', 422533)
     const timestamp = Math.floor(Date.now() / 1000)
+    const instructorText =
+      introVideo.instructor?.length > 1
+        ? 'Multiple Instructors'
+        : introVideo.instructor?.[0]?.name || ''
     return {
       id: 1, // method card has no id
       type: 'method',
@@ -29,7 +26,7 @@ export async function getMethodCard(brand) {
       body: {
         thumbnail: introVideo.thumbnail,
         title: introVideo.title,
-        subtitle: `${introVideo.difficulty_string} • ${introVideo.instructor?.[0]?.name}`,
+        subtitle: `${introVideo.difficulty_string} • ${instructorText}`,
       },
       cta: {
         text: 'Get Started',
@@ -59,9 +56,7 @@ export async function getMethodCard(brand) {
     const nextIncompleteLesson = learningPath?.todays_lessons.find(
       (lesson) => lesson.progressStatus !== 'completed'
     )
-    let ctaText,
-      action,
-      nextLesson = null
+    let ctaText, action
     if (noneCompleted) {
       ctaText = 'Start Session'
       action = getMethodActionCTA(nextIncompleteLesson)

package/src/services/sanity.js

@@ -219,7 +219,7 @@ export async function fetchRelatedSongs(brand, songId) {
             "published_on": published_on,
             status,
             "image": thumbnail.asset->url,
-            "permission_id": permission[]->railcontent_id,
+            "permission_id": permission_v2,
             "fields": [
               {
                 "key": "title",
@@ -245,7 +245,7 @@ export async function fetchRelatedSongs(brand, songId) {
             "id": railcontent_id,
             "url": web_url_path,
             "published_on": published_on,
-            "permission_id": permission[]->railcontent_id,
+            "permission_id": permission_v2,
             status,
             "fields": [
               {
@@ -306,7 +306,7 @@ export async function fetchNewReleases(
       published_on,
       "type": _type,
       web_url_path,
-      "permission_id": permission[]->railcontent_id,
+      "permission_id": permission_v2,
       `
   const query = buildRawQuery(filter, fields, { sortOrder: sortOrder, start, end: end })
   return fetchSanity(query, true)
@@ -343,7 +343,7 @@ export async function fetchUpcomingEvents(brand, { page = 1, limit = 10 } = {})
         published_on,
         "type": _type,
         web_url_path,
-        "permission_id": permission[]->railcontent_id,
+        "permission_id": permission_v2,
         live_event_start_time,
         live_event_end_time,
          "isLive": live_event_start_time <= '${now}' && live_event_end_time >= '${now}'`
@@ -395,7 +395,7 @@ export async function fetchScheduledReleases(brand, { page = 1, limit = 10 }) {
       published_on,
       "type": _type,
       web_url_path,
-      "permission_id": permission[]->railcontent_id,
+      "permission_id": permission_v2,
   } | order(published_on asc)[${start}...${end}]`
   return fetchSanity(query, true)
 }
@@ -911,7 +911,7 @@ export async function fetchMethod(brand, slug) {
         "url": *[railcontent_id == ^.id][0].web_url_path
     } | order(length(url)),
     "type": _type,
-    "permission_id": permission[]->railcontent_id,
+    "permission_id": permission_v2,
     "levels": child[${childrenFilter}]->
       {
         "id": railcontent_id,
@@ -1128,7 +1128,7 @@ export async function fetchLessonContent(railContentId, { addParent = false } =
     mp3_no_drums_yes_click_url,
     mp3_yes_drums_no_click_url,
     mp3_yes_drums_yes_click_url,
-    "permission_id": permission[]->railcontent_id,
+    "permission_id": permission_v2,
     ${parentQuery}
     ...select(
       defined(live_event_start_time) => {
@@ -1266,7 +1266,7 @@ export async function fetchSiblingContent(railContentId, brand = null) {
   }).buildFilter()
 
   const brandString = brand ? ` && brand == "${brand}"` : ''
-  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, status, "type": _type, difficulty, difficulty_string, artist->, "permission_id": permission[]->railcontent_id, "genre": genre[]->name, "parent_id": parent_content_data[0].id`
+  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, status, "type": _type, difficulty, difficulty_string, artist->, "permission_id": permission_v2, "genre": genre[]->name, "parent_id": parent_content_data[0].id`
 
   const query = `*[railcontent_id == ${railContentId}${brandString}]{
    _type, parent_type, 'parent_id': parent_content_data[0].id, railcontent_id,
@@ -1313,7 +1313,7 @@ export async function fetchRelatedLessons(railContentId) {
     { showMembershipRestrictedContent: true }
   ).buildFilter()
 
-  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, status, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type, "genre": genre[]->name`
+  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, status, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission_v2,_type, "genre": genre[]->name`
 
   const query = `*[railcontent_id == ${railContentId} && (!defined(permission) || references(*[_type=='permission']._id))]{
    _type, parent_type, railcontent_id,
@@ -2134,7 +2134,7 @@ export async function fetchScheduledAndNewReleases(
       published_on,
       "type": _type,
       show_in_new_feed,
-      "permission_id": permission[]->railcontent_id,
+      "permission_id": permission_v2,
       "isLive": live_event_start_time <= '${now}' && live_event_end_time >= '${now}',
   }`
 

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

@@ -23,6 +23,13 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     )
   }
 
+  async completedByContentIds(contentIds: number[]) {
+    return this.queryAll(
+      Q.where('content_id', Q.oneOf(contentIds)),
+      Q.where('state', STATE.COMPLETED)
+    )
+  }
+
   // null collection only
   async startedOrCompleted(opts: Parameters<typeof this.startedOrCompletedClauses>[0] = {}) {
     return this.queryAll(...this.startedOrCompletedClauses(opts))