musora-content-services 1.3.18 → 2.0.2

package/src/contentTypeConfig.js

@@ -1,4 +1,6 @@
 //import {AWSUrl, CloudFrontURl} from "./services/config";
+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 DEFAULT_FIELDS = [
@@ -25,6 +27,7 @@ export const DEFAULT_FIELDS = [
   "'permission_id': permission[]->railcontent_id",
   'xp',
   'child_count',
+  '"lesson_count": coalesce(count(child[]->.child[]->), child_count)',
 ]
 export const DEFAULT_CHILD_FIELDS = [
   `"id": railcontent_id`,
@@ -50,7 +53,7 @@ export const assignmentsField = `"assignments":assignment[]{
     "id": railcontent_id,
         "soundslice_slug": assignment_soundslice,
         "title": assignment_title,
-        "sheet_music_image_url": 
+        "sheet_music_image_url":
           coalesce(assignment_sheet_music_image_new[]{
               _type == 'Image' => {
                 'url': asset->url
@@ -126,6 +129,62 @@ export const childContentTypeConfig = {
   ]
 }
 
+export const singleLessonTypes = ['quick-tips', 'rudiment', 'coach-lessons'];
+export const practiceAlongsLessonTypes = ['workout', 'boot-camp','challenges'];
+export const performancesLessonTypes = ['performance','solo','drum-fest-international-2022'];
+export const documentariesLessonTypes = ['tama','sonor','history-of-electronic-drums','paiste-cymbals'];
+export const liveArchivesLessonTypes = ['podcast', 'coach-stream', 'live-streams'];
+export const studentArchivesLessonTypes = ['student-review', 'question-and-answer', 'student-focus','student-collaborations'];
+export const tutorialsLessonTypes = ['song-tutorial'];
+export const transcriptionsLessonTypes = ['song'];
+export const playAlongLessonTypes = ['play-along'];
+
+export const individualLessonsTypes = [
+  ...singleLessonTypes,
+  ...practiceAlongsLessonTypes,
+  ...performancesLessonTypes,
+  ...documentariesLessonTypes,
+  ...liveArchivesLessonTypes,
+  ...studentArchivesLessonTypes
+];
+
+export const coursesLessonTypes = ['course', 'pack','spotlight'];
+export const showsLessonTypes = ['diy-drum-experiments','exploring-beats','in-rhythm',  'rhythmic-adventures-of-captain-carson','rhythms-from-another-planet','study-the-greats'];
+export const collectionLessonTypes = [
+    ...coursesLessonTypes,
+    ...showsLessonTypes
+];
+
+export const lessonTypesMapping = {
+  'single lessons': singleLessonTypes,
+  'practice alongs': practiceAlongsLessonTypes,
+  'live archives': liveArchivesLessonTypes,
+  'performances': performancesLessonTypes,
+  'student archives': studentArchivesLessonTypes,
+  'documentaries': documentariesLessonTypes,
+  'courses': coursesLessonTypes,
+  'shows': showsLessonTypes,
+  'collections': collectionLessonTypes,
+  'individuals': individualLessonsTypes,
+  'tutorials': tutorialsLessonTypes,
+  'transcriptions': transcriptionsLessonTypes,
+  'tabs': transcriptionsLessonTypes,
+  'sheet music': transcriptionsLessonTypes,
+  'play alongs': playAlongLessonTypes,
+};
+
+
+export const filterTypes = {
+  lessons: [...individualLessonsTypes, ...collectionLessonTypes],
+  songs: [...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes]
+}
+
+export const recentTypes = {
+  lessons: [...individualLessonsTypes],
+  songs: [...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes],
+  home: [...individualLessonsTypes, ...tutorialsLessonTypes, ...transcriptionsLessonTypes, ...playAlongLessonTypes]
+}
+
 export let contentTypeConfig = {
   song: {
     fields: ['album', 'soundslice', 'instrumentless', `"resources": ${resourcesField}`],
@@ -230,7 +289,7 @@ export let contentTypeConfig = {
                 "instructors": instructor[]->name,
                 length_in_seconds,
                 "resources": ${resourcesField},
-                difficulty, 
+                difficulty,
                 difficulty_string,
                 artist->,
                 "thumbnail_url":thumbnail.asset->url,
@@ -595,7 +654,7 @@ export function getChildFieldsForContentType(contentType, asQueryString = true)
  *     'genre,rock']
  * @returns {string} - A string that can be used in a groq query
  */
-export function filtersToGroq(filters, selectedFilters = []) {
+export function filtersToGroq(filters, selectedFilters = [], pageName = '') {
   if (!filters) {
     filters = []
   }
@@ -639,6 +698,13 @@ export function filtersToGroq(filters, selectedFilters = []) {
             !selectedFilters.includes(key)
           ) {
             return `"${value}" in ${key}[]->name`
+          } else if (
+              ['style'].includes(
+                  key
+              ) &&
+              !selectedFilters.includes(key)
+          ) {
+            return `"${value}" in genre[]->name`
           } else if (key === 'gear' && !selectedFilters.includes('gear')) {
             return `gear match "${value}"`
           } else if (key === 'instrumentless' && !selectedFilters.includes(key)) {
@@ -654,8 +720,44 @@ export function filtersToGroq(filters, selectedFilters = []) {
               return `(difficulty_string == "Novice" || difficulty_string == "Introductory" )`
             }
             return `difficulty_string == "${value}"`
-          } else if (key === 'type' && !selectedFilters.includes(key)) {
+          } else if (key === 'tab' && !selectedFilters.includes(key)) {
+            if(value.toLowerCase() === Tabs.Individuals.name.toLowerCase()){
+              const conditions = individualLessonsTypes.map(lessonType => `_type == '${lessonType}'`).join(' || ');
+              return ` (${conditions})`;
+            } else if(value.toLowerCase() === Tabs.Collections.name.toLowerCase()){
+              const conditions = collectionLessonTypes.map(lessonType => `_type == '${lessonType}'`).join(' || ');
+              return ` (${conditions})`;
+            } else if(value.toLowerCase() === Tabs.Tutorials.name.toLowerCase()){
+              const conditions = tutorialsLessonTypes.map(lessonType => `_type == '${lessonType}'`).join(' || ');
+              return ` (${conditions})`;
+            } else if(value.toLowerCase() === Tabs.Transcriptions.name.toLowerCase()){
+              const conditions = transcriptionsLessonTypes.map(lessonType => `_type == '${lessonType}'`).join(' || ');
+              return ` (${conditions})`;
+            } else if(value.toLowerCase() === Tabs.PlayAlongs.name.toLowerCase()){
+              const conditions = playAlongLessonTypes.map(lessonType => `_type == '${lessonType}'`).join(' || ');
+              return ` (${conditions})`;
+            } else if(value.toLowerCase() === Tabs.ExploreAll.name.toLowerCase()){
+              var allLessons = filterTypes[pageName] || [];
+              const conditions = allLessons.map(lessonType => `_type == '${lessonType}'`).join(' || ');
+              if (conditions === "") return '';
+              return ` (${conditions})`;
+          }else if(value.toLowerCase() === Tabs.RecentAll.name.toLowerCase()){
+              var allLessons = recentTypes[pageName] || [];
+              const conditions = allLessons.map(lessonType => `_type == '${lessonType}'`).join(' || ');
+              if (conditions === "") return '';
+              return ` (${conditions})`;
+            }
             return `_type == "${value}"`
+          } else if (key === 'type' && !selectedFilters.includes(key)) {
+            const typeKey = value.toLowerCase();
+            const lessonTypes = lessonTypesMapping[typeKey];
+            if (lessonTypes) {
+              const conditions = lessonTypes.map(
+                  (lessonType) => `_type == '${lessonType}'`
+              ).join(' || ');
+              return ` (${conditions})`;
+            }
+            return `_type == "${value}"`;
           } else if (key === 'length_in_seconds') {
             if (value.includes('-')) {
               const [min, max] = value.split('-').map(Number)
@@ -666,6 +768,8 @@ export function filtersToGroq(filters, selectedFilters = []) {
             } else {
               return `${key} == ${value}`
             }
+          } else if (key === 'pageName') {
+            return ` `
           } else if (!selectedFilters.includes(key)) {
             return ` ${key} == ${/^\d+$/.test(value) ? value : `"$${value}"`}`
           }

package/src/filterBuilder.js

@@ -1,4 +1,4 @@
-import { fetchUserPermissions } from './services/userPermissions.js'
+import { fetchUserPermissions } from './services/user/permissions.js'
 import { plusMembershipPermissions } from './contentTypeConfig.js'
 
 export class FilterBuilder {
@@ -56,13 +56,13 @@ export class FilterBuilder {
     return filter
   }
 
-  _getRoundedTime(){
+  _getRoundedTime() {
     // 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.
-    const now = new Date();
-    return new Date(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(), 1);
+    const now = new Date()
+    return new Date(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(), 1)
   }
 
   _applyContentStatuses() {
@@ -98,7 +98,7 @@ export class FilterBuilder {
     ) {
       // we must pull in future content here, otherwise we'll restrict on content this is published in the past and remove any scheduled content
       this.pullFutureContent = true
-      const now = this._getRoundedTime().toISOString();
+      const now = this._getRoundedTime().toISOString()
       let statuses = [...this.availableContentStatuses]
       statuses.splice(statuses.indexOf(this.STATUS_SCHEDULED), 1)
       this._andWhere(
@@ -130,7 +130,7 @@ export class FilterBuilder {
 
   _applyPublishingDateRestrictions() {
     if (this.bypassPublishedDateRestriction) return this
-    const now = this._getRoundedTime().toISOString();
+    const now = this._getRoundedTime().toISOString()
 
     if (this.getFutureContentOnly) {
       this._andWhere(`${this.prefix}published_on >= '${now}'`)

package/src/index.d.ts

@@ -5,6 +5,16 @@ import {
 	initializeService
 } from './services/config.js';
 
+import {
+	getContentRows,
+	getLessonContentRows,
+	getNewAndUpcoming,
+	getRecent,
+	getRecommendedForYou,
+	getScheduleContentRows,
+	getTabResults
+} from './services/content.js';
+
 import {
 	isContentLiked,
 	likeContent,
@@ -32,9 +42,8 @@ import {
 } from './services/dataContext.js';
 
 import {
-	setLastUpdatedTime,
-	wasLastUpdateOlderThanXSeconds
-} from './services/lastUpdated.js';
+	getActiveDiscussions
+} from './services/forum.js';
 
 import {
 	addItemToPlaylist,
@@ -110,6 +119,7 @@ import {
 import {
 	rankCategories,
 	rankItems,
+	recommendations,
 	similarItems
 } from './services/recommendations.js';
 
@@ -143,14 +153,17 @@ import {
 	fetchPackData,
 	fetchParentForDownload,
 	fetchPlayAlongsCount,
+	fetchRecent,
 	fetchRelatedLessons,
 	fetchRelatedSongs,
 	fetchReturning,
 	fetchSanity,
+	fetchScheduledAndNewReleases,
 	fetchScheduledReleases,
 	fetchShowsData,
 	fetchSongArtistCount,
 	fetchSongById,
+	fetchTabData,
 	fetchTopLevelParentId,
 	fetchUpcomingEvents,
 	getSortOrder,
@@ -160,7 +173,16 @@ import {
 import {
 	fetchUserPermissions,
 	reset
-} from './services/userPermissions.js';
+} from './services/user/permissions.js';
+
+import {
+	login,
+	logout
+} from './services/user/sessions.js';
+
+import {
+	getUserActivityStats
+} from './services/userActivity.js';
 
 declare module 'musora-content-services' {
 	export {
@@ -230,15 +252,18 @@ declare module 'musora-content-services' {
 		fetchPlaylist,
 		fetchPlaylistItem,
 		fetchPlaylistItems,
+		fetchRecent,
 		fetchRelatedLessons,
 		fetchRelatedSongs,
 		fetchReturning,
 		fetchSanity,
+		fetchScheduledAndNewReleases,
 		fetchScheduledReleases,
 		fetchShowsData,
 		fetchSongArtistCount,
 		fetchSongById,
 		fetchSongsInProgress,
+		fetchTabData,
 		fetchTopComment,
 		fetchTopLevelParentId,
 		fetchUpcomingEvents,
@@ -249,15 +274,24 @@ declare module 'musora-content-services' {
 		fetchUserPermissions,
 		fetchUserPermissionsData,
 		fetchUserPlaylists,
+		getActiveDiscussions,
 		getAllCompleted,
 		getAllStarted,
 		getAllStartedOrCompleted,
+		getContentRows,
+		getLessonContentRows,
+		getNewAndUpcoming,
 		getProgressPercentage,
 		getProgressPercentageByIds,
 		getProgressState,
 		getProgressStateByIds,
+		getRecent,
+		getRecommendedForYou,
 		getResumeTimeSeconds,
+		getScheduleContentRows,
 		getSortOrder,
+		getTabResults,
+		getUserActivityStats,
 		globalConfig,
 		initializeService,
 		isContentLiked,
@@ -265,6 +299,8 @@ declare module 'musora-content-services' {
 		likeComment,
 		likeContent,
 		likePlaylist,
+		login,
+		logout,
 		openComment,
 		pinPlaylist,
 		playback,
@@ -284,11 +320,11 @@ declare module 'musora-content-services' {
 		postRecordWatchSession,
 		rankCategories,
 		rankItems,
+		recommendations,
 		recordWatchSession,
 		replyToComment,
 		reportPlaylist,
 		reset,
-		setLastUpdatedTime,
 		setStudentViewForUser,
 		similarItems,
 		unassignModeratorToComment,
@@ -298,6 +334,5 @@ declare module 'musora-content-services' {
 		updatePlaylist,
 		updatePlaylistItem,
 		verifyLocalDataContext,
-		wasLastUpdateOlderThanXSeconds,
 	}
 }

package/src/index.js

@@ -5,6 +5,16 @@ import {
 	initializeService
 } from './services/config.js';
 
+import {
+	getContentRows,
+	getLessonContentRows,
+	getNewAndUpcoming,
+	getRecent,
+	getRecommendedForYou,
+	getScheduleContentRows,
+	getTabResults
+} from './services/content.js';
+
 import {
 	isContentLiked,
 	likeContent,
@@ -32,9 +42,8 @@ import {
 } from './services/dataContext.js';
 
 import {
-	setLastUpdatedTime,
-	wasLastUpdateOlderThanXSeconds
-} from './services/lastUpdated.js';
+	getActiveDiscussions
+} from './services/forum.js';
 
 import {
 	addItemToPlaylist,
@@ -110,6 +119,7 @@ import {
 import {
 	rankCategories,
 	rankItems,
+	recommendations,
 	similarItems
 } from './services/recommendations.js';
 
@@ -143,14 +153,17 @@ import {
 	fetchPackData,
 	fetchParentForDownload,
 	fetchPlayAlongsCount,
+	fetchRecent,
 	fetchRelatedLessons,
 	fetchRelatedSongs,
 	fetchReturning,
 	fetchSanity,
+	fetchScheduledAndNewReleases,
 	fetchScheduledReleases,
 	fetchShowsData,
 	fetchSongArtistCount,
 	fetchSongById,
+	fetchTabData,
 	fetchTopLevelParentId,
 	fetchUpcomingEvents,
 	getSortOrder,
@@ -160,7 +173,16 @@ import {
 import {
 	fetchUserPermissions,
 	reset
-} from './services/userPermissions.js';
+} from './services/user/permissions.js';
+
+import {
+	login,
+	logout
+} from './services/user/sessions.js';
+
+import {
+	getUserActivityStats
+} from './services/userActivity.js';
 
 export {
 	addItemToPlaylist,
@@ -229,15 +251,18 @@ export {
 	fetchPlaylist,
 	fetchPlaylistItem,
 	fetchPlaylistItems,
+	fetchRecent,
 	fetchRelatedLessons,
 	fetchRelatedSongs,
 	fetchReturning,
 	fetchSanity,
+	fetchScheduledAndNewReleases,
 	fetchScheduledReleases,
 	fetchShowsData,
 	fetchSongArtistCount,
 	fetchSongById,
 	fetchSongsInProgress,
+	fetchTabData,
 	fetchTopComment,
 	fetchTopLevelParentId,
 	fetchUpcomingEvents,
@@ -248,15 +273,24 @@ export {
 	fetchUserPermissions,
 	fetchUserPermissionsData,
 	fetchUserPlaylists,
+	getActiveDiscussions,
 	getAllCompleted,
 	getAllStarted,
 	getAllStartedOrCompleted,
+	getContentRows,
+	getLessonContentRows,
+	getNewAndUpcoming,
 	getProgressPercentage,
 	getProgressPercentageByIds,
 	getProgressState,
 	getProgressStateByIds,
+	getRecent,
+	getRecommendedForYou,
 	getResumeTimeSeconds,
+	getScheduleContentRows,
 	getSortOrder,
+	getTabResults,
+	getUserActivityStats,
 	globalConfig,
 	initializeService,
 	isContentLiked,
@@ -264,6 +298,8 @@ export {
 	likeComment,
 	likeContent,
 	likePlaylist,
+	login,
+	logout,
 	openComment,
 	pinPlaylist,
 	playback,
@@ -283,11 +319,11 @@ export {
 	postRecordWatchSession,
 	rankCategories,
 	rankItems,
+	recommendations,
 	recordWatchSession,
 	replyToComment,
 	reportPlaylist,
 	reset,
-	setLastUpdatedTime,
 	setStudentViewForUser,
 	similarItems,
 	unassignModeratorToComment,
@@ -297,5 +333,4 @@ export {
 	updatePlaylist,
 	updatePlaylistItem,
 	verifyLocalDataContext,
-	wasLastUpdateOlderThanXSeconds,
 };

package/src/{services → lib}/lastUpdated.js

@@ -1,4 +1,4 @@
-import { globalConfig } from './config.js'
+import { globalConfig } from '../services/config'
 
 /**
  * Exported functions that are excluded from index generation.
@@ -6,6 +6,15 @@ import { globalConfig } from './config.js'
  * @type {string[]}
  */
 const excludeFromGeneratedIndex = ['wasLastUpdateOlderThanXSeconds', 'setLastUpdatedTime']
+
+/**
+ * Checks if the last update was older than X seconds.
+ *
+ * @param {number} seconds - The number of seconds to compare.
+ * @param {string} key - The key to check the last updated time.
+ *
+ * @returns {boolean} - True if the last update was older than X seconds, false otherwise.
+ */
 export function wasLastUpdateOlderThanXSeconds(seconds, key) {
   let lastUpdated = globalConfig.localStorage.getItem(key)
   if (!lastUpdated) return false
@@ -13,6 +22,13 @@ export function wasLastUpdateOlderThanXSeconds(seconds, key) {
   return new Date().getTime() - lastUpdated > verifyServerTime
 }
 
+/**
+ * Sets the last updated time.
+ *
+ * @param {string} key - The key to set the last updated time.
+ *
+ * @returns {void}
+ */
 export function setLastUpdatedTime(key) {
   globalConfig.localStorage.setItem(key, new Date().getTime()?.toString())
 }