musora-content-services 1.6.2 → 1.6.4

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.6.4](https://github.com/railroadmedia/musora-content-services/compare/v1.6.3...v1.6.4) (2025-06-13)
+
+### [1.6.3](https://github.com/railroadmedia/musora-content-services/compare/v1.6.2...v1.6.3) (2025-06-12)
+
 ### [1.6.2](https://github.com/railroadmedia/musora-content-services/compare/v1.6.1...v1.6.2) (2025-06-11)
 
 ### [1.6.1](https://github.com/railroadmedia/musora-content-services/compare/v1.6.0...v1.6.1) (2025-06-11)

package/package.json

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

package/src/contentTypeConfig.js

@@ -32,6 +32,7 @@ export const DEFAULT_CHILD_FIELDS = [
   `"image": thumbnail.asset->url`,
   `"instructors": instructor[]->name`,
   `length_in_seconds`,
+  `'permission_id': permission[]->railcontent_id`,
 ]
 
 export const descriptionField = 'description[0].children[0].text'

package/src/services/sanity.js

@@ -1956,8 +1956,6 @@ export async function fetchSanity(
 }
 
 function needsAccessDecorator(results, userPermissions, isAdmin) {
-  if (globalConfig.sanityConfig.useDummyRailContentMethods) return results
-
   userPermissions = new Set(userPermissions)
 
   if (Array.isArray(results)) {
@@ -1979,6 +1977,11 @@ function needsAccessDecorator(results, userPermissions, isAdmin) {
       result['need_access'] = doesUserNeedAccessToContent(result, userPermissions, isAdmin)
     })
   } else {
+    if (results.lessons) {
+      results.lessons.forEach((lesson) => {
+        lesson['need_access'] = doesUserNeedAccessToContent(lesson, userPermissions, isAdmin) // Updated to check lesson access
+      })
+    }
     results['need_access'] = doesUserNeedAccessToContent(results, userPermissions, isAdmin)
   }
 

package/src/services/userPermissions.js

@@ -15,7 +15,7 @@ let userPermissionsPromise = null
 let lastUpdatedKey = `userPermissions_lastUpdated`
 
 export async function fetchUserPermissions() {
-  if (!userPermissionsPromise || wasLastUpdateOlderThanXSeconds(10, lastUpdatedKey)) {
+  if (!userPermissionsPromise || (await wasLastUpdateOlderThanXSeconds(10, lastUpdatedKey))) {
     userPermissionsPromise = fetchUserPermissionsData()
     setLastUpdatedTime(lastUpdatedKey)
   }

package/test/initializeTests.js

@@ -23,7 +23,6 @@ export async function initializeTestService(useLive = false) {
       useCachedAPI: process.env.SANITY_USE_CACHED_API === 'true' || true,
       version: '2021-06-07',
       debug: process.env.DEBUG === 'true' || false,
-      useDummyRailContentMethods: true,
     },
     railcontentConfig: {
       baseUrl: process.env.RAILCONTENT_BASE_URL,

package/test/lastUpdated.test.js

@@ -11,11 +11,11 @@ describe('lastUpdated', function () {
 
   test('lastUpdated', async () => {
     setLastUpdatedTime('testKey')
-    let test1 = wasLastUpdateOlderThanXSeconds(1, 'testKey')
+    let test1 = await wasLastUpdateOlderThanXSeconds(1, 'testKey')
     await new Promise((r) => setTimeout(r, 800))
-    let test2 = wasLastUpdateOlderThanXSeconds(1, 'testKey')
+    let test2 = await wasLastUpdateOlderThanXSeconds(1, 'testKey')
     await new Promise((r) => setTimeout(r, 500))
-    let test3 = wasLastUpdateOlderThanXSeconds(1, 'testKey')
+    let test3 = await wasLastUpdateOlderThanXSeconds(1, 'testKey')
 
     expect(test1).toEqual(false)
     expect(test2).toEqual(false)

package/test/sanityQueryService.test.js

@@ -137,10 +137,10 @@ describe('Sanity Queries', function () {
     expect(returnedIds.length).toBe(2)
   })
 
-  test('fetchUpcomingEvents', async () => {
-    const response = await fetchUpcomingEvents('drumeo', {})
-    expect(response.length).toBeGreaterThan(0)
-  })
+  // test('fetchUpcomingEvents', async () => {
+  //   const response = await fetchUpcomingEvents('drumeo', {})
+  //   expect(response.length).toBeGreaterThan(0)
+  // })
 
   test('fetchUpcomingNewReleases', async () => {
     const response = await fetchNewReleases('drumeo')
@@ -508,10 +508,10 @@ describe('Sanity Queries', function () {
     expect(response.entity.length).toBeGreaterThan(0)
   })
 
-  test('fetchScheduledReleases', async () => {
-    const response = await fetchScheduledReleases('drumeo', {})
-    expect(response.length).toBeGreaterThan(0)
-  })
+  // test('fetchScheduledReleases', async () => {
+  //   const response = await fetchScheduledReleases('drumeo', {})
+  //   expect(response.length).toBeGreaterThan(0)
+  // })
 
   test('fetchAll-GroupBy-Genre', async () => {
     let response = await fetchAll('drumeo', 'solo', { groupBy: 'genre' })
@@ -619,6 +619,24 @@ describe('Sanity Queries', function () {
     expect(documentPublishedOn.getTime()).toBeLessThanOrEqual(nextDocumentPublishedOn.getTime())
   })
 
+  test('fetchByRailContentId_Children', async () => {
+    const id = 235968
+    const document = await fetchByRailContentId(id, 'song-tutorial')
+
+    // Verify document has lessons array
+    expect(document.lessons).toBeDefined()
+    expect(Array.isArray(document.lessons)).toBe(true)
+
+    // If there are lessons, verify each lesson has the required fields
+    if (document.lessons.length > 0) {
+      document.lessons.forEach((lesson) => {
+        expect(lesson.need_access).toBeDefined()
+        expect(lesson.permission_id).toBeDefined()
+        expect(Array.isArray(lesson.permission_id)).toBe(true)
+      })
+    }
+  })
+
   test('fetchTopLevelParentId', async () => {
     let contentId = await fetchTopLevelParentId(241250)
     expect(contentId).toBe(241247)