musora-content-services 2.165.5 → 2.167.0

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

@@ -23,6 +23,7 @@ export interface MembershipData {
 export interface UserMembershipResponse {
   user_membership_data: MembershipData[]
   can_upgrade_membership: boolean // pre multiUserAccount data
+  need_lifetime_upgrade: boolean
   sub_account_data: MultiUserAccountResponse // post multiUserAccount data
   upgrade_options: UpgradeOption[] // post multiuser account data
 }
@@ -148,6 +149,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 +165,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}`)
 }
 
 /**