musora-content-services 2.21.1 → 2.21.3

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.21.3](https://github.com/railroadmedia/musora-content-services/compare/v2.21.1...v2.21.3) (2025-07-15)
+
+
+### Bug Fixes
+
+* MU2-787 Leaving Soon and Returning should only be set in the future ([4bb48c9](https://github.com/railroadmedia/musora-content-services/commit/4bb48c93afa7b2167d94c306830a4db3e7dab810))
+* **systest:** patch contentAggregator ([#342](https://github.com/railroadmedia/musora-content-services/issues/342)) ([4a1906e](https://github.com/railroadmedia/musora-content-services/commit/4a1906ed8e5cfc3cebf3e044d4eb35213d18ebe1))
+
+### [2.21.2](https://github.com/railroadmedia/musora-content-services/compare/v2.21.1...v2.21.2) (2025-07-14)
+
+
+### Bug Fixes
+
+* **systest:** patch contentAggregator ([#342](https://github.com/railroadmedia/musora-content-services/issues/342)) ([4a1906e](https://github.com/railroadmedia/musora-content-services/commit/4a1906ed8e5cfc3cebf3e044d4eb35213d18ebe1))
+
 ### [2.21.1](https://github.com/railroadmedia/musora-content-services/compare/v2.21.0...v2.21.1) (2025-07-14)
 
 

package/package.json

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

package/src/contentTypeConfig.js

@@ -571,6 +571,12 @@ export let contentTypeConfig = {
       `quarter_published`,
       '"thumbnail": thumbnail.asset->url',
     ]
+  },
+  leaving: {
+    fields: [
+      `quarter_removed`,
+      '"thumbnail": thumbnail.asset->url',
+    ]
   }
 }
 

package/src/services/contentAggregator.js

@@ -33,15 +33,14 @@ export async function addContextToContent(dataPromise, ...dataArgs)
   if(!data) return false
 
   let items = []
-  let dataMap = []
 
   if (dataField && (data?.[dataField] || iterateDataFieldOnEachArrayElement)) {
     if (iterateDataFieldOnEachArrayElement && Array.isArray(data)) {
       for(const parent of data) {
-        ids = [...ids, ...parent[dataField].map(item => item?.id).filter(Boolean)]
+        items = [...items, ...parent[dataField]]
       }
     } else {
-      ids = data[dataField].map(item => item?.id).filter(Boolean);
+      items = data[dataField]
     }
   } else if (Array.isArray(data)) {
     items = data;
@@ -51,19 +50,6 @@ export async function addContextToContent(dataPromise, ...dataArgs)
 
   const ids = items.map(item => item?.id).filter(Boolean)
 
-  //create data structure for common use by functions
-  if (addNextLesson) {
-    items.forEach((item) => {
-      if (item?.id) {
-        dataMap.push({
-          'children': item.children?.map(child => child.id) ?? [],
-          'type': item.type,
-          'id': item.id,
-        })
-      }
-    })
-  }
-
   if(ids.length === 0) return false
 
   const [progressPercentageData, progressStatusData, isLikedData, resumeTimeData, lastInteractedChildData, nextLessonData] = await Promise.all([
@@ -72,7 +58,7 @@ export async function addContextToContent(dataPromise, ...dataArgs)
     addIsLiked ? isContentLikedByIds(ids) : Promise.resolve(null),
     addResumeTimeSeconds ? getResumeTimeSecondsByIds(ids) : Promise.resolve(null),
     addLastInteractedChild ? fetchLastInteractedChild(ids)  : Promise.resolve(null),
-    (addNextLesson || addLastInteractedParent) ? getNextLesson(dataMap) : Promise.resolve(null),
+    (addNextLesson || addLastInteractedParent) ? getNextLesson(items) : Promise.resolve(null),
   ])
 
   const addContext = async (item) => ({

package/src/services/contentProgress.js

@@ -44,12 +44,12 @@ export async function getResumeTimeSecondsByIds(contentIds) {
   return getByIds(contentIds, DATA_KEY_RESUME_TIME, 0)
 }
 
-export async function getNextLesson(dataMap)
+export async function getNextLesson(data)
 {
   let nextLessonData = {}
 
-  for (const content of dataMap) {
-
+  for (const content of data) {
+    const children = content.children?.map(child => child.id) ?? []
     //only calculate nextLesson if needed, based on content type
     if (!getNextLessonLessonParentTypes.includes(content.type)) {
       nextLessonData[content.id] = null
@@ -58,15 +58,15 @@ export async function getNextLesson(dataMap)
       //return first child if parent-content is complete or no progress
       const contentState = await getProgressState(content.id)
       if (contentState !== STATE_STARTED) {
-        nextLessonData[content.id] = content.children[0]
+        nextLessonData[content.id] = children[0]
 
       } else {
         //if content in progress
 
-        const childrenStates = await getProgressStateByIds(content.children)
+        const childrenStates = await getProgressStateByIds(children)
 
         //calculate last_engaged
-        const lastInteracted = await getLastInteractedOf(content.children)
+        const lastInteracted = await getLastInteractedOf(children)
         const lastInteractedStatus = childrenStates[lastInteracted]
 
         //different nextLesson behaviour for different content types

package/src/services/sanity.js

@@ -73,18 +73,19 @@ export async function fetchSongById(documentId) {
  * @returns {Promise<Object|null>}
  */
 export async function fetchLeaving(brand, { pageNumber = 1, contentPerPage = 20 } = {}) {
-  const nextQuarter = getNextAndPreviousQuarterDates()['next']
-  const filterString = `brand == '${brand}' && quarter_removed == '${nextQuarter}'`
+  const today = new Date()
+  const isoDateOnly = today.toISOString().split('T')[0]
+  const filterString = `brand == '${brand}' && quarter_removed > '${isoDateOnly}'`
   const startEndOrder = getQueryFromPage(pageNumber, contentPerPage)
   const sortOrder = {
-    sortOrder: 'published_on desc, id desc',
+    sortOrder: 'quarter_removed asc, published_on desc, id desc',
     start: startEndOrder['start'],
     end: startEndOrder['end'],
   }
   const query = await buildQuery(
     filterString,
     { pullFutureContent: false, availableContentStatuses: ['published'] },
-    getFieldsForContentType(),
+    getFieldsForContentType('leaving'),
     sortOrder
   )
   return fetchSanity(query, true)
@@ -99,11 +100,12 @@ export async function fetchLeaving(brand, { pageNumber = 1, contentPerPage = 20
  * @returns {Promise<Object|null>}
  */
 export async function fetchReturning(brand, { pageNumber = 1, contentPerPage = 20 } = {}) {
-  const nextQuarter = getNextAndPreviousQuarterDates()['next']
-  const filterString = `brand == '${brand}' && quarter_published == '${nextQuarter}'`
+  const today = new Date()
+  const isoDateOnly = today.toISOString().split('T')[0]
+  const filterString = `brand == '${brand}' && quarter_published >= '${isoDateOnly}'`
   const startEndOrder = getQueryFromPage(pageNumber, contentPerPage)
   const sortOrder = {
-    sortOrder: 'published_on desc, id desc',
+    sortOrder: 'quarter_published asc, published_on desc, id desc',
     start: startEndOrder['start'],
     end: startEndOrder['end'],
   }