musora-content-services 2.21.2 → 2.21.3

package/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.21.2",
+  "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/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'],
   }