musora-content-services 2.165.5 → 2.166.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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.166.0](https://github.com/railroadmedia/musora-content-services/compare/v2.165.5...v2.166.0) (2026-07-02)
+
+
+### Features
+
+* **BEHLPT-186:**  subscription upgrade endpoints ([#1003](https://github.com/railroadmedia/musora-content-services/issues/1003)) ([9da55f2](https://github.com/railroadmedia/musora-content-services/commit/9da55f24708976190317a3b69381acbccce2f33c))
+
+
+### Bug Fixes
+
+* **BR-671:** fix Latin/World style search ([#1002](https://github.com/railroadmedia/musora-content-services/issues/1002)) ([25fdff8](https://github.com/railroadmedia/musora-content-services/commit/25fdff80c6279e8568ea057ac250f7e057717ccf))
+
 ### [2.165.5](https://github.com/railroadmedia/musora-content-services/compare/v2.165.4...v2.165.5) (2026-06-25)
 
 

package/package.json

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

package/src/contentTypeConfig.js

@@ -876,7 +876,14 @@ function createTypeConditions(lessonTypes) {
  * Filter handler registry - maps filter keys to their handler functions
  */
 const filterHandlers = {
-  style: (value) => `"${value}" in genre[]->name`,
+  style: (value) => {
+    const hasMultipleStyles = value.includes('/')
+    const styles = [value]
+    if (hasMultipleStyles) {
+      styles.push(...value.split('/').map((s) => s.trim()))
+    }
+    return styles.map((style) => `"${style}" in genre[]->name`).join(' || ')
+  },
 
   difficulty: (value) => {
     return `difficulty_string == "${value}"`

package/src/services/multi-user-accounts/multi-user-accounts.ts

@@ -20,7 +20,9 @@ export interface InviteResponse {
   can_be_accepted: boolean
   is_account_valid: boolean
   is_invite_active: boolean
-  can_user_join: boolean
+  can_user_join: boolean // deprecated in favour of is_user_part_of_existing_mua which is more descriptive
+  is_user_active_subscriber: boolean
+  is_user_part_of_existing_mua: boolean
   primary_user_name: string
   product_name: string
   // These fields leak user information and are excluded entirely for the public endpoint

package/src/services/progress/internal/bubble.ts

@@ -85,7 +85,7 @@ export const bubbleProgress = async (
   collection?: CollectionParameter
 ): Promise<Record<number, number>> => {
   const ids = getAncestorAndSiblingIds(hierarchy, contentId)
-  const progresses = await getByIds(ids, 'progress_percent', 0, collection)
+  const progresses = await getByIds(ids, (p) => p.progress_percent, 0, collection)
   return averageProgressesFor(hierarchy, contentId, progresses)
 }
 

package/src/services/progress/internal/queries.ts

@@ -1,9 +1,12 @@
 import { db } from '../../sync'
-import { CollectionParameter } from '../../sync/models/ContentProgress'
+import type { ModelSerialized } from '../../sync/serializers'
+import ContentProgress, { CollectionParameter } from '../../sync/models/ContentProgress'
+
+type Selector<V> = (p: ModelSerialized<ContentProgress>) => V
 
 export const getByIds = async <V>(
   contentIds: number[],
-  dataKey: string,
+  selector: Selector<V>,
   defaultValue: V,
   collection?: CollectionParameter
 ): Promise<Map<number, V>> => {
@@ -12,7 +15,7 @@ export const getByIds = async <V>(
   const progress = new Map(contentIds.map((id) => [id, defaultValue]))
   await db.contentProgress.getSomeProgressByContentIds(contentIds, collection).then((r) => {
     r.data.forEach((p) => {
-      progress.set(p.content_id, p[dataKey] ?? defaultValue)
+      progress.set(p.content_id, selector(p) ?? defaultValue)
     })
   })
   return progress
@@ -20,24 +23,39 @@ export const getByIds = async <V>(
 
 export const getById = async <V>(
   contentId: number,
-  dataKey: string,
+  selector: Selector<V>,
   defaultValue: V,
   collection?: CollectionParameter
 ): Promise<V> => {
   if (!contentId) return defaultValue
   return db.contentProgress
     .getOneProgressByContentId(contentId, collection)
-    .then((r) => r.data?.[dataKey] ?? defaultValue)
+    .then((r) => (r.data ? selector(r.data) : defaultValue) ?? defaultValue)
 }
 
-export const getByRecordIds = async <V>(ids: string[], dataKey: string, defaultValue: V) => {
+export const getByRecordIds = async <V>(ids: string[], selector: Selector<V>, defaultValue: V) => {
   const progress = Object.fromEntries(ids.map((id) => [id, defaultValue]))
 
   await db.contentProgress.getSomeProgressByRecordIds(ids).then((r) => {
     r.data.forEach((p) => {
-      progress[p.id] = p[dataKey] ?? defaultValue
+      progress[p.id] = selector(p) ?? defaultValue
     })
   })
 
   return progress
 }
+
+export const queryById =
+  <V>(selector: Selector<V>, defaultValue: V) =>
+  (contentId: number, collection?: CollectionParameter) =>
+    getById(contentId, selector, defaultValue, collection)
+
+export const queryByIds =
+  <V>(selector: Selector<V>, defaultValue: V) =>
+  (contentIds: number[], collection?: CollectionParameter) =>
+    getByIds(contentIds, selector, defaultValue, collection)
+
+export const queryByRecordIds =
+  <V>(selector: Selector<V>, defaultValue: V) =>
+  (ids: string[]) =>
+    getByRecordIds(ids, selector, defaultValue)

package/src/services/progress/state.ts

@@ -1,21 +1,32 @@
 import { db } from '../sync'
-import { COLLECTION_TYPE, CollectionParameter } from '../sync/models/ContentProgress'
-import { getById, getByIds, getByRecordIds } from './internal/queries'
+import type { ModelSerialized } from '../sync/serializers'
+import ContentProgress, { COLLECTION_TYPE, CollectionParameter } from '../sync/models/ContentProgress'
+import { queryById, queryByIds, queryByRecordIds } from './internal/queries'
 import type { ProgressSnapshot } from './types'
 
-export const state = async (contentId: number, collection?: CollectionParameter) =>
-  getById(contentId, 'state', '', collection)
-
-export const stateByIds = async (contentIds: number[], collection?: CollectionParameter) =>
-  getByIds(contentIds, 'state', '', collection)
-
-export const stateByRecordIds = async (ids: string[]) => getByRecordIds(ids, 'state', '')
+const buildSnapshotMap = <K extends string | number>(
+  ids: K[],
+  records: ModelSerialized<ContentProgress>[],
+  keyOf: (p: ModelSerialized<ContentProgress>) => K,
+  lastUpdateOf: (p: ModelSerialized<ContentProgress>) => number
+): Map<K, ProgressSnapshot> => {
+  const overrides = new Map(
+    records.map((p) => [
+      keyOf(p),
+      { last_update: lastUpdateOf(p), progress: p.progress_percent, status: p.state as string },
+    ])
+  )
+  return new Map(
+    ids.map((id) => [id, overrides.get(id) ?? { last_update: 0, progress: 0, status: '' }])
+  )
+}
 
-export const playbackPositionByIds = async (contentIds: number[], collection?: CollectionParameter) =>
-  getByIds(contentIds, 'resume_time_seconds', 0, collection)
+export const state = queryById((p) => p.state as string, '')
+export const stateByIds = queryByIds((p) => p.state as string, '')
+export const stateByRecordIds = queryByRecordIds((p) => p.state as string, '')
 
-export const playbackPositionByRecordIds = async (ids: string[]) =>
-  getByRecordIds(ids, 'resume_time_seconds', 0)
+export const playbackPositionByIds = queryByIds((p) => p.resume_time_seconds ?? 0, 0)
+export const playbackPositionByRecordIds = queryByRecordIds((p) => p.resume_time_seconds ?? 0, 0)
 
 export const lastInteractedOf = (
   contentIds: number[],
@@ -53,43 +64,17 @@ export const incompleteLesson = (
 export const snapshotByIds = async (
   contentIds: number[],
   collection?: CollectionParameter
-): Promise<Map<number, ProgressSnapshot>> => {
-  const result = new Map<number, ProgressSnapshot>(
-    contentIds.map((id) => [id, { last_update: 0, progress: 0, status: '' }])
-  )
-
-  await db.contentProgress.getSomeProgressByContentIds(contentIds, collection).then((r) => {
-    r.data.forEach((p) => {
-      result.set(p.content_id, {
-        last_update: p.last_interacted_a_la_carte,
-        progress: p.progress_percent,
-        status: p.state,
-      })
-    })
-  })
-
-  return result
-}
+): Promise<Map<number, ProgressSnapshot>> =>
+  db.contentProgress
+    .getSomeProgressByContentIds(contentIds, collection)
+    .then((r) => buildSnapshotMap(contentIds, r.data, (p) => p.content_id, (p) => p.last_interacted_a_la_carte))
 
 export const snapshotByRecordIds = async (
   ids: string[]
-): Promise<Record<string, ProgressSnapshot>> => {
-  const result = Object.fromEntries(
-    ids.map((id) => [id, { last_update: 0, progress: 0, status: '' }])
-  ) as Record<string, ProgressSnapshot>
-
-  await db.contentProgress.getSomeProgressByRecordIds(ids).then((r) => {
-    r.data.forEach((p) => {
-      result[p.id] = {
-        last_update: p.updated_at,
-        progress: p.progress_percent,
-        status: p.state,
-      }
-    })
-  })
-
-  return result
-}
+): Promise<Record<string, ProgressSnapshot>> =>
+  db.contentProgress
+    .getSomeProgressByRecordIds(ids)
+    .then((r) => Object.fromEntries(buildSnapshotMap(ids, r.data, (p) => p.id, (p) => p.updated_at)))
 
 export const methodAccessedIds = async (contentIds: number[]): Promise<number[]> =>
   db.contentProgress

package/src/services/user/memberships.ts

@@ -148,6 +148,7 @@ export async function fetchRechargeTokens(): Promise<RechargeTokens> {
  * Upgrades the user's subscription or provides a prefilled add-to-cart URL.
  *
  * @param {boolean} featureFlag - MultiUserAccount feature Flag - default false
+ * @param {string} sku- product sku to upgrade to, required if feature flag is set
  *
  * @returns {Promise<UpgradeSubscriptionResponse>} A promise that resolves to an object containing either:
  *  - {string} action - The action performed (e.g., 'instant_upgrade').
@@ -163,10 +164,11 @@ export async function fetchRechargeTokens(): Promise<RechargeTokens> {
  *   .then(response => console.log(response))
  *   .catch(error => console.error(error));
  */
-export async function upgradeSubscription(featureFlag = false): Promise<UpgradeSubscriptionResponse> {
+export async function upgradeSubscription(featureFlag = false, sku): Promise<UpgradeSubscriptionResponse> {
   let featureFlagValue = featureFlag ? 1 : 0
+  let skuValue = sku ? `&sku=${sku}` : ''
   const httpClient = new HttpClient(globalConfig.baseUrl)
-  return httpClient.get<UpgradeSubscriptionResponse>(`${baseUrl}/v1/update-subscription?${multiUserAccountFeatureFlag}=${featureFlagValue}`)
+  return httpClient.get<UpgradeSubscriptionResponse>(`${baseUrl}/v1/update-subscription?${multiUserAccountFeatureFlag}=${featureFlagValue}${skuValue}`)
 }
 
 /**

package/.claude/settings.local.json

@@ -1,52 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npx jest *)",
-      "Bash(npx tsc *)",
-      "Skill(counselors)",
-      "Bash(counselors ls *)",
-      "Bash(counselors groups *)",
-      "Bash(counselors run *)",
-      "Bash(npm test *)",
-      "Bash(gh pr *)",
-      "Bash(gh api *)",
-      "Bash(mkdir -p /tmp/pr-review-v2)",
-      "Read(//tmp/pr-review-v2/**)",
-      "Bash(cat /home/alesevero/railenvironment/applications/musora-content-services/AGENTS.md)",
-      "Bash(echo \"no AGENTS.md\")",
-      "Bash(echo \"exit=$?\")",
-      "Bash(git checkout *)",
-      "Skill(pr)",
-      "Skill(create-decision)",
-      "mcp__github__pull_request_read",
-      "mcp__github__push_files",
-      "Bash(git push *)",
-      "mcp__github__create_pull_request",
-      "mcp__github__search_pull_requests",
-      "Bash(git commit *)",
-      "Bash(git add *)"
-    ]
-  },
-  "model": "sonnet",
-  "enabledMcpjsonServers": [
-    "atlassian",
-    "figma",
-    "google-workspace",
-    "snowflake",
-    "aws",
-    "hex",
-    "sanity",
-    "mysql",
-    "slack",
-    "langfuse",
-    "chrome-devtools",
-    "railway",
-    "github",
-    "asana"
-  ],
-  "disabledMcpjsonServers": [
-    "nightwatch",
-    "1password"
-  ],
-  "effortLevel": "medium"
-}