musora-content-services 2.92.6 → 2.93.0

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

@@ -1,61 +1,73 @@
-name: Sync V2 Docs to Main
+name: Deploy Docs to GitHub Pages
 on:
   push:
-    branches: [project-v2]
+    branches: [main, project-v2]
+
+# Required permissions for GitHub Pages deployment
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
 
 jobs:
-  sync-docs:
+  deploy-docs:
     runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
     steps:
+      - name: Checkout main branch
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          path: main-content
+
       - name: Checkout project-v2 branch
         uses: actions/checkout@v4
         with:
           ref: project-v2
-          path: project-v2-content
+          path: v2-content
 
-      - name: Checkout main branch
-        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          ref: main
-          path: main-content
-          token: ${{ secrets.PROJECT_V2_DOCS_TOKEN }}  #use separate token to trigger other actions
+          node-version: '20'
 
-      - name: Copy docs from project-v2 to main
-        run: |
-          # Create the target directory if it doesn't exist
-          mkdir -p main-content/docs/v2
-
-          # Remove existing v2 docs to ensure clean copy
-          rm -rf main-content/docs/v2/*
-
-          # Copy docs from project-v2 to main/docs/v2
-          if [ -d "project-v2-content/docs" ]; then
-            cp -r project-v2-content/docs/* main-content/docs/v2/
-            echo "✅ Copied docs from project-v2 to main/docs/v2"
-          else
-            echo "⚠️ No docs folder found in project-v2 branch"
-            exit 1
-          fi
+      - name: Install dependencies for v2
+        working-directory: v2-content
+        run: npm ci
 
-      - name: Commit and push changes to main
-        id: commit
+      - name: Generate v2 documentation
+        working-directory: v2-content
+        run: npm run doc
+
+      - name: Combine v1 and v2 docs into deployment structure
         run: |
-          cd main-content
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-
-          # Check if there are any changes
-          if [ -n "$(git status --porcelain)" ]; then
-            git add docs/v2/
-            git commit -m "🔄 Auto-sync: Update v2 docs from project-v2 branch
-
-            - Synced from project-v2/docs
-            - Triggered by commit: ${{ github.sha }}
-            - Date: $(date)"
-            git push
-            echo "✅ Successfully pushed updated docs to main branch"
-            echo "changes=true" >> $GITHUB_OUTPUT
-          else
-            echo "ℹ️ No changes detected in docs"
-            echo "changes=false" >> $GITHUB_OUTPUT
+          mkdir -p _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/
+          echo "✅ Combined v1 (root) and v2 (/v2/) documentation"
+
+      - name: Setup GitHub Pages
+        uses: actions/configure-pages@v4
+
+      - name: Upload combined documentation artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: './_site'
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 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)
+
+
+### Bug Fixes
+
+* **agi:** make brand parameter less strict for now ([#603](https://github.com/railroadmedia/musora-content-services/issues/603)) ([b440b92](https://github.com/railroadmedia/musora-content-services/commit/b440b92ae1b4aab80d7e5ac5238c1e386cf09db8))
+
 ### [2.92.6](https://github.com/railroadmedia/musora-content-services/compare/v2.92.5...v2.92.6) (2025-12-02)
 
 ### [2.92.5](https://github.com/railroadmedia/musora-content-services/compare/v2.92.3...v2.92.5) (2025-12-02)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.92.6",
+  "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/lib/brands.ts

@@ -1,8 +1,8 @@
-export enum Brand {
-  MUSORA = 'musora',
-  DRUMEO = 'drumeo',
-  PIANOTE = 'pianote',
-  GUITAREO = 'guitareo',
-  SINGEO = 'singeo',
-  PLAYBASS = 'playbass',
+export enum Brands {
+  Musora = 'musora',
+  Drumeo = 'drumeo',
+  Pianote = 'pianote',
+  Guitareo = 'guitareo',
+  Singeo = 'singeo',
+  Playbass = 'playbass',
 }

package/src/services/content/artist.ts

@@ -6,7 +6,7 @@ import { FilterBuilder } from '../../filterBuilder.js'
 import { buildDataAndTotalQuery } from '../../lib/sanity/query'
 import { fetchSanity, getSortOrder } from '../sanity.js'
 import { Lesson } from './content'
-import { Brand } from '../../lib/brands'
+import { Brands } from '../../lib/brands'
 
 export interface Artist {
   slug: string
@@ -18,7 +18,7 @@ export interface Artist {
 /**
  * Fetch all artists with lessons available for a specific brand.
  *
- * @param {Brand} brand - The brand for which to fetch artists.
+ * @param {Brands|string} brand - The brand for which to fetch artists.
  * @returns {Promise<Artist[]|null>} - A promise that resolves to an array of artist objects or null if not found.
  *
  * @example
@@ -26,7 +26,7 @@ export interface Artist {
  *   .then(artists => console.log(artists))
  *   .catch(error => console.error(error));
  */
