musora-content-services 2.33.6 → 2.34.0

package/src/services/userActivity.js

@@ -13,7 +13,7 @@ import {
 import { DataContext, UserActivityVersionKey } from './dataContext.js'
 import { fetchByRailContentId, fetchByRailContentIds, fetchShows } from './sanity'
 import { fetchPlaylist, fetchUserPlaylists } from './content-org/playlists'
-import { pinnedGuidedCourses } from './content-org/guided-courses'
+import {guidedCourses, pinnedGuidedCourses} from './content-org/guided-courses'
 import {
   getMonday,
   getWeekNumber,
@@ -1051,13 +1051,19 @@ function generateContentsMap(contents, playlistsContents) {
  */
 export async function getProgressRows({ brand = null, limit = 8 } = {}) {
   // TODO slice progress to a reasonable number, say 100
-  const [recentPlaylists, progressContents, allPinnedGuidedCourse, userPinnedItem] =
+
+  const [recentPlaylists, progressContents, allPinnedGuidedCourse, userPinnedItem, enrolledGuidedCourses] =
     await Promise.all([
       fetchUserPlaylists(brand, { sort: '-last_progress', limit: limit }),
       getAllStartedOrCompleted({ onlyIds: false, brand: brand }),
       pinnedGuidedCourses(brand),
       getUserPinnedItem(brand),
+      guidedCourses()
     ])
+
+  const enrolledGuidedCoursesIds = enrolledGuidedCourses.map(course => String(course.content_id));
+
+  const mergedGuidedCourses = 1 //get all cuigded courses, incl no progress.
   let pinnedGuidedCourse = allPinnedGuidedCourse?.[0] ?? null
 
   const playlists = recentPlaylists?.data || []
@@ -1067,12 +1073,15 @@ export async function getProgressRows({ brand = null, limit = 8 } = {}) {
   )
 
   const nonPlaylistContentIds = Object.keys(progressContents)
-  if (pinnedGuidedCourse) {
-    nonPlaylistContentIds.push(pinnedGuidedCourse.content_id)
+  if (enrolledGuidedCoursesIds.length > 0) {
+    nonPlaylistContentIds.push(...enrolledGuidedCoursesIds)
   }
   if (userPinnedItem?.progressType === 'content') {
     nonPlaylistContentIds.push(userPinnedItem.id)
   }
+console.log("nonPlaylistContentIds",nonPlaylistContentIds)
+
+
   const [playlistsContents, contents] = await Promise.all([
     playlistEngagedOnContents ? addContextToContent(fetchByRailContentIds, playlistEngagedOnContents, 'progress-tracker', {
       addNextLesson: true,

package/tools/generate-index.cjs

@@ -89,11 +89,15 @@ Object.entries(fileExports).forEach(([file, functionNames]) => {
   content += `\nimport {\n\t${functionNames.join(',\n\t')}\n} from './services/${file}';\n`
 })
 
+content += `\nimport {\n\t default as EventsAPI \n} from './services/eventsAPI';\n`
+
 const allFunctionNames = Object.values(fileExports).flat().sort()
 content += '\nexport {\n'
 content += `\t${allFunctionNames.join(',\n\t')},\n`
 content += '};\n'
 
+content += '\nexport default EventsAPI\n'
+
 // write the generated content to index.js
 const outputPath = path.join(__dirname, '../src/index.js')
 fs.writeFileSync(outputPath, content)
@@ -108,12 +112,16 @@ Object.entries(fileExports).forEach(([file, functionNames]) => {
   dtsContent += `\nimport {\n\t${functionNames.join(',\n\t')}\n} from './services/${file}';\n`
 })
 
+dtsContent += `\nimport {\n\t default as EventsAPI \n} from './services/eventsAPI';\n`
+
 dtsContent += "\ndeclare module 'musora-content-services' {\n"
 dtsContent += '\texport {\n'
 dtsContent += `\t\t${allFunctionNames.join(',\n\t\t')},\n`
 dtsContent += '\t}\n'
 dtsContent += '}\n'
 
+dtsContent += '\nexport default EventsAPI\n'
+
 // write the generated content to index.d.ts
 const outputDtsPath = path.join(__dirname, '../src/index.d.ts')
 fs.writeFileSync(outputDtsPath, dtsContent)