musora-content-services 2.28.6 → 2.30.0

package/CHANGELOG.md

@@ -2,6 +2,44 @@
 
 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.30.0](https://github.com/railroadmedia/musora-content-services/compare/v2.28.6...v2.30.0) (2025-08-01)
+
+
+### Features
+
+* **navigateTo:** Add navigateTo context and update homepageprogress rows to pull the same data as other locations ([#389](https://github.com/railroadmedia/musora-content-services/issues/389)) ([b731957](https://github.com/railroadmedia/musora-content-services/commit/b73195790ba0aefd98e1584ef0f57839979613b3))
+
+
+### Bug Fixes
+
+* Change recommendation config to use recommender.musora.com ([#395](https://github.com/railroadmedia/musora-content-services/issues/395)) ([170d48a](https://github.com/railroadmedia/musora-content-services/commit/170d48a4b10bb11371889e14a74b3dd663d5c0e7))
+* **MU2-907:** scheduled content appearing in new releases ([#391](https://github.com/railroadmedia/musora-content-services/issues/391)) ([c4f3c48](https://github.com/railroadmedia/musora-content-services/commit/c4f3c482c62513ddc4b2465bb7a6e155a92a52da))
+* **T3PS-120:** allow falsey values for description and category ([#392](https://github.com/railroadmedia/musora-content-services/issues/392)) ([5645488](https://github.com/railroadmedia/musora-content-services/commit/56454880df8c92fa3c9c0a57f8b8ae7115d49391))
+* **T3PS-139:** fix lesson count on content cards ([#383](https://github.com/railroadmedia/musora-content-services/issues/383)) ([818c4d0](https://github.com/railroadmedia/musora-content-services/commit/818c4d0e5f8903d9f7b2a7667460a4beb144d7ab))
+* **T3PS-594:** wrong active date mobile ([#387](https://github.com/railroadmedia/musora-content-services/issues/387)) ([f9e2dfd](https://github.com/railroadmedia/musora-content-services/commit/f9e2dfd008660d55865e526317ef79e5d95e3f06))
+* **T3PS-602:** fixes thumbnail data missing from getNewAndUpcoming MCS method ([#386](https://github.com/railroadmedia/musora-content-services/issues/386)) ([f8da5fc](https://github.com/railroadmedia/musora-content-services/commit/f8da5fc674380ffdebcf636ddbb7b0a5f14ba7ae))
+* **T3PS-630:** show song-tutorial children in recent songs instead of parent ([#390](https://github.com/railroadmedia/musora-content-services/issues/390)) ([312bdf8](https://github.com/railroadmedia/musora-content-services/commit/312bdf891a6ffb6eb3113ebfea1692d586e0d2ea))
+* **T3PS-644:** practice day incorrectly assigned ([#393](https://github.com/railroadmedia/musora-content-services/issues/393)) ([8b8a424](https://github.com/railroadmedia/musora-content-services/commit/8b8a4245cdaa389c7916eb398da47bf30f6fc056))
+
+## [2.29.0](https://github.com/railroadmedia/musora-content-services/compare/v2.28.6...v2.29.0) (2025-08-01)
+
+
+### Features
+
+* **navigateTo:** Add navigateTo context and update homepageprogress rows to pull the same data as other locations ([#389](https://github.com/railroadmedia/musora-content-services/issues/389)) ([b731957](https://github.com/railroadmedia/musora-content-services/commit/b73195790ba0aefd98e1584ef0f57839979613b3))
+
+
+### Bug Fixes
+
+* Change recommendation config to use recommender.musora.com ([#395](https://github.com/railroadmedia/musora-content-services/issues/395)) ([170d48a](https://github.com/railroadmedia/musora-content-services/commit/170d48a4b10bb11371889e14a74b3dd663d5c0e7))
+* **MU2-907:** scheduled content appearing in new releases ([#391](https://github.com/railroadmedia/musora-content-services/issues/391)) ([c4f3c48](https://github.com/railroadmedia/musora-content-services/commit/c4f3c482c62513ddc4b2465bb7a6e155a92a52da))
+* **T3PS-120:** allow falsey values for description and category ([#392](https://github.com/railroadmedia/musora-content-services/issues/392)) ([5645488](https://github.com/railroadmedia/musora-content-services/commit/56454880df8c92fa3c9c0a57f8b8ae7115d49391))
+* **T3PS-139:** fix lesson count on content cards ([#383](https://github.com/railroadmedia/musora-content-services/issues/383)) ([818c4d0](https://github.com/railroadmedia/musora-content-services/commit/818c4d0e5f8903d9f7b2a7667460a4beb144d7ab))
+* **T3PS-594:** wrong active date mobile ([#387](https://github.com/railroadmedia/musora-content-services/issues/387)) ([f9e2dfd](https://github.com/railroadmedia/musora-content-services/commit/f9e2dfd008660d55865e526317ef79e5d95e3f06))
+* **T3PS-602:** fixes thumbnail data missing from getNewAndUpcoming MCS method ([#386](https://github.com/railroadmedia/musora-content-services/issues/386)) ([f8da5fc](https://github.com/railroadmedia/musora-content-services/commit/f8da5fc674380ffdebcf636ddbb7b0a5f14ba7ae))
+* **T3PS-630:** show song-tutorial children in recent songs instead of parent ([#390](https://github.com/railroadmedia/musora-content-services/issues/390)) ([312bdf8](https://github.com/railroadmedia/musora-content-services/commit/312bdf891a6ffb6eb3113ebfea1692d586e0d2ea))
+* **T3PS-644:** practice day incorrectly assigned ([#393](https://github.com/railroadmedia/musora-content-services/issues/393)) ([8b8a424](https://github.com/railroadmedia/musora-content-services/commit/8b8a4245cdaa389c7916eb398da47bf30f6fc056))
+
 ### [2.28.6](https://github.com/railroadmedia/musora-content-services/compare/v2.28.5...v2.28.6) (2025-07-28)
 
 

package/package.json

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

package/src/contentTypeConfig.js

@@ -1,5 +1,6 @@
 //import {AWSUrl, CloudFrontURl} from "./services/config";
 import {Tabs} from "./contentMetaData.js";
+import {FilterBuilder} from "./filterBuilder.js";
 
 export const AWSUrl = 'https://s3.us-east-1.amazonaws.com/musora-web-platform'
 export const CloudFrontURl = 'https://d3fzm1tzeyr5n3.cloudfront.net'
@@ -34,12 +35,27 @@ export const DEFAULT_FIELDS = [
   '"lesson_count": coalesce(count(child[]->.child[]->), child_count)',
   '"parent_id": parent_content_data[0].id',
 ]
+
 export const DEFAULT_CHILD_FIELDS = [
-  `"id": railcontent_id`,
-  `title`,
-  `"image": thumbnail.asset->url`,
-  `"instructors": instructor[]->name`,
-  `length_in_seconds`,
+  "'id': railcontent_id",
+  'railcontent_id',
+  artistOrInstructorName(),
+  "'artist': artist->{ 'name': name, 'thumbnail': thumbnail_url.asset->url}",
+  'title',
+  "'image': thumbnail.asset->url",
+  "'thumbnail': thumbnail.asset->url",
+  'difficulty',
+  'difficulty_string',
+  'published_on',
+  "'type': _type",
+  "'length_in_seconds' : coalesce(length_in_seconds, soundslice[0].soundslice_length_in_second)",
+  'brand',
+  "'genre': genre[]->name",
+  'status',
+  "'slug' : slug.current",
+  "'permission_id': permission[]->railcontent_id",
+  'child_count',
+  '"parent_id": parent_content_data[0].id',
 ]
 
 export const instructorField = `instructor[]->{
@@ -202,7 +218,7 @@ export const progressTypesMapping = {
   'show': showsLessonTypes,
   'song tutorial': [...tutorialsLessonTypes, 'song-tutorial-children'],
   'songs': transcriptionsLessonTypes,
-  'play-along': playAlongLessonTypes,
+  'play along': playAlongLessonTypes,
   'guided course': ['guided-course'],
   'pack': ['pack', 'semester-pack'],
   'method': ['learning-path'],
@@ -224,7 +240,7 @@ export const filterTypes = {
 
 export const recentTypes = {
   lessons: [...individualLessonsTypes, 'course-part', 'pack-bundle-lesson', 'guided-course-part', 'quick-tips'],
-  songs: [...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes],
+  songs: [...SONG_TYPES],
   home: [...individualLessonsTypes, ...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes,
   'guided-course', 'learning-path', 'live', 'course', 'pack']
 }
@@ -235,30 +251,14 @@ export let contentTypeConfig = {
       'enrollment_start_time',
       'enrollment_end_time',
     ],
+    includeChildFields: true,
   },
   'progress-tracker': {
     fields: [
       '"parent_content_data": parent_content_data[].id',
       '"badge" : badge.asset->url',
-      '"lessons": child[]->{' +
-        '"id": railcontent_id,' +
-        '"slug":slug.current,' +
-        '"brand":brand,' +
-        '"type": _type,' +
-        '"thumbnail": thumbnail.asset->url,' +
-        'published_on,' +
-        '"lessons": child[]->{' +
-          '"id":railcontent_id,' +
-          '"slug":slug.current,' +
-          '"type": _type,' +
-          '"brand":brand},' +
-          '"thumbnail": thumbnail.asset->url,' +
-          'published_on,' +
-        '}',
     ],
-
-
-
+    includeChildFields: true,
   },
   song: {
     fields: ['album', 'soundslice', 'instrumentless', `"resources": ${resourcesField}`],
@@ -282,6 +282,7 @@ export let contentTypeConfig = {
             }`,
       '"instructors": instructor[]->name',
     ],
+    includeChildFields: true,
     relationships: {
       artist: {
         isOneToOne: true,
@@ -291,6 +292,9 @@ export let contentTypeConfig = {
   'song-tutorial-children': {
     fields: [`"resources": ${resourcesField}`],
   },
+  'guided-course': {
+    includeChildFields: true,
+  },
   course: {
     fields: [
       '"lesson_count": child_count',
@@ -424,26 +428,20 @@ export let contentTypeConfig = {
       '"instructors": instructor[]->{ "id": railcontent_id, name, "thumbnail_url": thumbnail_url.asset->url }',
       '"logo_image_url": logo_image_url.asset->url',
       'total_xp',
-      `"children": child[]->{
-        "description": ${descriptionField},
-        "lesson_count": child_count,
-        "instructors": select(
-          instructor != null => instructor[]->name,
-          ^.instructor[]->name
-        ),
-        "children": child[]->{
-          "description": ${descriptionField},
-          "children": child[]->{"id": railcontent_id},
-          ${getFieldsForContentType()}
-        },
-        ${getFieldsForContentType()}
-      }`,
       `"resources": ${resourcesField}`,
       '"thumbnail": thumbnail.asset->url',
       '"light_mode_logo": light_mode_logo_url.asset->url',
       '"dark_mode_logo": dark_mode_logo_url.asset->url',
       `"description": ${descriptionField}`,
     ],
+    childFields: [
+      `'description': ${descriptionField}`,
+      "'lesson_count': child_count",
+      `'instructors': select(
+        instructor != null => instructor[]->name,
+        ^.instructor[]->name
+      )`,
+    ],
   },
   rudiment: {
     fields: ['sheet_music_thumbnail_url'],
@@ -456,10 +454,6 @@ export let contentTypeConfig = {
   'pack-children': {
     fields: [
       'child_count',
-      `"children": child[]->{
-                "description": ${descriptionField},
-                ${getFieldsForContentType()}
-            }`,
       `"resources": ${resourcesField}`,
       '"image": logo_image_url.asset->url',
       '"thumbnail": thumbnail.asset->url',
@@ -468,6 +462,9 @@ export let contentTypeConfig = {
       `"description": ${descriptionField}`,
       'total_xp',
     ],
+    childFields: [
+      `"description": ${descriptionField}`,
+    ]
   },
   'pack-bundle-lesson': {
     fields: [`"resources": ${resourcesField}`],
@@ -681,6 +678,35 @@ export function artistOrInstructorNameAsArray(key = 'artists') {
   return `'${key}': select(artist->name != null => [artist->name], instructor[]->name)`
 }
 
+export async function getFieldsForContentTypeWithFilteredChildren(contentType, asQueryString = true) {
+  const childFields = getChildFieldsForContentType(contentType, true)
+  const parentFields = getFieldsForContentType(contentType, false)
+  if (childFields) {
+    const childFilter = await new FilterBuilder('', {isChildrenFilter: true}).buildFilter()
+    parentFields.push(
+      `"children": child[${childFilter}]->{
+        ${childFields}
+        "children": child[${childFilter}]->{
+          ${childFields}
+        },
+      }`
+    )
+  }
+  return asQueryString ? parentFields.toString() + ',' : parentFields
+}
+
+export function getChildFieldsForContentType(contentType, asQueryString = true)
+{
+  if (contentTypeConfig[contentType]?.childFields || contentTypeConfig[contentType]?.includeChildFields) {
+    const childFields = contentType
+      ? DEFAULT_CHILD_FIELDS.concat(contentTypeConfig?.[contentType]?.childFields ?? [])
+      : DEFAULT_CHILD_FIELDS
+    return asQueryString ? childFields.toString() + ',' : childFields
+  } else {
+    return asQueryString ? '' : []
+  }
+}
+
 export function getFieldsForContentType(contentType, asQueryString = true) {
   const fields = contentType
     ? DEFAULT_FIELDS.concat(contentTypeConfig?.[contentType]?.fields ?? [])
@@ -688,13 +714,6 @@ export function getFieldsForContentType(contentType, asQueryString = true) {
   return asQueryString ? fields.toString() + ',' : fields
 }
 
-export function getChildFieldsForContentType(contentType, asQueryString = true) {
-  const fields = contentType
-    ? DEFAULT_CHILD_FIELDS.concat(childContentTypeConfig?.[contentType] ?? [])
-    : DEFAULT_CHILD_FIELDS
-  return asQueryString ? fields.toString() + ',' : fields
-}
-
 /**
  * Takes the included fields array and returns a string that can be used in a groq query.
  * @param {Array<string>} filters - An array of strings that represent applied filters. This should be in the format of a key,value array. eg. ['difficulty,Intermediate',

package/src/services/config.js

@@ -8,7 +8,6 @@ import './types.js'
 export let globalConfig = {
   sanityConfig: {},
   railcontentConfig: {},
-  recommendationsConfig: {},
   sessionConfig: {},
   localStorage: null,
   isMA: false,
@@ -50,10 +49,6 @@ const excludeFromGeneratedIndex = []
  *     userId: 'current-user-id',
  *     authToken 'your-auth-token',
  *   },
- *   recommendationsConfig: {
- *     token: 'your-user-api-token',
- *     baseUrl: 'https://MusoraProductDepartment-PWGenerator.hf.space',
- *   },
  *   baseUrl: 'https://web-staging-one.musora.com',
  *   localStorage: localStorage,
  *   isMA: false,
@@ -67,5 +62,4 @@ export function initializeService(config) {
   globalConfig.localStorage = config.localStorage
   globalConfig.isMA = config.isMA || false
   globalConfig.localTimezoneString = config.localTimezoneString || null
-  globalConfig.recommendationsConfig = config.recommendationsConfig
 }

package/src/services/content-org/playlists-types.js

@@ -8,6 +8,16 @@
  * @property {string} brand - Brand identifier for the playlist.
  */
 
+/**
+ * @typedef UpdatePlaylistDTO
+ * @property {string} name - The name of the new playlist. (required, max 255 characters)
+ * @property {string} description - A description of the playlist. (optional, max 1000 characters)
+ * @property {string} category - The category of the playlist. (optional, max 255 characters)
+ * @property {boolean} is_private - Whether the playlist is private. (optional, defaults to false)
+ * @property {Array<number>} deleted_items - List of playlist items to be deleted. (optional)
+ * @property {Array<number>} item_order - List of all remaining playlist item ids (not content_ids) provided in the new order. (optional)
+ */
+
 /**
  * @typedef DuplicatePlaylistDTO
  * @property {string} name - The name of the new playlist. (required, max 255 characters)

package/src/services/content-org/playlists.js

@@ -3,6 +3,7 @@
  */
 import { globalConfig } from '../config.js'
 import { fetchHandler } from '../railcontent.js'
+import { getNavigateToForPlaylists } from '../contentAggregator.js'
 import './playlists-types.js'
 
 /**
@@ -42,7 +43,7 @@ export async function fetchUserPlaylists(
   const content = content_id ? `&content_id=${content_id}` : ''
   const brandString = brand ? `&brand=${brand}` : ''
   const url = `${BASE_PATH}/v1/user/playlists${pageString}${brandString}${limitString}${sortString}${content}`
-  return await fetchHandler(url)
+  return await getNavigateToForPlaylists(await fetchHandler(url), {dataField: 'data'})
 }
 
 /**
@@ -224,12 +225,13 @@ export async function togglePlaylistPrivate(playlistId, is_private)
  * Updates a playlists values
  *
  * @param {string|number} playlistId
- * @param {Object} updateData - An object containing fields to update on the playlist:
+ * @param {UpdatePlaylistDTO} updateData  - An object containing fields to update on the playlist:
  *  - `name` (string): The name of the new playlist (required, max 255 characters).
  *  - `description` (string): A description of the playlist (optional, max 1000 characters).
- *  - `category` (string): The category of the playlist.
- * + *  - `deleted_items` (array): List of playlist item IDs to delete.
- * + *  - `item_order` (array): Updated order of playlist items (ids, not railcontent_ids).
+ *  - `category` (string): The category of the playlist (optional).
+ *  - `is_private` (boolean): Whether the playlist is private (optional, defaults to false).
+ *  - `deleted_items` (array): List of playlist item IDs to delete (optional).
+ *  - `item_order` (array): Updated order of playlist items (ids, not railcontent_ids) (optional).
  *
  * @returns {Promise<object>} - A promise that resolves to the created playlist data and lessons if successful, or an error response if validation fails.
  *
@@ -242,16 +244,14 @@ export async function togglePlaylistPrivate(playlistId, is_private)
  *   .then(response => console.log(response.playlist); console.log(response.lessons))
  *   .catch(error => console.error('Error updating playlist:', error));
  */
-export async function updatePlaylist(playlistId, {
-  name = null, description = null,  is_private = null, brand = null, category = null, deleted_items = null, item_order = null
-})
+export async function updatePlaylist(playlistId, updateData)
 {
-  const data = {
+  const { name, description, category, is_private, item_order, deleted_items } = updateData;
+  let data = {
     ...name && { name },
-    ...description && { description },
-    ...is_private !== null && { private: is_private},
-    ...brand && { brand },
-    ...category && { category},
+    ...'description' in updateData && { description },
+    ...'is_private' in updateData && { private: is_private || false },
+    ...'category' in updateData && { category },
     ...deleted_items && { deleted_items },
     ...item_order && { item_order },
   }
@@ -344,7 +344,7 @@ export async function duplicatePlaylist(playlistId, playlistData) {
  */
 export async function fetchPlaylist(playlistId) {
   const url = `${BASE_PATH}/v1/user/playlists/${playlistId}`
-  return await fetchHandler(url, 'GET')
+  return await getNavigateToForPlaylists(await fetchHandler(url))
 }
 
 /**

package/src/services/content.js

@@ -80,6 +80,7 @@ export async function getTabResults(brand, pageName, tabName, {
     results = await addContextToContent(getLessonContentRows, brand, pageName, {
       dataField: 'items',
       addNextLesson: true,
+      addNavigateTo: true,
       addProgressPercentage: true,
       addProgressStatus: true
     })
@@ -87,6 +88,7 @@ export async function getTabResults(brand, pageName, tabName, {
     let temp =  await fetchTabData(brand, pageName, { page, limit, sort, includedFields: mergedIncludedFields, progress: progressValue });
     results = await addContextToContent(() => temp.entity, {
       addNextLesson: true,
+      addNavigateTo: true,
       addProgressPercentage: true,
       addProgressStatus: true
     })
@@ -382,7 +384,7 @@ export async function getRecommendedForYou(brand, rowId = null, {
   limit = 10,
 } = {}) {
   const requiredItems = page * limit;
-  const data = await recommendations(brand, {limit: requiredItems});
+  const data = await recommendations( brand, {limit: requiredItems})
   if (!data || !data.length) {
     return { id: 'recommended', title: 'Recommended For You', items: [] };
   }
@@ -390,14 +392,11 @@ export async function getRecommendedForYou(brand, rowId = null, {
   // Apply pagination before calling fetchByRailContentIds
   const startIndex = (page - 1) * limit;
   const paginatedData = data.slice(startIndex, startIndex + limit);
-
-  const contents = await fetchByRailContentIds(paginatedData);
-  const result = {
-    id: 'recommended',
-    title: 'Recommended For You',
-    items: contents
-  };
-
+  const contents = await addContextToContent(fetchByRailContentIds, paginatedData, 'tab-data',
+    {
+      addNextLesson: true,
+      addNavigateTo: true,
+    })
   if (rowId) {
     return {
       type: TabResponseType.CATALOG,

package/src/services/contentAggregator.js

@@ -1,6 +1,6 @@
 import {
-  getLastInteractedOf,
-  getNextLesson,
+  getLastInteractedOf, getNavigateTo,
+  getNextLesson, getProgressDateByIds,
   getProgressPercentageByIds,
   getProgressStateByIds,
   getResumeTimeSecondsByIds
@@ -28,6 +28,7 @@ import {fetchLastInteractedChild, fetchLikeCount} from "./railcontent"
  * @param options.addIsLiked - add isLikedField
  * @param options.addLikeCount - add likeCount field
  * @param options.addProgressStatus - add progressStatus field
+ * @param options.addProgressTimestamp - add progressTimestamp field
  * @param options.addResumeTimeSeconds - add resumeTimeSeconds field
  * @param options.addLastInteractedChild - add lastInteractedChild field. This may be different from nextLesson
  * @param options.addNextLesson - add nextLesson field. For collection type content. each collection has different logic for calculating this data
@@ -66,9 +67,11 @@ export async function addContextToContent(dataPromise, ...dataArgs)
     addIsLiked = false,
     addLikeCount = false,
     addProgressStatus = false,
+    addProgressTimestamp = false,
     addResumeTimeSeconds = false,
     addLastInteractedChild = false,
     addNextLesson = false,
+    addNavigateTo = false,
   } = options
 
   const dataParam = lastArg === options ? dataArgs.slice(0, -1) : dataArgs
@@ -81,29 +84,63 @@ export async function addContextToContent(dataPromise, ...dataArgs)
 
   if(ids.length === 0) return false
 
-  const [progressPercentageData, progressStatusData, isLikedData, resumeTimeData, lastInteractedChildData, nextLessonData] = await Promise.all([
-    addProgressPercentage ? getProgressPercentageByIds(ids) : Promise.resolve(null),
-    addProgressStatus ? getProgressStateByIds(ids) : Promise.resolve(null),
+  const [progressData, isLikedData, resumeTimeData, lastInteractedChildData, nextLessonData, navigateToData] = await Promise.all([
+    addProgressPercentage || addProgressStatus || addProgressTimestamp ? getProgressDateByIds(ids) : Promise.resolve(null),
     addIsLiked ? isContentLikedByIds(ids) : Promise.resolve(null),
     addResumeTimeSeconds ? getResumeTimeSecondsByIds(ids) : Promise.resolve(null),
     addLastInteractedChild ? fetchLastInteractedChild(ids)  : Promise.resolve(null),
     addNextLesson ? getNextLesson(items) : Promise.resolve(null),
+    addNavigateTo ? getNavigateTo(items) : Promise.resolve(null),
   ])
+  if (addNextLesson) console.log('AddNextLesson is depreciated in favour of addNavigateTo')
 
   const addContext = async (item) => ({
     ...item,
-    ...(addProgressPercentage ? { progressPercentage: progressPercentageData?.[item.id] } : {}),
-    ...(addProgressStatus ? { progressStatus: progressStatusData?.[item.id] } : {}),
+    ...(addProgressPercentage ? { progressPercentage: progressData?.[item.id]['progress'] } : {}),
+    ...(addProgressStatus ? { progressStatus: progressData?.[item.id]['status'] } : {}),
+    ...(addProgressTimestamp ? { progressTimestamp: progressData?.[item.id]['last_update'] } : {}),
     ...(addIsLiked ? { isLiked: isLikedData?.[item.id] } : {}),
     ...(addLikeCount && ids.length === 1 ? { likeCount: await fetchLikeCount(item.id) } : {}),
     ...(addResumeTimeSeconds ? { resumeTime: resumeTimeData?.[item.id] } : {}),
     ...(addLastInteractedChild ? { lastInteractedChild: lastInteractedChildData?.[item.id] } : {}),
     ...(addNextLesson ? { nextLesson: nextLessonData?.[item.id] } : {}),
+    ...(addNavigateTo ? { navigateTo: navigateToData?.[item.id] } : {}),
   })
 
   return await processItems(data, addContext, dataField, isDataAnArray, dataField_includeParent)
 }
 
+export async function getNavigateToForPlaylists(data, {dataField = null} = {} )
+{
+  let playlists = extractItemsFromData(data, dataField, false, false)
+  let allIds = []
+  playlists.forEach((playlist) => allIds = [...allIds, ...playlist.items.map(a => a.content_id)])
+  const progressOnItems = await getProgressStateByIds(allIds);
+  const addContext = async (playlist) => {
+    const allItemsCompleted = playlist.items.every(i => {
+      const itemId = i.content_id;
+      const progress = progressOnItems[itemId];
+      return progress && progress === 'completed';
+    });
+    let nextItem = playlist.items[0] ?? null;
+    if (!allItemsCompleted) {
+      const lastItemProgress = progressOnItems[playlist.last_engaged_on];
+      const index = playlist.items.findIndex(i => i.content_id === playlist.last_engaged_on);
+      if (lastItemProgress === 'completed') {
+        nextItem = playlist.items[index + 1] ?? nextItem;
+      } else {
+        nextItem = playlist.items[index] ?? nextItem;
+      }
+    }
+    playlist.navigateTo = {
+      ...nextItem,
+      playlist_id: playlist.id,
+    }
+    return playlist
+  }
+  return await processItems(data, addContext, dataField, false, false,)
+}
+
 function extractItemsFromData(data, dataField, isParentArray, includeParent)
 {
   let items = []
@@ -159,3 +196,4 @@ async function processItems(data, addContext, dataField, isParentArray, includeP
   }
 }
 
+

package/src/services/contentProgress.js

@@ -90,6 +90,73 @@ export async function getNextLesson(data)
   return nextLessonData
 }
 
+export async function getNavigateTo(data)
+{
+  let navigateToData = {}
+  const twoDepthContentTypes = ['pack'] //TODO add method when we know what it's called
+  //TODO add parent hierarchy upwards as well
+  // data structure is the same but instead of child{} we use parent{}
+  for (const content of data) {
+
+    //only calculate nextLesson if needed, based on content type
+    if (!getNextLessonLessonParentTypes.includes(content.type) || !content.children) {
+      navigateToData[content.id] = null
+    } else {
+      const children = new Map()
+      const childrenIds = []
+      content.children.forEach(child => {
+          childrenIds.push(child.id)
+          children.set(child.id, child)
+        }
+      )
+      // return first child (or grand child) if parent-content is complete or no progress
+      const contentState = await getProgressState(content.id)
+      if (contentState !== STATE_STARTED) {
+        const firstChild = content.children[0]
+        let lastInteractedChildNavToData = await getNavigateTo([firstChild])[firstChild.id] ?? null
+        navigateToData[content.id] = buildNavigateTo(content.children[0], lastInteractedChildNavToData)
+      } else {
+        const childrenStates = await getProgressStateByIds(childrenIds)
+        const lastInteracted = await getLastInteractedOf(childrenIds)
+        const lastInteractedStatus = childrenStates[lastInteracted]
+
+        if (content.type === 'course' || content.type === 'pack-bundle') {
+          if (lastInteractedStatus === STATE_STARTED) {
+            navigateToData[content.id] = buildNavigateTo(children.get(lastInteracted))
+          } else {
+            let incompleteChild = findIncompleteLesson(childrenStates, lastInteracted, content.type)
+            navigateToData[content.id] = buildNavigateTo(children.get(incompleteChild))
+          }
+        } else if (content.type === 'guided-course' || content.type === 'song-tutorial') {
+          let incompleteChild = findIncompleteLesson(childrenStates, lastInteracted, content.type)
+          navigateToData[content.id] = buildNavigateTo(children.get(incompleteChild))
+        } else if (twoDepthContentTypes.includes(content.type)) {
+          const firstChildren = content.children ?? []
+          const lastInteractedChildId = await getLastInteractedOf(firstChildren.map(child => child.id));
+          if (childrenStates[lastInteractedChildId] === STATE_COMPLETED) {
+            // TODO: packs have an extra situation where we need to jump to the next course if all lessons in the last engaged course are completed
+          }
+          let lastInteractedChildNavToData = await getNavigateTo(firstChildren)
+          lastInteractedChildNavToData = lastInteractedChildNavToData[lastInteractedChildId]
+          navigateToData[content.id] = buildNavigateTo(children.get(lastInteractedChildId), lastInteractedChildNavToData);
+        }
+      }
+    }
+  }
+  return navigateToData
+}
+
+function buildNavigateTo(content, child = null)
+{
+  return {
+    brand: content.brand,
+    thumbnail: content.thumbnail ?? '',
+    id: content.id,
+    type: content.type,
+    child: child,
+  }
+}
+
 /**
  * filter through contents, only keeping the most recent
  * @param {array} contentIds