musora-content-services 1.0.208 → 1.0.209

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.209](https://github.com/railroadmedia/musora-content-services/compare/v1.0.208...v1.0.209) (2024-12-02)
+
 ### [1.0.208](https://github.com/railroadmedia/musora-content-services/compare/v1.0.207...v1.0.208) (2024-12-02)
 
 ### [1.0.207](https://github.com/railroadmedia/musora-content-services/compare/v1.0.198...v1.0.207) (2024-12-02)

package/package.json

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

package/src/filterBuilder.js

@@ -61,10 +61,12 @@ export class FilterBuilder {
         if (this.availableContentStatuses.length === 0) {
             if (this.userData.isAdmin) {
                 this.availableContentStatuses = [this.STATUS_DRAFT, this.STATUS_SCHEDULED, this.STATUS_PUBLISHED, this.STATUS_ARCHIVED, this.STATUS_UNLISTED];
+                this.getFutureScheduledContentsOnly = true;
             } else if(this.isSingle){
                 this.availableContentStatuses = [this.STATUS_SCHEDULED, this.STATUS_PUBLISHED, this.STATUS_UNLISTED, this.STATUS_ARCHIVED];
             } else{
                 this.availableContentStatuses = [this.STATUS_SCHEDULED, this.STATUS_PUBLISHED];
+                this.getFutureScheduledContentsOnly = true;
             }
         }
 
@@ -74,8 +76,8 @@ export class FilterBuilder {
             this.pullFutureContent = true;
             const now = new Date().toISOString();
             let statuses = [...this.availableContentStatuses];
-            statuses.splice(statuses.indexOf(this.STATUS_SCHEDULED));
-            this._andWhere(`(status in ${arrayToStringRepresentation(statuses)} || (status == '${this.STATUS_SCHEDULED}' && published_on >= '${now}'))`)
+            statuses.splice(statuses.indexOf(this.STATUS_SCHEDULED), 1);
+            this._andWhere(`(status in ${arrayToStringRepresentation(statuses)} || (status == '${this.STATUS_SCHEDULED}' && defined(published_on) && published_on >= '${now}'))`)
 
         } else {
             this._andWhere(`status in ${arrayToStringRepresentation(this.availableContentStatuses)}`);
@@ -145,4 +147,4 @@ export function arrayToStringRepresentation(arr) {
 
 export function arrayToRawRepresentation(arr) {
     return '[' + arr.map(item => `${item}`).join(',') + ']';
-}
+}

package/test/sanityQueryService.test.js

@@ -683,16 +683,16 @@ describe('Filter Builder', function () {
         let finalFilter = await builder.buildFilter(filter);
         let clauses = spliceFilterForAnds(finalFilter);
         expect(clauses[0].phrase).toBe(filter);
-        expect(clauses[1].field).toBe('status');
-        expect(clauses[2].field).toBe('published_on');
+        expect(clauses[1].field).toBe('(status');
+        expect(clauses[3].field).toBe('published_on');
 
         builder = new FilterBuilder('', {bypassPermissions: true});
         finalFilter = await builder.buildFilter(filter);
         clauses = spliceFilterForAnds(finalFilter);
-        expect(clauses[0].field).toBe('status');
+        expect(clauses[0].field).toBe('(status');
         expect(clauses[0].operator).toBe('in');
-        expect(clauses[1].field).toBe('published_on');
-        expect(clauses[1].operator).toBe('<=');
+        expect(clauses[2].field).toBe('published_on');
+        expect(clauses[2].operator).toBe('>=');
     });
 
     test('withOnlyFilterAvailableStatuses', async () => {
@@ -720,7 +720,7 @@ describe('Filter Builder', function () {
         expect(clauses[1].field).toBe('(status'); // extra ( because it's a multi part filter
         expect(clauses[1].operator).toBe('in');
         // getFutureScheduledContentsOnly doesn't make a filter that's splicable, so we match on the more static string
-        const expected = "['published','unlisted'] || (status == 'scheduled' && published_on >=";
+        const expected = "['published','unlisted'] || (status == 'scheduled' && defined(published_on) && published_on >=";
         const isMatch = finalFilter.includes(expected);
         expect(isMatch).toBeTruthy();
     });
@@ -756,8 +756,8 @@ describe('Filter Builder', function () {
         expect(isMatch).toBeFalsy();
         const clauses = spliceFilterForAnds(finalFilter);
         expect(clauses[0].field).toBe('railcontent_id');
-        expect(clauses[1].field).toBe('status');
-        expect(clauses[2].field).toBe('published_on');
+        expect(clauses[1].field).toBe('(status');
+        expect(clauses[3].field).toBe('published_on');
 
     });
 
@@ -774,13 +774,10 @@ describe('Filter Builder', function () {
         let finalFilter = await builder.buildFilter();
         let clauses = spliceFilterForAnds(finalFilter);
         expect(clauses[0].phrase).toBe(filter);
-        expect(clauses[1].field).toBe('status');
+        expect(clauses[1].field).toBe('(status');
         expect(clauses[1].operator).toBe('in');
-//         expect(clauses[2].field).toBe('published_on');
-//         expect(clauses[2].operator).toBe('<=');
-//         const restrictionDate = new Date(clauses[2].condition)
-//         const now = new Date();
-//         expect(now.getTime()).toBeLessThan(restrictionDate.getTime());
+        expect(clauses[2].phrase).toBe('defined(published_on)');
+        expect(clauses[3].field).toBe('published_on');
 
         builder = new FilterBuilder(filter,
             {
@@ -790,8 +787,8 @@ describe('Filter Builder', function () {
         finalFilter = await builder.buildFilter();
         clauses = spliceFilterForAnds(finalFilter);
         expect(clauses[0].phrase).toBe(filter);
-        expect(clauses[2].field).toBe('published_on');
-        expect(clauses[2].operator).toBe('>=');
+        expect(clauses[3].field).toBe('published_on');
+        expect(clauses[3].operator).toBe('>=');
     });
 
     function spliceFilterForAnds(filter) {