-export async function fetchArtists(brand: Brand): Promise<Artist[] | null> {
+export async function fetchArtists(brand: Brands | string): Promise<Artist[] | null> {
   const filter = await new FilterBuilder(
     `_type == "song" && brand == "${brand}" && references(^._id)`,
     { bypassPermissions: true }
@@ -45,7 +45,7 @@ export async function fetchArtists(brand: Brand): Promise<Artist[] | null> {
  * Fetch a single artist by their Sanity ID.
  *
  * @param {string} slug - The name of the artist to fetch.
- * @param {Brand} [brand] - The brand for which to fetch the artist.
+ * @param {Brands|string} [brand] - The brand for which to fetch the artist.
  * @returns {Promise<Artist|null>} - A promise that resolves to an artist objects or null if not found.
  *
  * @example
@@ -53,7 +53,10 @@ export async function fetchArtists(brand: Brand): Promise<Artist[] | null> {
  *   .then(artists => console.log(artists))
  *   .catch(error => console.error(error));
  */
-export async function fetchArtistBySlug(slug: string, brand?: Brand): Promise<Artist | null> {
+export async function fetchArtistBySlug(
+  slug: string,
+  brand?: Brands | string
+): Promise<Artist | null> {
   const brandFilter = brand ? `brand == "${brand}" && ` : ''
   const filter = await new FilterBuilder(`${brandFilter} _type == "song" && references(^._id)`, {
     bypassPermissions: true,
@@ -84,7 +87,7 @@ export interface LessonsByArtistResponse {
 /**
  * Fetch the artist's lessons.
  * @param {string} slug - The slug of the artist
- * @param {Brand} brand - The brand for which to fetch lessons.
+ * @param {Brands|string} brand - The brand for which to fetch lessons.
  * @param {string} contentType - The type of the lessons we need to get from the artist. If not defined, groq will get lessons from all content types
  * @param {Object} params - Parameters for sorting, searching, pagination and filtering.
  * @param {string} [params.sort="-published_on"] - The field to sort the lessons by.
@@ -102,7 +105,7 @@ export interface LessonsByArtistResponse {
  */
 export async function fetchArtistLessons(
   slug: string,
-  brand: Brand,
+  brand: Brands | string,
   contentType: string,
   {
     sort = '-published_on',

package/src/services/content/genre.ts

@@ -6,7 +6,7 @@ import { fetchSanity, getSortOrder } from '../sanity.js'
 import { FilterBuilder } from '../../filterBuilder.js'
 import { Lesson } from './content'
 import { buildDataAndTotalQuery } from '../../lib/sanity/query'
-import { Brand } from '../../lib/brands'
+import { Brands } from '../../lib/brands'
 
 export interface Genre {
   name: string
@@ -18,7 +18,7 @@ export interface Genre {
 /**
  * Fetch all genres with lessons available for a specific brand.
  *
- * @param {string} [brand] - The brand for which to fetch the genre for. Lesson count will be filtered by this brand if provided.
+ * @param {Brands|string} [brand] - The brand for which to fetch the genre for. Lesson count will be filtered by this brand if provided.
  * @returns {Promise<Genre[]>} - A promise that resolves to an genre object or null if not found.
  *
  * @example
@@ -26,7 +26,7 @@ export interface Genre {
  *   .then(genres => console.log(genres))
  *   .catch(error => console.error(error));
  */
-export async function fetchGenres(brand: Brand): Promise<Genre[]> {
+export async function fetchGenres(brand: Brands | string): Promise<Genre[]> {
   const filter = await new FilterBuilder(`brand == "${brand}" && references(^._id)`, {
     bypassPermissions: true,
   }).buildFilter()
@@ -46,7 +46,7 @@ export async function fetchGenres(brand: Brand): Promise<Genre[]> {
  * Fetch a single genre by their slug and brand
  *
  * @param {string} slug - The slug of the genre to fetch.
- * @param {Brand} [brand] - The brand for which to fetch the genre. Lesson count will be filtered by this brand if provided.
+ * @param {Brands|string} [brand] - The brand for which to fetch the genre. Lesson count will be filtered by this brand if provided.
  * @returns {Promise<Genre[]|null>} - A promise that resolves to an genre object or null if not found.
  *
  * @example
@@ -54,7 +54,10 @@ export async function fetchGenres(brand: Brand): Promise<Genre[]> {
  *   .then(genres => console.log(genres))
  *   .catch(error => console.error(error));
  */
-export async function fetchGenreBySlug(slug: string, brand?: Brand): Promise<Genre | null> {
+export async function fetchGenreBySlug(
+  slug: string,
+  brand?: Brands | string
+): Promise<Genre | null> {
   const brandFilter = brand ? `brand == "${brand}" && ` : ''
   const filter = await new FilterBuilder(`${brandFilter} references(^._id)`, {
     bypassPermissions: true,
@@ -88,7 +91,7 @@ export interface LessonsByGenreResponse {
 /**
  * Fetch the genre's lessons.
  * @param {string} slug - The slug of the genre
- * @param {Brand} brand - The brand for which to fetch lessons.
+ * @param {Brands|string} brand - The brand for which to fetch lessons.
  * @param {Object} params - Parameters for sorting, searching, pagination and filtering.
  * @param {string} [params.sort="-published_on"] - The field to sort the lessons by.
  * @param {string} [params.searchTerm=""] - The search term to filter the lessons.
@@ -105,7 +108,7 @@ export interface LessonsByGenreResponse {
  */
 export async function fetchGenreLessons(
   slug: string,
-  brand: Brand,
+  brand: Brands | string,
   contentType?: string,
   {
     sort = '-published_on',

package/src/services/content/instructor.ts

@@ -6,7 +6,7 @@ import { filtersToGroq, getFieldsForContentType } from '../../contentTypeConfig.
 import { fetchSanity, getSortOrder } from '../sanity.js'
 import { Lesson } from './content'
 import { buildDataAndTotalQuery } from '../../lib/sanity/query'
-import { Brand } from '../../lib/brands'
+import { Brands } from '../../lib/brands'
 
 export interface Instructor {
   lessonCount: number
@@ -19,7 +19,7 @@ export interface Instructor {
 /**
  * Fetch all instructor with lessons available for a specific brand.
  *
- * @param {Brand} brand - The brand for which to fetch instructors.
+ * @param {Brands|string} brand - The brand for which to fetch instructors.
  * @returns {Promise<Instructor[]>} - A promise that resolves to an array of instructor objects.
  *
  * @example
@@ -27,7 +27,7 @@ export interface Instructor {
  *   .then(instructors => console.log(instructors))
  *   .catch(error => console.error(error));
  */
-export async function fetchInstructors(brand: Brand): Promise<Instructor[]> {
+export async function fetchInstructors(brand: Brands | string): Promise<Instructor[]> {
   const filter = await new FilterBuilder(`brand == "${brand}" && references(^._id)`, {
     bypassPermissions: true,
   }).buildFilter()
@@ -46,7 +46,7 @@ export async function fetchInstructors(brand: Brand): Promise<Instructor[]> {
  * Fetch a single instructor by their name
  *
  * @param {string} slug - The slug of the instructor to fetch.
- * @param {Brand} [brand] - The brand for which to fetch the instructor. Lesson count will be filtered by this brand if provided.
+ * @param {Brands|string} [brand] - The brand for which to fetch the instructor. Lesson count will be filtered by this brand if provided.
  * @returns {Promise<Instructor[]>} - A promise that resolves to an instructor object or null if not found.
  *
  * @example
@@ -56,7 +56,7 @@ export async function fetchInstructors(brand: Brand): Promise<Instructor[]> {
  */
 export async function fetchInstructorBySlug(
   slug: string,
-  brand?: Brand
+  brand?: Brands | string
 ): Promise<Instructor | null> {
   const brandFilter = brand ? `brand == "${brand}" && ` : ''
   const filter = await new FilterBuilder(`${brandFilter} references(^._id)`, {
@@ -89,8 +89,8 @@ export interface InstructorLessonsResponse {
 
 /**
  * Fetch the data needed for the instructor screen.
- * @param {string} brand - The brand for which to fetch instructor lessons
  * @param {string} slug - The slug of the instructor
+ * @param {Brands|string} brand - The brand for which to fetch instructor lessons
  *
  * @param {FetchInstructorLessonsOptions} options - Parameters for pagination, filtering and sorting.
  * @param {string} [options.sortOrder="-published_on"] - The field to sort the lessons by.
@@ -107,7 +107,7 @@ export interface InstructorLessonsResponse {
  */
 export async function fetchInstructorLessons(
   slug: string,
-  brand: Brand,
+  brand: Brands | string,
   {
     sortOrder = '-published_on',
     searchTerm = '',

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/reporting/reporting.ts

@@ -9,13 +9,8 @@
 
 import { HttpClient } from '../../infrastructure/http/HttpClient'
 import { globalConfig } from '../config.js'
-import {
-  ReportResponse,
-  ReportableType,
-  IssueTypeMap,
-  ReportIssueOption,
-} from './types'
-import {Brand} from "../../lib/brands";
+import { ReportResponse, ReportableType, IssueTypeMap, ReportIssueOption } from './types'
+import { Brands } from '../../lib/brands'
 
 /**
  * Parameters for submitting a report with type-safe issue values
@@ -30,7 +25,7 @@ export type ReportParams<T extends ReportableType = ReportableType> = {
   /** Details about the issue - required when issue is 'other', not sent otherwise */
   details?: string
   /** Brand context (required: drumeo, pianote, guitareo, singeo, playbass) */
-  brand: Brand
+  brand: Brands | string
 }
 
 /**
@@ -73,7 +68,9 @@ export type ReportParams<T extends ReportableType = ReportableType> = {
  *   brand: 'drumeo'
  * })
  */
-export async function report<T extends ReportableType>(params: ReportParams<T>): Promise<ReportResponse> {
+export async function report<T extends ReportableType>(
+  params: ReportParams<T>
+): Promise<ReportResponse> {
   const httpClient = new HttpClient(globalConfig.baseUrl)
 
   // Build request body
@@ -125,7 +122,10 @@ export async function report<T extends ReportableType>(params: ReportParams<T>):
  * //   { value: 'other', label: 'Other' }
  * // ]
  */
-export function getReportIssueOptions(type: ReportableType, isMobileApp: boolean = false): ReportIssueOption[] {
+export function getReportIssueOptions(
+  type: ReportableType,
+  isMobileApp: boolean = false
+): ReportIssueOption[] {
   switch (type) {
     case 'forum_post':
       return [
@@ -147,7 +147,10 @@ export function getReportIssueOptions(type: ReportableType, isMobileApp: boolean
 
     case 'content':
       const contentOptions = [
-        { value: 'incorrect_metadata', label: 'The lesson image, title or description is incorrect' },
+        {
+          value: 'incorrect_metadata',
+          label: 'The lesson image, title or description is incorrect',
+        },
         { value: 'video_issue', label: 'Video issue' },
       ]
 
@@ -165,7 +168,10 @@ export function getReportIssueOptions(type: ReportableType, isMobileApp: boolean
 
     case 'playlist':
       const playlistOptions = [
-        { value: 'incorrect_metadata', label: 'The lesson image, title or description is incorrect' },
+        {
+          value: 'incorrect_metadata',
+          label: 'The lesson image, title or description is incorrect',
+        },
         { value: 'video_issue', label: 'Video issue' },
       ]
 
@@ -182,8 +188,6 @@ export function getReportIssueOptions(type: ReportableType, isMobileApp: boolean
       return playlistOptions
 
     default:
-      return [
-        { value: 'other', label: 'Other' },
-      ]
+      return [{ value: 'other', label: 'Other' }]
   }
 }

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

package/src/services/user/onboarding.ts

@@ -2,7 +2,7 @@
  * @module Onboarding
  */
 import { HttpClient } from '../../infrastructure/http/HttpClient'
-import { Brand } from '../../lib/brands'
+import { Brands } from '../../lib/brands'
 import { globalConfig } from '../config.js'
 
 export interface OnboardingSteps {
@@ -224,13 +224,13 @@ const recommendedContentCache: { [brand: string]: OnboardingRecommendedContent }
  * Fetches recommended content for onboarding based on the specified brand.
  *
  * @param {string} email - The user's email address.
- * @param {Brand} brand - The brand identifier.
+ * @param {Brands} brand - The brand identifier.
  * @returns {Promise<OnboardingRecommendedContent>} - A promise that resolves with the recommended content.
  * @throws {HttpError} - If the HTTP request fails.
  */
 export async function getOnboardingRecommendedContent(
   email: string,
-  brand: Brand
+  brand: Brands
 ): Promise<OnboardingRecommendedContent> {
   // TODO: Replace with real API call when available
   if (recommendedContentCache[brand]) {