musora-content-services 1.0.199 → 1.0.201

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.
 
+### [1.0.201](https://github.com/railroadmedia/musora-content-services/compare/v1.0.200...v1.0.201) (2024-11-29)
+
+### [1.0.200](https://github.com/railroadmedia/musora-content-services/compare/v1.0.199...v1.0.200) (2024-11-29)
+
 ### [1.0.199](https://github.com/railroadmedia/musora-content-services/compare/v1.0.198...v1.0.199) (2024-11-29)
 
 ### [1.0.198](https://github.com/railroadmedia/musora-content-services/compare/v1.0.185...v1.0.198) (2024-11-29)

package/link_mcs.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# If this is giving you errors when trying to build on MWP after linking, try the more modern linking method of running
+# "yarn link ../musora-content-services/" from the MWP directory.
+
 # Define the paths (edit these paths according to your directory structure)
 MUSORA_CONTENT_SERVICES_DIR="../musora-content-services"
 MUSORA_WEB_PLATFORM_DIR="../musora-web-platform"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "1.0.199",
+  "version": "1.0.201",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/filterBuilder.js

@@ -97,7 +97,17 @@ export class FilterBuilder {
 
     _applyPublishingDateRestrictions() {
         if(this.bypassPublishedDateRestriction) return this;
-        const now = new Date().toISOString();
+        let now = new Date();
+
+        // We need to set the published on filter date to be a round time so that it doesn't bypass the query cache
+        // with every request by changing the filter date every second. I've set it to one minute past the current hour
+        // because publishing usually publishes content on the hour exactly which means it should still skip the cache
+        // when the new content is available.
+        // Round to the start of the current hour
+        const roundedDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours());
+
+        now = roundedDate.toISOString();
+
         if (this.getFutureContentOnly) {
             this._andWhere(`published_on >= '${now}'`);
         } else if (!this.pullFutureContent) {

package/src/services/sanity.js

@@ -755,7 +755,7 @@ export function getSortOrder(sort = '-published_on', brand, groupBy) {
             sortOrder = sort;
             break;
         case "popularity":
-            if (groupBy == "artist" || groupBy == "") {
+            if (groupBy == "artist" || groupBy == "genre") {
                 sortOrder = isDesc ? `coalesce(popularity.${brand}, -1)` : "popularity";
             } else {
                 sortOrder = isDesc ? "coalesce(popularity, -1)" : "popularity";
@@ -1261,7 +1261,7 @@ export async function fetchLiveEvent(brand) {
     // See LiveStreamEventService.getCurrentOrNextLiveEvent for some nice complicated logic which I don't think is actually importart
     // this has some +- on times
     // But this query just finds the first scheduled event (sorted by start_time) that ends after now()
-    const query = `*[status == 'scheduled' && defined(live_event_start_time) && published_on > '${getSanityDate(dateTemp)}' && live_event_end_time >= '${getSanityDate(new Date())}']{
+    const query = `*[status == 'scheduled' && defined(live_event_start_time) && published_on > '${getSanityDate(dateTemp, false)}' && live_event_end_time >= '${getSanityDate(new Date(), false)}']{
       'slug': slug.current,
       'id': railcontent_id,
       live_event_start_time,
@@ -1879,7 +1879,18 @@ function arrayJoinWithQuotes(array, delimiter = ',') {
     return wrapped.join(delimiter)
 }
 
-function getSanityDate(date) {
+function getSanityDate(date, roundToHourForCaching = true) {
+    if (roundToHourForCaching) {
+        // We need to set the published on filter date to be a round time so that it doesn't bypass the query cache
+        // with every request by changing the filter date every second. I've set it to one minute past the current hour
+        // because publishing usually publishes content on the hour exactly which means it should still skip the cache
+        // when the new content is available.
+        // Round to the start of the current hour
+        const roundedDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours());
+
+        return roundedDate.toISOString();
+    }
+
     return date.toISOString();
 }