musora-content-services 2.0.7 → 2.1.0

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.1.0](https://github.com/railroadmedia/musora-content-services/compare/v2.0.8...v2.1.0) (2025-03-26)
+
+
+### Features
+
+* **BEH-326:** update routing for top/all comment endpoints ([#203](https://github.com/railroadmedia/musora-content-services/issues/203)) ([1f4807f](https://github.com/railroadmedia/musora-content-services/commit/1f4807fcef3cb7ce0b03202519b4ccb4fbd6232f))
+
+### [2.0.8](https://github.com/railroadmedia/musora-content-services/compare/v2.0.7...v2.0.8) (2025-03-25)
+
 ### [2.0.7](https://github.com/railroadmedia/musora-content-services/compare/v2.0.6...v2.0.7) (2025-03-21)
 
 

package/package.json

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

package/src/contentTypeConfig.js

@@ -3,6 +3,12 @@ import {Tabs} from "./contentMetaData.js";
 
 export const AWSUrl = 'https://s3.us-east-1.amazonaws.com/musora-web-platform'
 export const CloudFrontURl = 'https://d3fzm1tzeyr5n3.cloudfront.net'
+
+export const SONG_TYPES = ['song', 'play-along', 'jam-track', 'song-tutorial-children']
+// Challenges are excluded for the moment as they're still in design flex
+// Single hierarchy refers to only one element in the hierarchy has video lessons, not that they have a single parent
+export const SINGLE_PARENT_TYPES = ['course-part', 'pack-bundle-lesson', 'song-tutorial-children']
+
 export const DEFAULT_FIELDS = [
   "'sanity_id' : _id",
   "'id': railcontent_id",

package/src/index.d.ts

@@ -96,7 +96,6 @@ import {
 	pinPlaylist,
 	playback,
 	postChallengesCommunityNotification,
-	postChallengesCompleteLesson,
 	postChallengesEnroll,
 	postChallengesEnrollmentNotification,
 	postChallengesHideCompletedBanner,
@@ -104,7 +103,7 @@ import {
 	postChallengesSetStartDate,
 	postChallengesSoloNotification,
 	postChallengesUnlock,
-	postContentCompleted,
+	postContentComplete,
 	postContentLiked,
 	postContentReset,
 	postContentUnliked,
@@ -120,10 +119,10 @@ import {
 } from './services/railcontent.js';
 
 import {
+	fetchSimilarItems,
 	rankCategories,
 	rankItems,
-	recommendations,
-	similarItems
+	recommendations
 } from './services/recommendations.js';
 
 import {
@@ -144,6 +143,7 @@ import {
 	fetchHierarchy,
 	fetchLeaving,
 	fetchLessonContent,
+	fetchLessonsFeaturingThisContent,
 	fetchLiveEvent,
 	fetchMetadata,
 	fetchMethod,
@@ -152,12 +152,14 @@ import {
 	fetchMethodPreviousNextLesson,
 	fetchNewReleases,
 	fetchNextPreviousLesson,
+	fetchOtherSongVersions,
 	fetchPackAll,
 	fetchPackData,
 	fetchParentForDownload,
 	fetchPlayAlongsCount,
 	fetchRecent,
 	fetchRelatedLessons,
+	fetchRelatedRecommendedContent,
 	fetchRelatedSongs,
 	fetchReturning,
 	fetchSanity,
@@ -237,6 +239,7 @@ declare module 'musora-content-services' {
 		fetchHierarchy,
 		fetchLeaving,
 		fetchLessonContent,
+		fetchLessonsFeaturingThisContent,
 		fetchLiveEvent,
 		fetchMetadata,
 		fetchMethod,
@@ -246,6 +249,7 @@ declare module 'musora-content-services' {
 		fetchNewReleases,
 		fetchNextContentDataForParent,
 		fetchNextPreviousLesson,
+		fetchOtherSongVersions,
 		fetchOwnedChallenges,
 		fetchPackAll,
 		fetchPackData,
@@ -257,12 +261,14 @@ declare module 'musora-content-services' {
 		fetchPlaylistItems,
 		fetchRecent,
 		fetchRelatedLessons,
+		fetchRelatedRecommendedContent,
 		fetchRelatedSongs,
 		fetchReturning,
 		fetchSanity,
 		fetchScheduledAndNewReleases,
 		fetchScheduledReleases,
 		fetchShowsData,
+		fetchSimilarItems,
 		fetchSongArtistCount,
 		fetchSongById,
 		fetchSongsInProgress,
@@ -308,7 +314,7 @@ declare module 'musora-content-services' {
 		pinPlaylist,
 		playback,
 		postChallengesCommunityNotification,
-		postChallengesCompleteLesson,
+
 		postChallengesEnroll,
 		postChallengesEnrollmentNotification,
 		postChallengesHideCompletedBanner,
@@ -316,7 +322,7 @@ declare module 'musora-content-services' {
 		postChallengesSetStartDate,
 		postChallengesSoloNotification,
 		postChallengesUnlock,
-		postContentCompleted,
+		postContentComplete,
 		postContentLiked,
 		postContentReset,
 		postContentUnliked,
@@ -329,7 +335,6 @@ declare module 'musora-content-services' {
 		reportPlaylist,
 		reset,
 		setStudentViewForUser,
-		similarItems,
 		unassignModeratorToComment,
 		unlikeComment,
 		unlikeContent,

package/src/index.js

@@ -96,7 +96,6 @@ import {
 	pinPlaylist,
 	playback,
 	postChallengesCommunityNotification,
-	postChallengesCompleteLesson,
 	postChallengesEnroll,
 	postChallengesEnrollmentNotification,
 	postChallengesHideCompletedBanner,
@@ -104,7 +103,7 @@ import {
 	postChallengesSetStartDate,
 	postChallengesSoloNotification,
 	postChallengesUnlock,
-	postContentCompleted,
+	postContentComplete,
 	postContentLiked,
 	postContentReset,
 	postContentUnliked,
@@ -120,10 +119,10 @@ import {
 } from './services/railcontent.js';
 
 import {
+	fetchSimilarItems,
 	rankCategories,
 	rankItems,
-	recommendations,
-	similarItems
+	recommendations
 } from './services/recommendations.js';
 
 import {
@@ -144,6 +143,7 @@ import {
 	fetchHierarchy,
 	fetchLeaving,
 	fetchLessonContent,
+	fetchLessonsFeaturingThisContent,
 	fetchLiveEvent,
 	fetchMetadata,
 	fetchMethod,
@@ -152,12 +152,14 @@ import {
 	fetchMethodPreviousNextLesson,
 	fetchNewReleases,
 	fetchNextPreviousLesson,
+	fetchOtherSongVersions,
 	fetchPackAll,
 	fetchPackData,
 	fetchParentForDownload,
 	fetchPlayAlongsCount,
 	fetchRecent,
 	fetchRelatedLessons,
+	fetchRelatedRecommendedContent,
 	fetchRelatedSongs,
 	fetchReturning,
 	fetchSanity,
@@ -236,6 +238,7 @@ export {
 	fetchHierarchy,
 	fetchLeaving,
 	fetchLessonContent,
+	fetchLessonsFeaturingThisContent,
 	fetchLiveEvent,
 	fetchMetadata,
 	fetchMethod,
@@ -245,6 +248,7 @@ export {
 	fetchNewReleases,
 	fetchNextContentDataForParent,
 	fetchNextPreviousLesson,
+	fetchOtherSongVersions,
 	fetchOwnedChallenges,
 	fetchPackAll,
 	fetchPackData,
@@ -256,12 +260,14 @@ export {
 	fetchPlaylistItems,
 	fetchRecent,
 	fetchRelatedLessons,
+	fetchRelatedRecommendedContent,
 	fetchRelatedSongs,
 	fetchReturning,
 	fetchSanity,
 	fetchScheduledAndNewReleases,
 	fetchScheduledReleases,
 	fetchShowsData,
+	fetchSimilarItems,
 	fetchSongArtistCount,
 	fetchSongById,
 	fetchSongsInProgress,
@@ -307,7 +313,6 @@ export {
 	pinPlaylist,
 	playback,
 	postChallengesCommunityNotification,
-	postChallengesCompleteLesson,
 	postChallengesEnroll,
 	postChallengesEnrollmentNotification,
 	postChallengesHideCompletedBanner,
@@ -315,7 +320,7 @@ export {
 	postChallengesSetStartDate,
 	postChallengesSoloNotification,
 	postChallengesUnlock,
-	postContentCompleted,
+	postContentComplete,
 	postContentLiked,
 	postContentReset,
 	postContentUnliked,
@@ -328,7 +333,6 @@ export {
 	reportPlaylist,
 	reset,
 	setStudentViewForUser,
-	similarItems,
 	unassignModeratorToComment,
 	unlikeComment,
 	unlikeContent,

package/src/services/contentProgress.js

@@ -1,6 +1,6 @@
 import {
   fetchContentProgress,
-  postContentCompleted,
+  postContentComplete,
   postContentReset,
   postRecordWatchSession,
 } from './railcontent.js'
@@ -124,7 +124,7 @@ export async function assignmentStatusCompleted(assignmentId, parentContentId) {
       completeStatusInLocalContext(localContext, assignmentId, hierarchy)
     },
     async function () {
-      return postContentCompleted(assignmentId)
+      return postContentComplete(assignmentId)
     }
   )
 }
@@ -136,7 +136,7 @@ export async function contentStatusCompleted(contentId) {
       completeStatusInLocalContext(localContext, contentId, hierarchy)
     },
     async function () {
-      return postContentCompleted(contentId)
+      return postContentComplete(contentId)
     }
   )
 }

package/src/services/railcontent.js

@@ -16,7 +16,7 @@ const excludeFromGeneratedIndex = [
   'postContentUnliked',
   'postRecordWatchSession',
   'postContentStarted',
-  'postContentCompleted',
+  'postContentComplete',
   'postContentReset',
   'fetchUserPermissionsData',
 ]
@@ -343,18 +343,18 @@ export async function fetchHandler(url, method = 'get', dataVersion = null, body
 }
 
 export async function fetchUserLikes(currentVersion) {
-  let url = `/content/user/likes/all`
+  let url = `/api/content/v1/user/likes`
   return fetchDataHandler(url, currentVersion)
 }
 
 export async function postContentLiked(contentId) {
-  let url = `/content/user/likes/like/${contentId}`
+  let url = `/api/content/v1/user/likes/${contentId}`
   return await postDataHandler(url)
 }
 
 export async function postContentUnliked(contentId) {
-  let url = `/content/user/likes/unlike/${contentId}`
-  return await postDataHandler(url)
+  let url = `/api/content/v1/user/likes/${contentId}`
+  return await deleteDataHandler(url)
 }
 
 export async function fetchContentProgress(currentVersion) {
@@ -596,18 +596,6 @@ export async function postChallengesSoloNotification(contentId) {
   return await fetchHandler(url, 'post')
 }
 
-/**
- * Complete the challenge lesson and update challenge progress
- *
- * @param {int|string} contentId - railcontent id of the challenge
- * @returns {Promise<any|null>} - Modal data to display
- */
-export async function postChallengesCompleteLesson(contentId) {
-  let url = `/challenges/complete_lesson/${contentId}`
-  await contentStatusCompleted(contentId)
-  return await fetchHandler(url, 'post')
-}
-
 /**
  * Hide challenge completed award bannare
  *
@@ -926,9 +914,9 @@ export async function fetchPlaylistItem(payload) {
   return await fetchHandler(url)
 }
 
-export async function postContentCompleted(contentId) {
-  let url = `/content/user/progress/complete`
-  return postDataHandler(url, { contentId: contentId })
+export async function postContentComplete(contentId) {
+  let url = `/api/content/v1/user/progress/complete/${contentId}`
+  return postDataHandler(url)
 }
 
 export async function postContentReset(contentId) {
@@ -1084,7 +1072,7 @@ export async function playback(playlistId) {
  * Set a user's StudentView Flag
  *
  * @param {int|string} userId - id of the user (must be currently authenticated)
- * @param {bool} enable - truthsy value to enable student view
+ * @param {bool} enable - truthy value to enable student view
  * @returns {Promise<any|null>}
  */
 export async function setStudentViewForUser(userId, enable) {
@@ -1100,7 +1088,7 @@ export async function setStudentViewForUser(userId, enable) {
  * @returns {Promise<Object|null>} - A promise that resolves to an comment object
  */
 export async function fetchTopComment(railcontentId) {
-  const url = `/api/content/v1/comments/content/${railcontentId}/top`
+  const url = `/api/content/v1/${railcontentId}/comments?filter=top`
   return await fetchHandler(url)
 }
 
@@ -1112,7 +1100,7 @@ export async function fetchTopComment(railcontentId) {
  * @returns {Promise<*|null>}
  */
 export async function fetchComments(railcontentId, page = 1, limit = 20) {
-  const url = `/api/content/v1/comments/content/${railcontentId}/all?page=${page}&limit=${limit}`
+  const url = `/api/content/v1/${railcontentId}/comments?page=${page}&limit=${limit}`
   return await fetchHandler(url)
 }
 

package/src/services/recommendations.js

@@ -14,8 +14,8 @@ const excludeFromGeneratedIndex = []
 /**
  * Fetches similar content to the provided content id
  *
- * @param {brand} brand - brand of the content to filter
  * @param {integer} content_id - The ID of the content to find similar items for
+ * @param {brand} brand - brand of the content to filter
  * @param {integer} count - number of items to return
  * @returns {Promise<Object|null>} - Returns the content_ids sorted by rank (most significant first)
  * @example
@@ -23,7 +23,7 @@ const excludeFromGeneratedIndex = []
  *   .then(status => console.log(status))
  *   .catch(error => console.error(error));
  */
-export async function similarItems(brand, content_id, count = 10) {
+export async function fetchSimilarItems(content_id, brand, count = 10) {
   if (!content_id) {
     return []
   }

package/src/services/sanity.js

@@ -15,8 +15,9 @@ import {
   getNewReleasesTypes,
   coachLessonsTypes,
   getChildFieldsForContentType,
+  SONG_TYPES
 } from '../contentTypeConfig.js'
-
+import { fetchSimilarItems } from './recommendations.js'
 import { processMetadata, typeWithSortOrder } from '../contentMetaData.js'
 
 import { globalConfig } from './config.js'
@@ -36,7 +37,7 @@ import { getAllCompleted, getAllStarted, getAllStartedOrCompleted } from './cont
  *
  * @type {string[]}
  */
-const excludeFromGeneratedIndex = ['handleCustomFetchAll']
+const excludeFromGeneratedIndex = ['handleCustomFetchAll', 'fetchRelatedByLicense']
 
 /**
  * Fetch a song by its document ID from Sanity.
@@ -1313,6 +1314,78 @@ export async function fetchLessonContent(railContentId) {
   return fetchSanity(query, false, { customPostProcess: chapterProcess })
 }
 
+/**
+ *
+ * @param railContentId
+ * @param brand
+ * @param count
+ * @returns {Promise<Array<Object>|null>}
+ */
+export async function fetchRelatedRecommendedContent(railContentId, brand, count=10) {
+  const recommendedItems = await fetchSimilarItems(railContentId, brand, count)
+  return fetchByRailContentIds(recommendedItems)
+}
+
+/**
+ * Get song type (transcriptions, jam packs, play alongs, tutorial children) content documents that share content information with the provided railcontent document.
+ * These are linked through content that shares a license with the provided railcontent document
+ *
+ * @param railcontentId
+ * @param brand
+ * @param count
+ * @returns {Promise<*>}
+ */
+export async function fetchOtherSongVersions(railcontentId, brand, count=3){
+  return fetchRelatedByLicense(railcontentId, brand, true, count)
+}
+
+/**
+ * Get non-song content documents that share content information with the provided railcontent document.
+ * These are linked through content that shares a license with the provided railcontent document
+ *
+ * @param {integer} railcontentId
+ * @param {string} brand
+ * @param {integer:3} count
+ * @returns {Promise<*>}
+ */
+export async function fetchLessonsFeaturingThisContent(railcontentId, brand, count=3){
+  return fetchRelatedByLicense(railcontentId, brand, false, count)
+}
+
+/**
+ * Get content documents that share license information with the provided railcontent id
+ *
+ * @param {integer} railcontentId
+ * @param {string} brand
+ * @param {boolean} onlyUseSongTypes - if true, only return the song type documents. If false, return everything except those
+ * @param {integer:3} count
+ * @returns {Promise<*[]>}
+ */
+async function fetchRelatedByLicense(railcontentId, brand, onlyUseSongTypes, count) {
+  const typeCheck = `@->_type in [${arrayJoinWithQuotes(SONG_TYPES)}]`
+  const typeCheckString = onlyUseSongTypes ? `${typeCheck}` : `!(${typeCheck})`
+  const contentFromLicenseFilter =`_type == 'license' && references(^._id)].content[${typeCheckString} && @->railcontent_id != ${railcontentId}`
+  let filterSongTypesWithSameLicense = await new FilterBuilder(
+    contentFromLicenseFilter,
+    {isChildrenFilter: true},
+  ).buildFilter()
+  let queryFields = getFieldsForContentType()
+  const baseParentQuery = `railcontent_id == ${railcontentId}`
+  let parentQuery = await new FilterBuilder(baseParentQuery).buildFilter()
+
+  // queryFields = 'railcontent_id, title'
+  // parentQuery = baseParentQuery
+  // filterSongTypesWithSameLicense = contentFromLicenseFilter
+  const query = `*[${parentQuery}]{
+   _type, railcontent_id,
+      "related_by_license" :
+          *[${filterSongTypesWithSameLicense}]->{${queryFields}}|order(published_on desc, title asc)[0...${count}],
+      }[0...1]`
+
+  const results = await fetchSanity(query, false)
+  return results['related_by_license'] ?? [];
+}
+
 /**
  * Fetch related lessons for a specific lesson by RailContent ID and type.
  * @param {string} railContentId - The RailContent ID of the current lesson.
@@ -2272,9 +2345,9 @@ export async function fetchScheduledAndNewReleases(
       published_on,
       "type": _type,
       show_in_new_feed,
-      web_url_path,
       "permission_id": permission[]->railcontent_id
   }`
 
   return fetchSanity(query, true)
 }
+

package/test/contentProgress.test.js

@@ -14,7 +14,7 @@ import {
   getAllStartedOrCompleted,
 } from '../src/services/contentProgress'
 import { initializeTestService } from './initializeTests'
-import {getLessonContentRows, postContentCompleted} from '../src'
+import {getLessonContentRows, postContentComplete} from '../src'
 import {fetchRecent} from "../src/services/sanity";
 import {getRecent, getTabResults} from "../src/services/content";
 import {individualLessonsTypes, playAlongLessonTypes, transcriptionsLessonTypes, tutorialsLessonTypes} from "../src/contentTypeConfig";
@@ -40,7 +40,7 @@ describe('contentProgressDataContext', function () {
     let mock2 = jest.spyOn(railContentModule, 'postRecordWatchSession')
     mock2.mockImplementation(() => JSON.parse(`{"version": ${serverVersion}}`))
 
-    let mock3 = jest.spyOn(railContentModule, 'postContentCompleted')
+    let mock3 = jest.spyOn(railContentModule, 'postContentComplete')
     mock3.mockImplementation(() => JSON.parse(`{"version": ${serverVersion}}`))
 
     let mock4 = jest.spyOn(railContentModule, 'postContentReset')
@@ -120,7 +120,7 @@ describe('contentProgressDataContext', function () {
   // });
 
   // test('getAllCompletedWithUpdate', async () => {
-  //     let mock2 = jest.spyOn(railContentModule, 'postContentCompleted');
+  //     let mock2 = jest.spyOn(railContentModule, 'postContentComplete');
   //     let serverVersion = 2;
   //     mock2.mockImplementation(() => JSON.parse(`{"version": ${serverVersion}}`));
   //

package/test/initializeTests.js

@@ -5,7 +5,7 @@ const railContentModule = require('../src/services/railcontent.js')
 let token = null
 let userId = process.env.RAILCONTENT_USER_ID ?? null
 
-export async function initializeTestService(useLive = false) {
+export async function initializeTestService(useLive = false, isAdmin = false) {
   if (useLive && !token && process.env.RAILCONTENT_BASE_URL) {
     let data = await fetchLoginToken(
       process.env.RAILCONTENT_EMAIL,
@@ -39,7 +39,7 @@ export async function initializeTestService(useLive = false) {
   initializeService(config)
 
   let mock = jest.spyOn(railContentModule, 'fetchUserPermissionsData')
-  let testData = { permissions: [78, 91, 92], isAdmin: false }
+  let testData = { permissions: [78, 91, 92], isAdmin: isAdmin }
   mock.mockImplementation(() => testData)
 }
 

package/test/sanityQueryService.test.js

@@ -1,15 +1,12 @@
-import { getFieldsForContentType} from '../src/contentTypeConfig'
+import { getFieldsForContentType, SONG_TYPES } from '../src/contentTypeConfig'
+
 const railContentModule = require('../src/services/railcontent.js')
 
-import {
-  fetchCommentModContentData,
-  fetchMethodPreviousNextLesson,
-  fetchSanity,
-} from '../src/services/sanity'
 import { log } from './log.js'
 import { initializeTestService } from './initializeTests'
 import { dataContext } from '../src/services/contentProgress'
-import {fetchOwnedChallenges, getRecommendedForYou, globalConfig, recommendations} from '../src'
+import { fetchOwnedChallenges, getRecommendedForYou, globalConfig, recommendations } from '../src'
+import { fetchLessonsFeaturingThisContent } from '../src/services/sanity.js'
 
 const {
   fetchSongById,
@@ -42,13 +39,17 @@ const {
   fetchNextPreviousLesson,
   fetchHierarchy,
   fetchTopLevelParentId,
+  fetchOtherSongVersions,
+  fetchCommentModContentData,
+  fetchMethodPreviousNextLesson,
+  fetchSanity,
 } = require('../src/services/sanity.js')
 
 const { FilterBuilder } = require('../src/filterBuilder.js')
 
 const { processMetadata } = require('../src/contentMetaData.js')
 
-describe('Sanity Queries', function () {
+describe('Sanity Queries', function() {
   beforeEach(() => {
     initializeTestService()
   })
@@ -62,21 +63,21 @@ describe('Sanity Queries', function () {
   test('fetchReturning', async () => {
     const brand = 'guitareo'
     const page = 1
-    const response = await fetchReturning(brand, {pageNumber: 1})
+    const response = await fetchReturning(brand, { pageNumber: 1 })
     expect(response).toBeDefined()
-  });
+  })
 
   test('fetchLeaving', async () => {
     const brand = 'guitareo'
-    const response = await fetchLeaving(brand, {pageNumber: 1})
+    const response = await fetchLeaving(brand, { pageNumber: 1 })
     expect(response).toBeDefined()
-  });
+  })
 
   test('fetchComingSoon', async () => {
     const brand = 'guitareo'
-    const response = await fetchComingSoon(brand, {pageNumber: 2, contentPerPage: 20})
+    const response = await fetchComingSoon(brand, { pageNumber: 2, contentPerPage: 20 })
     expect(response).toBeDefined()
-  });
+  })
 
 
   test('fetchArtists', async () => {
@@ -154,9 +155,7 @@ describe('Sanity Queries', function () {
 
   test('fetchAllSongsInProgress', async () => {
     var mock = jest.spyOn(dataContext, 'fetchData')
-    var json = JSON.parse(
-      `{"version":1,"config":{"key":1,"enabled":1,"checkInterval":1,"refreshInterval":2},"data":{"412941":{"s":"started","p":6,"t":20,"u":1731108082}}}`
-    )
+    var json = JSON.parse(`{"version":1,"config":{"key":1,"enabled":1,"checkInterval":1,"refreshInterval":2},"data":{"412941":{"s":"started","p":6,"t":20,"u":1731108082}}}`)
     mock.mockImplementation(() => json)
     const response = await fetchAll('drumeo', 'song', { progress: 'in progress' })
     expect(response.entity[0].id).toBe(412941)
@@ -262,8 +261,7 @@ describe('Sanity Queries', function () {
     expect(response.entity[0].id).toBeDefined()
 
     response = await fetchAll('drumeo', 'challenge', {
-      useDefaultFields: false,
-      customFields: ['garbage'],
+      useDefaultFields: false, customFields: ['garbage'],
     })
     log(response)
     expect(response.entity[0].garbage).toBeDefined()
@@ -278,13 +276,11 @@ describe('Sanity Queries', function () {
     let relatedDoc = await fetchByRailContentId(response.related_lessons[0].id, 'song')
     // match on artist or any genre
     let isMatch = artist === relatedDoc.artist.name
-    isMatch =
-      isMatch ||
-      document.genre.some((genre) => {
-        return relatedDoc.genre.some((relatedGenre) => {
-          return genre._ref === relatedGenre._ref
-        })
+    isMatch = isMatch || document.genre.some((genre) => {
+      return relatedDoc.genre.some((relatedGenre) => {
+        return genre._ref === relatedGenre._ref
       })
+    })
     expect(isMatch).toBeTruthy()
   })
 
@@ -347,16 +343,14 @@ describe('Sanity Queries', function () {
   test('fetchAll-WithProgress', async () => {
     const ids = [410213, 410215]
     let response = await fetchAll('drumeo', 'song', {
-      sort: 'slug',
-      progressIds: ids,
+      sort: 'slug', progressIds: ids,
     })
     expect(response.entity.length).toBe(2)
     expect((response.entity[0].id = 410215))
     expect((response.entity[1].id = 410213))
     // change the type and we expect no results
     response = await fetchAll('drumeo', 'quick-tip', {
-      sort: 'slug',
-      progressIds: ids,
+      sort: 'slug', progressIds: ids,
     })
     expect(response.entity.length).toBe(0)
   })
@@ -400,16 +394,7 @@ describe('Sanity Queries', function () {
     expect(response.entity.length).toBeGreaterThan(0)
   })
   test('fetchCoachLessons-WithTypeFilters', async () => {
-    const response = await fetchAllFilterOptions(
-      'drumeo',
-      ['type,course', 'type,live'],
-      '',
-      '',
-      'coach-lessons',
-      '',
-      [],
-      31880
-    )
+    const response = await fetchAllFilterOptions('drumeo', ['type,course', 'type,live'], '', '', 'coach-lessons', '', [], 31880)
     log(response)
     expect(response.meta.filterOptions.difficulty).toBeDefined()
     expect(response.meta.filterOptions.type).toBeDefined()
@@ -422,18 +407,7 @@ describe('Sanity Queries', function () {
     const coachId = 31880
     const invalidContentType = 'course' // Not 'coach-lessons'
 
-    await expect(
-      fetchAllFilterOptions(
-        brand,
-        ['type,course', 'type,live'],
-        '',
-        '',
-        invalidContentType,
-        '',
-        [],
-        coachId
-      )
-    ).rejects.toThrow("Invalid contentType: 'course' for coachId. It must be 'coach-lessons'.")
+    await expect(fetchAllFilterOptions(brand, ['type,course', 'type,live'], '', '', invalidContentType, '', [], coachId)).rejects.toThrow(`Invalid contentType: 'course' for coachId. It must be 'coach-lessons'.`)
   })
 
   test('fetchCoachLessons-IncludedFields', async () => {
@@ -637,15 +611,13 @@ describe('Sanity Queries', function () {
     let data = await fetchCommentModContentData([241251, 241252, 211153])
     expect(data[241251].title).toBe('Setting Up Your Space')
     expect(data[241251].type).toBe('learning-path-lesson')
-    expect(data[241251].url).toBe(
-      '/drumeo/method/drumeo-method/241247/getting-started-on-the-drums/241248/gear/241249/setting-up-your-space/241251'
-    )
+    expect(data[241251].url).toBe('/drumeo/method/drumeo-method/241247/getting-started-on-the-drums/241248/gear/241249/setting-up-your-space/241251')
     expect(data[241251].parentTitle).toBe('Gear')
     expect(data[241252].title).toBe('Setting Up Your Pedals & Throne')
   })
 })
 
-describe('Filter Builder', function () {
+describe('Filter Builder', function() {
   beforeEach(() => {
     initializeTestService()
   })
@@ -670,26 +642,21 @@ describe('Filter Builder', function () {
 
   test('withOnlyFilterAvailableStatuses', async () => {
     const filter = 'railcontent_id = 111'
-    const builder = FilterBuilder.withOnlyFilterAvailableStatuses(
-      filter,
-      ['published', 'unlisted'],
-      true
-    )
+    const builder = FilterBuilder.withOnlyFilterAvailableStatuses(filter, ['published', 'unlisted'], true)
     const finalFilter = await builder.buildFilter()
     const clauses = spliceFilterForAnds(finalFilter)
     expect(clauses[0].phrase).toBe(filter)
     expect(clauses[1].field).toBe('status')
     expect(clauses[1].operator).toBe('in')
     // not sure I like this
-    expect(clauses[1].condition).toBe("['published','unlisted']")
+    expect(clauses[1].condition).toBe(`['published','unlisted']`)
     expect(clauses[2].field).toBe('published_on')
   })
 
   test('withContentStatusAndFutureScheduledContent', async () => {
     const filter = 'railcontent_id = 111'
     const builder = new FilterBuilder(filter, {
-      availableContentStatuses: ['published', 'unlisted', 'scheduled'],
-      getFutureScheduledContentsOnly: true,
+      availableContentStatuses: ['published', 'unlisted', 'scheduled'], getFutureScheduledContentsOnly: true,
     })
     const finalFilter = await builder.buildFilter()
     const clauses = spliceFilterForAnds(finalFilter)
@@ -697,8 +664,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' && defined(published_on) && published_on >="
+    const expected = `['published','unlisted'] || (status == 'scheduled' && defined(published_on) && published_on >=`
     const isMatch = finalFilter.includes(expected)
     expect(isMatch).toBeTruthy()
   })
@@ -707,7 +673,7 @@ describe('Filter Builder', function () {
     const filter = 'railcontent_id = 111'
     const builder = new FilterBuilder(filter)
     const finalFilter = await builder.buildFilter()
-    const expected = "references(*[_type == 'permission' && railcontent_id in [78,91,92]]._id)"
+    const expected = `references(*[_type == 'permission' && railcontent_id in [78,91,92]]._id)`
     const isMatch = finalFilter.includes(expected)
     expect(isMatch).toBeTruthy()
   })
@@ -716,7 +682,7 @@ describe('Filter Builder', function () {
     const filter = 'railcontent_id = 111'
     const builder = new FilterBuilder(filter)
     const finalFilter = await builder.buildFilter()
-    const expected = "references(*[_type == 'permission' && railcontent_id in [78,91,92]]._id)"
+    const expected = `references(*[_type == 'permission' && railcontent_id in [78,91,92]]._id)`
     const isMatch = finalFilter.includes(expected)
     expect(isMatch).toBeTruthy()
   })
@@ -724,11 +690,10 @@ describe('Filter Builder', function () {
   test('withPermissionBypass', async () => {
     const filter = 'railcontent_id = 111'
     const builder = new FilterBuilder(filter, {
-      bypassPermissions: true,
-      pullFutureContent: false,
+      bypassPermissions: true, pullFutureContent: false,
     })
     const finalFilter = await builder.buildFilter()
-    const expected = "references(*[_type == 'permission' && railcontent_id in [78,91,92]]._id)"
+    const expected = `references(*[_type == 'permission' && railcontent_id in [78,91,92]]._id)`
     const isMatch = finalFilter.includes(expected)
     expect(isMatch).toBeFalsy()
     const clauses = spliceFilterForAnds(finalFilter)
@@ -742,8 +707,7 @@ describe('Filter Builder', function () {
 
     const filter = 'railcontent_id = 111'
     let builder = new FilterBuilder(filter, {
-      pullFutureContent: true,
-      bypassPermissions: true,
+      pullFutureContent: true, bypassPermissions: true,
     })
 
     let finalFilter = await builder.buildFilter()
@@ -755,8 +719,7 @@ describe('Filter Builder', function () {
     expect(clauses[3].field).toBe('published_on')
 
     builder = new FilterBuilder(filter, {
-      getFutureContentOnly: true,
-      bypassPermissions: true,
+      getFutureContentOnly: true, bypassPermissions: true,
     })
     finalFilter = await builder.buildFilter()
     clauses = spliceFilterForAnds(finalFilter)
@@ -815,28 +778,13 @@ describe('Filter Builder', function () {
   })
 
   test('fetchAllFilterOptions-filter-selected', async () => {
-    let response = await fetchAllFilterOptions(
-      'drumeo',
-      [
-        'theory,notation',
-        'theory,time signatures',
-        'creativity,Grooves',
-        'creativity,Fills & Chops',
-        'difficulty,Beginner',
-        'difficulty,Intermediate',
-        'difficulty,Expert',
-      ],
-      '',
-      '',
-      'course',
-      ''
-    )
+    let response = await fetchAllFilterOptions('drumeo', ['theory,notation', 'theory,time signatures', 'creativity,Grooves', 'creativity,Fills & Chops', 'difficulty,Beginner', 'difficulty,Intermediate', 'difficulty,Expert'], '', '', 'course', '')
     log(response)
     expect(response.meta.filterOptions).toBeDefined()
   })
 })
 
-describe('MetaData', function () {
+describe('MetaData', function() {
   test('customBrandTypeExists', async () => {
     const metaData = processMetadata('guitareo', 'recording')
     expect(metaData.type).toBe('recording')
@@ -871,7 +819,7 @@ describe('MetaData', function () {
   })
 })
 
-describe('v2', function () {
+describe('api.v1', function() {
   beforeEach(() => {
     initializeTestService()
   })
@@ -892,19 +840,13 @@ describe('v2', function () {
   })
 
   test('fetchAllFilterOptionsLessons', async () => {
-    const response = await fetchAllFilterOptions(
-      'pianote',
-      [],null,null,'lessons'
-    )
+    const response = await fetchAllFilterOptions('pianote', [], null, null, 'lessons')
     log(response)
     expect(response.meta.filters).toBeDefined()
   })
 
   test('fetchAllFilterOptionsSongs', async () => {
-    const response = await fetchAllFilterOptions(
-      'pianote',
-      [],null,null,'songs'
-    )
+    const response = await fetchAllFilterOptions('pianote', [], null, null, 'songs')
     log(response)
     expect(response.meta.filters).toBeDefined()
   })
@@ -914,9 +856,105 @@ describe('v2', function () {
     log(liveEvent)
     //expect(metaData).toBeNull()
   })
+
+
+
+  test('fetchRelatedLessons-pack-bundle-lessons', async () => {
+    //https://www.musora.com/singeo/packs/sing-harmony-in-30-days/410537/sing-harmony-in-30-days/410538/day-2/410541
+    const railContentId = 410541
+    const relatedLessons = await fetchRelatedLessons(railContentId, 'singeo')
+    log(relatedLessons)
+    const expectedPath = ['', 'singeo', 'packs', 'sing-harmony-in-30-days', '410537', 'sing-harmony-in-30-days', '410538']
+    expect(relatedLessons['related_lessons'].length).toBeGreaterThanOrEqual(1)
+    relatedLessons['related_lessons'].forEach(document => {
+      expect('pack-bundle-lesson').toStrictEqual(document.type)
+      // there are other ways to check that these all have the same parent, but I don't want to write it
+      let web_url_path = document.web_url_path.split('/')
+      // remove id and slug
+      web_url_path.pop()
+      web_url_path.pop()
+      expect(web_url_path).toEqual(expectedPath)
+    })
+  })
+
+  test('fetchRelatedLessons-course-parts', async () => {
+    ///drumeo/courses/ultra-compact-drum-set-gear-guide/295177/gigpig-standard-and-extendable/297929
+    const railContentId = 297929
+    const relatedLessons = await fetchRelatedLessons(railContentId, 'drumeo')
+    log(relatedLessons)
+    const expectedPath = ['', 'drumeo', 'courses', 'ultra-compact-drum-set-gear-guide', '295177']
+    expect(relatedLessons['related_lessons'].length).toBeGreaterThanOrEqual(1)
+    relatedLessons['related_lessons'].forEach(document => {
+      expect('course-part').toStrictEqual(document.type)
+      // there are other ways to check that these all have the same parent, but I don't want to write it
+      let web_url_path = document.web_url_path.split('/')
+      // remove id and slug
+      web_url_path.pop()
+      web_url_path.pop()
+      expect(web_url_path).toEqual(expectedPath)
+    })
+  })
+})
+
+describe('api.v1.admin', function() {
+  beforeEach(() => {
+    initializeTestService(false, true)
+  })
+
+  test('fetchOtherSongVersions', async () => {
+    // much of the licensed content is currently drafted, so this must be run in the admin test-suite
+    const railContentId = 386901
+    const licenseQuery = `*[railcontent_id == ${railContentId}]{
+      'content_ids': *[_type == 'license' && references(^._id)].content[]->railcontent_id
+    }[0]`
+    const otherReferencedContent = (await fetchSanity(licenseQuery, true))['content_ids']
+    log(otherReferencedContent)
+    const relatedSongsTypes = await fetchOtherSongVersions(railContentId, 'drumeo', 100)
+    log(relatedSongsTypes)
+    expect(relatedSongsTypes.length).toBeGreaterThanOrEqual(1)
+    relatedSongsTypes.forEach(document => {
+      expect(SONG_TYPES).toContain(document.type)
+      expect(document.id).not.toStrictEqual(railContentId)
+      expect(otherReferencedContent).toContain(document.id)
+    })
+  })
+
+  test('fetchLessonsFeaturingThisContent', async () => {
+    // much of the licensed content is currently drafted, so this must be run in the admin test-suite
+    const railContentId = 386901
+    const licenseQuery = `*[railcontent_id == ${railContentId}]{
+      'content_ids': *[_type == 'license' && references(^._id)].content[]->railcontent_id
+    }[0]`
+    const otherReferencedContent = (await fetchSanity(licenseQuery, true))['content_ids']
+    const relatedNotSongs = await fetchLessonsFeaturingThisContent(railContentId, 'drumeo', 100)
+    log(relatedNotSongs)
+    expect(relatedNotSongs.length).toBeGreaterThanOrEqual(1)
+    relatedNotSongs.forEach(document => {
+      expect(SONG_TYPES).not.toContain(document.type)
+      expect(document.id).not.toStrictEqual(railContentId)
+      expect(otherReferencedContent).toContain(document.id)
+    })
+  })
+
+  test('fetchRelatedLessons-song-tutorial-children', async () => {
+    // When I wrote this it didn't need admin, but something changed. Shrug
+    const railContentId = 222633
+    const relatedLessons = await fetchRelatedLessons(railContentId, 'pianote')
+    log(relatedLessons)
+    const expectedPath = ['', 'pianote', 'song-tutorials', 'hallelujah', '221831']
+    expect(relatedLessons['related_lessons'].length).toBeGreaterThanOrEqual(1)
+    relatedLessons['related_lessons'].forEach(document => {
+      expect('song-tutorial-children').toStrictEqual(document.type)
+      let web_url_path = document.web_url_path.split('/')
+      // remove id, slug
+      web_url_path.pop()
+      web_url_path.pop()
+      expect(web_url_path).toEqual(expectedPath)
+    })
+  })
 })
 
-describe('Recommended System', function () {
+describe('Recommended System', function() {
   beforeEach(() => {
     initializeTestService()
   })
@@ -931,7 +969,7 @@ describe('Recommended System', function () {
   })
 
   test('getRecommendedForYou-SeeAll', async () => {
-    const results = await getRecommendedForYou('drumeo', 'recommended', {page: 1, limit:20})
+    const results = await getRecommendedForYou('drumeo', 'recommended', { page: 1, limit: 20 })
     log(results)
     expect(results.type).toBeDefined()
     expect(results.data).toBeDefined()
@@ -939,3 +977,5 @@ describe('Recommended System', function () {
     expect(results.data.length).toBeGreaterThanOrEqual(1)
   })
 })
+
+