musora-content-services 2.107.2 → 2.107.3

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.107.3](https://github.com/railroadmedia/musora-content-services/compare/v2.107.2...v2.107.3) (2025-12-19)
+
+
+### Bug Fixes
+
+* **AGI:** contentType optional ([deae293](https://github.com/railroadmedia/musora-content-services/commit/deae2934c26ea0b9ee4d68c736fbb5753616a5e9))
+* **AGI:** return children on AGI lessons functions ([#671](https://github.com/railroadmedia/musora-content-services/issues/671)) ([92ed791](https://github.com/railroadmedia/musora-content-services/commit/92ed791ce563aa4f1bf16cb41d2b6fe421504064))
+* **onboarding:** call BE for recommendation ([#670](https://github.com/railroadmedia/musora-content-services/issues/670)) ([a876736](https://github.com/railroadmedia/musora-content-services/commit/a8767363ff3428638bde477cd6c30e5bf61179b2))
+
 ### [2.107.2](https://github.com/railroadmedia/musora-content-services/compare/v2.107.1...v2.107.2) (2025-12-19)
 
 ### [2.107.1](https://github.com/railroadmedia/musora-content-services/compare/v2.107.0...v2.107.1) (2025-12-19)

package/package.json

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

package/src/services/content/artist.ts

@@ -1,12 +1,12 @@
 /**
  * @module Artist
  */
-import { getFieldsForContentType } from '../../contentTypeConfig.js'
+import { getFieldsForContentTypeWithFilteredChildren } from '../../contentTypeConfig.js'
+import { Brands } from '../../lib/brands'
+import { Filters as f } from '../../lib/sanity/filter'
 import { BuildQueryOptions, query } from '../../lib/sanity/query'
 import { fetchSanity, getSortOrder } from '../sanity.js'
 import { Lesson } from './content'
-import { Brands } from '../../lib/brands'
-import { Filters as f } from '../../lib/sanity/filter'
 
 export interface Artist {
   slug: string
@@ -123,7 +123,7 @@ export interface ArtistLessons {
 export async function fetchArtistLessons(
   slug: string,
   brand: Brands | string,
-  contentType: string,
+  contentType?: string,
   {
     sort = '-published_on',
     searchTerm = '',
@@ -150,7 +150,7 @@ export async function fetchArtistLessons(
     .and(restrictions)
     .order(sort)
     .slice(offset, limit)
-    .select(getFieldsForContentType(contentType) as string)
+    .select((await getFieldsForContentTypeWithFilteredChildren(contentType, true)) as string)
     .build()
 
   const total = query().and(restrictions).build()

package/src/services/content/genre.ts

@@ -1,12 +1,12 @@
 /**
  * @module Genre
  */
-import { getFieldsForContentType } from '../../contentTypeConfig.js'
-import { fetchSanity, getSortOrder } from '../sanity.js'
-import { Lesson } from './content'
-import { BuildQueryOptions, query } from '../../lib/sanity/query'
+import { getFieldsForContentTypeWithFilteredChildren } from '../../contentTypeConfig.js'
 import { Brands } from '../../lib/brands'
 import { Filters as f } from '../../lib/sanity/filter'
+import { BuildQueryOptions, query } from '../../lib/sanity/query'
+import { fetchSanity, getSortOrder } from '../sanity.js'
+import { Lesson } from './content'
 
 export interface Genre {
   name: string
@@ -149,7 +149,7 @@ export async function fetchGenreLessons(
     .and(restrictions)
     .order(sort)
     .slice(offset, limit)
-    .select(getFieldsForContentType(contentType) as string)
+    .select((await getFieldsForContentTypeWithFilteredChildren(contentType, true)) as string)
     .build()
 
   const total = query().and(restrictions).build()

package/src/services/content/instructor.ts

@@ -1,12 +1,12 @@
 /**
  * @module Instructor
  */
-import { getFieldsForContentType } from '../../contentTypeConfig.js'
-import { fetchSanity, getSortOrder } from '../sanity.js'
-import { Lesson } from './content'
-import { BuildQueryOptions, query } from '../../lib/sanity/query'
+import { getFieldsForContentTypeWithFilteredChildren } from '../../contentTypeConfig.js'
 import { Brands } from '../../lib/brands'
 import { Filters as f } from '../../lib/sanity/filter'
+import { BuildQueryOptions, query } from '../../lib/sanity/query'
+import { fetchSanity, getSortOrder } from '../sanity.js'
+import { Lesson } from './content'
 
 export interface Instructor {
   lesson_count: number
@@ -106,7 +106,7 @@ export interface InstructorLessons {
  * Fetch the data needed for the instructor screen.
  * @param {string} slug - The slug of the instructor
  * @param {Brands|string} brand - The brand for which to fetch instructor lessons
- *
+ * @param {string|null} [contentType] - The content type to filter lessons by (e.g., 'lesson', 'course').
  * @param {FetchInstructorLessonsOptions} options - Parameters for pagination, filtering and sorting.
  * @param {string} [options.sortOrder="-published_on"] - The field to sort the lessons by.
  * @param {string} [options.searchTerm=""] - The search term to filter content by title.
@@ -123,6 +123,7 @@ export interface InstructorLessons {
 export async function fetchInstructorLessons(
   slug: string,
   brand: Brands | string,
+  contentType?: string,
   {
     sort = '-published_on',
     searchTerm = '',
@@ -147,7 +148,7 @@ export async function fetchInstructorLessons(
     .and(restrictions)
     .order(sort)
     .slice(offset, limit)
-    .select(getFieldsForContentType() as string)
+    .select((await getFieldsForContentTypeWithFilteredChildren(contentType, true)) as string)
     .build()
 
   const total = query().and(restrictions).build()

package/src/services/user/onboarding.ts

@@ -1,8 +1,7 @@
 /**
  * @module Onboarding
  */
-import { HttpClient } from '../../infrastructure/http/HttpClient'
-import { Brands } from '../../lib/brands'
+import { GET, POST, PUT } from '../../infrastructure/http/HttpClient'
 import { globalConfig } from '../config.js'
 
 export interface OnboardingSteps {
@@ -55,8 +54,7 @@ export async function startOnboarding({
   steps = {},
   marketingOptIn = false,
 }: StartOnboardingParams): Promise<Onboarding> {
-  const httpClient = new HttpClient(globalConfig.baseUrl)
-  return httpClient.post<Onboarding>(`/api/user-management-system/v1/onboardings`, {
+  return POST(`/api/user-management-system/v1/onboardings`, {
     email,
     brand,
     flow,
@@ -91,8 +89,7 @@ export async function updateOnboarding({
   is_completed = false,
   marketingOptIn = false,
 }: UpdateOnboardingParams): Promise<Onboarding> {
-  const httpClient = new HttpClient(globalConfig.baseUrl)
-  return httpClient.put<Onboarding>(`/api/user-management-system/v1/onboardings/${id}`, {
+  return PUT(`/api/user-management-system/v1/onboardings/${id}`, {
     email,
     brand,
     flow,
@@ -111,8 +108,7 @@ export async function updateOnboarding({
  * @throws {HttpError} - If the HTTP request fails.
  */
 export async function userOnboardingForBrand(brand: string): Promise<Onboarding> {
-  const httpClient = new HttpClient(globalConfig.baseUrl)
-  return httpClient.get<Onboarding>(
+  return GET(
     `/api/user-management-system/v1/users/${globalConfig.sessionConfig.userId}/onboardings/brand/${encodeURIComponent(brand)}`
   )
 }
@@ -132,126 +128,20 @@ export interface OnboardingRecommendedContent {
   }
 }
 
-const recommendedContentCache: { [brand: string]: OnboardingRecommendedContent } = {
-  drumeo: {
-    id: 415737,
-    title: 'The Power Of Your Left Hand (Beginner)',
-    difficulty: 'Beginner',
-    lesson_count: 12,
-    skill_count: 1,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'Start your drumming journey with essential techniques and rhythms to get you playing quickly.',
-    video: {
-      external_id: '1002267396',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/250467786.m3u8?s=52dc97fc96fe903d80bf71bc1b1709cc444db407&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  },
-  pianote: {
-    id: 412405,
-    title: 'Getting Started On The Piano',
-    difficulty: 'Beginner',
-    lesson_count: 4,
-    skill_count: 3,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'The goal of this course is to introduce you to the keys, and get you playing a song as fast as possible. ',
-    video: {
-      external_id: '1001267395',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/1001267395.m3u8?s=8f8d8a8a762f688058e6e6fd6704c402baf1b797&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  },
-  guitareo: {
-    id: 191346,
-    title: 'Understanding Your Instrument',
-    difficulty: 'Beginner',
-    lesson_count: 6,
-    skill_count: 5,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'New to the acoustic guitar? Then this Course is for you! Learn everything you need to get started on the acoustic guitar, and start playing music as fast as possible!',
-    video: {
-      external_id: '1003267397',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/166972298.m3u8?s=a93bfe96a4ce9ac5a4eba3441838847ef2eafc9b&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  },
-  singeo: {
-    id: 415737,
-    title: 'Sound Like A Star — Mastering Iconic Pop Voices',
-    difficulty: 'Beginner',
-    lesson_count: 5,
-    skill_count: 4,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'Welcome to the Singing Starter Kit! This course will teach you everything you need to know to sound better when you sing! You will learn how your unique voice works so that you can develop vocal strength, accurate pitch, and find confidence singing your favorite songs. You can sing, and the Singing Starter Kit is the perfect way to start your singing journey.',
-    video: {
-      external_id: '1004267398',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/1040159819.m3u8?s=f238ad1a650fb30a49c36d61996c982f06ffffb1&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  },
-  playbass: {
-    id: 191346,
-    title: 'Understanding Your Instrument',
-    difficulty: 'Beginner',
-    lesson_count: 6,
-    skill_count: 5,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'New to the acoustic guitar? Then this Course is for you! Learn everything you need to get started on the acoustic guitar, and start playing music as fast as possible!',
-    video: {
-      external_id: '1003267397',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/166972298.m3u8?s=a93bfe96a4ce9ac5a4eba3441838847ef2eafc9b&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  },
+export interface OnboardingRecommendationResponse {
+  recommendation: OnboardingRecommendedContent
+  user_onboarding: Onboarding
 }
 
 /**
  * Fetches recommended content for onboarding based on the specified brand.
  *
- * @param {string} email - The user's email address.
- * @param {Brands} brand - The brand identifier.
- * @returns {Promise<OnboardingRecommendedContent>} - A promise that resolves with the recommended content.
+ * @param {number} onboardingId - The ID of the onboarding process.
+ * @returns {Promise<OnboardingRecommendationResponse>} - A promise that resolves with the recommended content.
  * @throws {HttpError} - If the HTTP request fails.
  */
 export async function getOnboardingRecommendedContent(
-  email: string,
-  brand: Brands
-): Promise<OnboardingRecommendedContent> {
-  // TODO: Replace with real API call when available
-  if (recommendedContentCache[brand]) {
-    return recommendedContentCache[brand]
-  }
-
-  return {
-    id: 412405,
-    title: 'Getting Started On The Piano',
-    difficulty: 'Beginner',
-    lesson_count: 4,
-    skill_count: 3,
-    badge:
-      'https://cdn.sanity.io/files/4032r8py/staging/9470587f03479b7c1f8019c3cbcbdfe12aa267f3.png',
-    description:
-      'The goal of this course is to introduce you to the keys, and get you playing a song as fast as possible. ',
-    video: {
-      external_id: '1001267395',
-      hlsManifestUrl:
-        'https://player.vimeo.com/external/1001267395.m3u8?s=8f8d8a8a762f688058e6e6fd6704c402baf1b797&oauth2_token_id=1284792283',
-      type: 'vimeo-video',
-    },
-  }
+  onboardingId: number
+): Promise<OnboardingRecommendationResponse> {
+  return POST(`/api/user-management-system/v1/onboardings/${onboardingId}/recommendation`, {})
 }

package/.claude/settings.local.json

@@ -1,19 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "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:*)",
-      "Bash(npm run build-index:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}