musora-content-services 2.85.1 → 2.86.1

package/package.json

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

package/src/contentTypeConfig.js

@@ -22,9 +22,25 @@ export const SONG_TYPES_WITH_CHILDREN = [
 // 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 genreField = `genre[]->{
+  name,
+  'slug': slug.current,
+  'thumbnail': thumbnail_url.asset->url,
+}`
+
+export const instructorField = `instructor[]->{
+  name,
+  'slug': slug.current,
+  short_bio,
+  'thumbnail': thumbnail_url.asset->url,
+  "biography": short_bio[0].children[0].text,
+  "coach_card_image": coach_card_image.asset->url,
+  "coach_profile_image": thumbnail_url.asset->url
+}`
+
 export const artistField = `select(
-          defined(artist) => artist->{ 'name': name, 'thumbnail': thumbnail_url.asset->url},
-          defined(parent_content_data) => *[_type == ^.parent_content_data[0].type && railcontent_id == ^.parent_content_data[0].id][0].artist->{ 'name': name, 'thumbnail': thumbnail_url.asset->url}
+          defined(artist) => artist->{ 'name': name, 'slug': slug.current, 'thumbnail': thumbnail_url.asset->url},
+          defined(parent_content_data) => *[_type == ^.parent_content_data[0].type && railcontent_id == ^.parent_content_data[0].id][0].artist->{ 'name': name, 'slug': slug.current, 'thumbnail': thumbnail_url.asset->url}
         )`
 
 export const DEFAULT_FIELDS = [
@@ -41,7 +57,8 @@ export const DEFAULT_FIELDS = [
   "'type': _type",
   "'length_in_seconds' : coalesce(length_in_seconds, soundslice[0].soundslice_length_in_second)",
   'brand',
-  "'genre': genre[]->name",
+  `"instructor": ${instructorField}`,
+  `'genre': ${genreField}`,
   'status',
   "'slug' : slug.current",
   "'permission_id': permission[]->railcontent_id",
@@ -64,7 +81,7 @@ export const DEFAULT_CHILD_FIELDS = [
   "'type': _type",
   "'length_in_seconds' : coalesce(length_in_seconds, soundslice[0].soundslice_length_in_second)",
   'brand',
-  "'genre': genre[]->name",
+  `'genre': ${genreField}`,
   'status',
   "'slug' : slug.current",
   "'permission_id': permission[]->railcontent_id",
@@ -80,15 +97,6 @@ export const playAlongMp3sField = `{
 }
 `
 
-export const instructorField = `instructor[]->{
-            name,
-            slug,
-            short_bio,
-            "biography": short_bio[0].children[0].text,
-            "coach_card_image": coach_card_image.asset->url,
-            "coach_profile_image": thumbnail_url.asset->url
-          }`
-
 export const chapterField = `chapter[]{
                     chapter_description,
                     chapter_timecode,
@@ -180,7 +188,7 @@ export const coachLessonsTypes = [
 ]
 
 export const childContentTypeConfig = {
-  'song-tutorial': [`"genre": genre[]->name`, `difficulty_string`, `"type": _type`],
+  'song-tutorial': [`"genre": ${genreField}`, `difficulty_string`, `"type": _type`],
 }
 
 export const singleLessonTypes = ['quick-tips', 'rudiment']
@@ -496,7 +504,7 @@ export let contentTypeConfig = {
   },
   'play-along': {
     fields: [
-      '"style": genre[]->name',
+      `"style": ${genreField}`,
       'mp3_no_drums_no_click_url',
       'mp3_yes_drums_yes_click_url',
       'mp3_no_drums_yes_click_url',
@@ -819,7 +827,7 @@ export async function getFieldsForContentTypeWithFilteredChildren(
   if (childFields) {
     const childFilter = await new FilterBuilder('', {
       isChildrenFilter: true,
-      showMembershipRestrictedContent: true  // Show all children in lists
+      showMembershipRestrictedContent: true, // Show all children in lists
     }).buildFilter()
     parentFields.push(
       `"children": child[${childFilter}]->{

package/src/lib/brands.ts

@@ -0,0 +1,8 @@
+export enum Brand {
+  MUSORA = 'musora',
+  DRUMEO = 'drumeo',
+  PIANOTE = 'pianote',
+  GUITAREO = 'guitareo',
+  SINGEO = 'singeo',
+  PLAYBASS = 'playbass',
+}

package/src/lib/sanity/query.ts

@@ -0,0 +1,30 @@
+export interface BuildQueryOptions {
+  sort: string
+  start: number
+  end: number
+  isSingle?: boolean
+  withoutPagination?: boolean
+}
+
+export function buildDataAndTotalQuery(
+  filter: string = '',
+  fields: string = '...',
+  {
+    sort = 'published_on desc',
+    start = 0,
+    end = 10,
+    isSingle = false,
+    withoutPagination = false,
+  }: BuildQueryOptions
+): string {
+  const sortString = sort ? ` | order(${sort})` : ''
+  const countString = isSingle ? '[0...1]' : withoutPagination ? `` : `[${start}...${end}]`
+  const query = `{
+      "data": *[${filter}]  ${sortString}${countString}
+      {
+        ${fields}
+      },
+      "total": count(*[${filter}]),
+    }`
+  return query
+}

package/src/services/content/artist.ts

@@ -1,22 +1,24 @@
 /**
  * @module Artist
  */
-import { DEFAULT_FIELDS, filtersToGroq } from '../../contentTypeConfig.js'
+import { filtersToGroq, getFieldsForContentType } from '../../contentTypeConfig.js'
 import { FilterBuilder } from '../../filterBuilder.js'
-import { fetchSanity, getSanityDate, getSortOrder } from '../sanity.js'
+import { buildDataAndTotalQuery } from '../../lib/sanity/query'
+import { fetchSanity, getSortOrder } from '../sanity.js'
 import { Lesson } from './content'
+import { Brand } from '../../lib/brands'
 
 export interface Artist {
   slug: string
   name: string
-  lessons?: Lesson[]
-  lessonsCount: number
+  thumbnail: string
+  lessonCount: number
 }
 
 /**
  * Fetch all artists with lessons available for a specific brand.
  *
- * @param {string} brand - The brand for which to fetch artists.
+ * @param {Brand} brand - The brand for which to fetch artists.
  * @returns {Promise<Artist[]|null>} - A promise that resolves to an array of artist objects or null if not found.
  *
  * @example
@@ -24,7 +26,7 @@ export interface Artist {
  *   .then(artists => console.log(artists))
  *   .catch(error => console.error(error));
  */
-export async function fetchArtists(brand: string): Promise<Artist[] | null> {
+export async function fetchArtists(brand: Brand): Promise<Artist[] | null> {
   const filter = await new FilterBuilder(
     `_type == "song" && brand == "${brand}" && references(^._id)`,
     { bypassPermissions: true }
@@ -33,8 +35,9 @@ export async function fetchArtists(brand: string): Promise<Artist[] | null> {
   *[_type == "artist"]{
     name,
     "slug": slug.current,
-    "lessonsCount": count(*[${filter}])
-  }[lessonsCount > 0] |order(lower(name)) `
+    'thumbnail': thumbnail_url.asset->url,
+    "lessonCount": count(*[${filter}])
+  }[lessonCount > 0] |order(lower(name)) `
   return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
 }
 
@@ -42,7 +45,7 @@ export async function fetchArtists(brand: string): Promise<Artist[] | null> {
  * Fetch a single artist by their Sanity ID.
  *
  * @param {string} slug - The name of the artist to fetch.
- * @param {string} [brand] - The brand for which to fetch the artist.
+ * @param {Brand} [brand] - The brand for which to fetch the artist.
  * @returns {Promise<Artist|null>} - A promise that resolves to an artist objects or null if not found.
  *
  * @example
@@ -50,7 +53,7 @@ export async function fetchArtists(brand: string): Promise<Artist[] | null> {
  *   .then(artists => console.log(artists))
  *   .catch(error => console.error(error));
  */
-export async function fetchArtistBySlug(slug: string, brand?: string): Promise<Artist | null> {
+export async function fetchArtistBySlug(slug: string, brand?: Brand): Promise<Artist | null> {
   const brandFilter = brand ? `brand == "${brand}" && ` : ''
   const filter = await new FilterBuilder(`${brandFilter} _type == "song" && references(^._id)`, {
     bypassPermissions: true,
@@ -59,8 +62,8 @@ export async function fetchArtistBySlug(slug: string, brand?: string): Promise<A
   *[_type == "artist" && slug.current == '${slug}']{
     name,
     "slug": slug.current,
-    "lessonsCount": count(*[${filter}])
-  }[lessonsCount > 0] |order(lower(name)) `
+    "lessonCount": count(*[${filter}])
+  }[lessonCount > 0] |order(lower(name)) `
   return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
 }
 
@@ -74,13 +77,14 @@ export interface ArtistLessonOptions {
 }
 
 export interface LessonsByArtistResponse {
-  data: Artist[]
+  data: Lesson[]
+  total: number
 }
 
 /**
  * Fetch the artist's lessons.
  * @param {string} slug - The slug of the artist
- * @param {string} brand - The brand for which to fetch lessons.
+ * @param {Brand} brand - The brand for which to fetch lessons.
  * @param {string} contentType - The type of the lessons we need to get from the artist. If not defined, groq will get lessons from all content types
  * @param {Object} params - Parameters for sorting, searching, pagination and filtering.
  * @param {string} [params.sort="-published_on"] - The field to sort the lessons by.
@@ -88,8 +92,8 @@ export interface LessonsByArtistResponse {
  * @param {number} [params.page=1] - The page number for pagination.
  * @param {number} [params.limit=10] - The number of items per page.
  * @param {Array<string>} [params.includedFields=[]] - Additional filters to apply to the query in the format of a key,value array. eg. ['difficulty,Intermediate', 'genre,rock'].
- * @param {Array<number>} [params.progressIds] - The ids of the lessons that are in progress or completed
- * @returns {Promise<LessonsByArtistResponse|null>} - The lessons for the artist and some details about the artist (name and thumbnail).
+ * @param {Array<number>} [params.progressId=[]] - The ids of the lessons that are in progress or completed
+ * @returns {Promise<LessonsByArtistResponse|null>} - The lessons for the artist
  *
  * @example
  * fetchArtistLessons('10 Years', 'drumeo', 'song', {'-published_on', '', 1, 10, ["difficulty,Intermediate"], [232168, 232824, 303375, 232194, 393125]})
@@ -98,7 +102,7 @@ export interface LessonsByArtistResponse {
  */
 export async function fetchArtistLessons(
   slug: string,
-  brand: string,
+  brand: Brand,
   contentType: string,
   {
     sort = '-published_on',
@@ -106,34 +110,25 @@ export async function fetchArtistLessons(
     page = 1,
     limit = 10,
     includedFields = [],
-    progressIds = undefined,
+    progressIds = [],
   }: ArtistLessonOptions = {}
 ): Promise<LessonsByArtistResponse | null> {
-  const fieldsString = DEFAULT_FIELDS.join(',')
+  const fieldsString = getFieldsForContentType(contentType) as string
   const start = (page - 1) * limit
   const end = start + limit
   const searchFilter = searchTerm ? `&& title match "${searchTerm}*"` : ''
-  const sortOrder = getSortOrder(sort, brand)
-  const addType =
-    contentType && Array.isArray(contentType)
-      ? `_type in ['${contentType.join("', '")}'] &&`
-      : contentType
-        ? `_type == '${contentType}' && `
-        : ''
   const includedFieldsFilter = includedFields.length > 0 ? filtersToGroq(includedFields) : ''
-
-  // limits the results to supplied progressIds for started & completed filters
+  const addType = contentType ? `_type == '${contentType}' && ` : ''
   const progressFilter =
-    progressIds !== undefined ? `&& railcontent_id in [${progressIds.join(',')}]` : ''
-  const now = getSanityDate(new Date())
-  const query = `{
-    "data":
-      *[_type == 'artist' && slug.current == '${slug}']
-        {'type': _type, name, 'thumbnail':thumbnail_url.asset->url,
-        'lessons_count': count(*[${addType} brand == '${brand}' && references(^._id)]),
-        'lessons': *[${addType} brand == '${brand}' && references(^._id) && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
-      [${start}...${end}]}
-      |order(${sortOrder})
-  }`
+    progressIds.length > 0 ? `&& railcontent_id in [${progressIds.join(',')}]` : ''
+  const filter = `${addType} brand == '${brand}' ${searchFilter} ${includedFieldsFilter} && references(*[_type=='artist' && slug.current == '${slug}']._id) ${progressFilter}`
+  const filterWithRestrictions = await new FilterBuilder(filter).buildFilter()
+
+  sort = getSortOrder(sort, brand)
+  const query = buildDataAndTotalQuery(filterWithRestrictions, fieldsString, {
+    sort,
+    start: start,
+    end: end,
+  })
   return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
 }

package/src/services/content/content.ts

@@ -13,6 +13,12 @@ export interface ArtistObject {
   thumbnail: string | null
 }
 
+export interface Genre {
+  name: string
+  slug: string
+  thumbnail: string | null
+}
+
 export interface Lesson {
   artist: ArtistObject | string | null
   artist_name: string
@@ -20,7 +26,7 @@ export interface Lesson {
   child_count: number | null
   difficulty: number | null
   difficulty_string: string | null
-  genre: string[] | string | null
+  genre: Genre | string | null
   id: number
   image: string
   length_in_seconds: number

package/src/services/content/genre.ts

@@ -1,18 +1,18 @@
 /**
  * @module Genre
  */
-import { DEFAULT_FIELDS, filtersToGroq } from '../../contentTypeConfig.js'
-import { fetchSanity, getSanityDate, getSortOrder } from '../sanity.js'
+import { filtersToGroq, getFieldsForContentType } from '../../contentTypeConfig.js'
+import { fetchSanity, getSortOrder } from '../sanity.js'
 import { FilterBuilder } from '../../filterBuilder.js'
 import { Lesson } from './content'
+import { buildDataAndTotalQuery } from '../../lib/sanity/query'
+import { Brand } from '../../lib/brands'
 
 export interface Genre {
-  lessons?: Lesson[]
-  lessons_count: number
   name: string
   slug: string
+  lessons_count: number
   thumbnail: string
-  type: 'genre'
 }
 
 /**
@@ -26,7 +26,7 @@ export interface Genre {
  *   .then(genres => console.log(genres))
  *   .catch(error => console.error(error));
  */
-export async function fetchGenres(brand: string): Promise<Genre[]> {
+export async function fetchGenres(brand: Brand): Promise<Genre[]> {
   const filter = await new FilterBuilder(`brand == "${brand}" && references(^._id)`, {
     bypassPermissions: true,
   }).buildFilter()
@@ -46,7 +46,7 @@ export async function fetchGenres(brand: string): Promise<Genre[]> {
  * Fetch a single genre by their slug and brand
  *
  * @param {string} slug - The slug of the genre to fetch.
- * @param {string} [brand] - The brand for which to fetch the genre. Lesson count will be filtered by this brand if provided.
+ * @param {Brand} [brand] - The brand for which to fetch the genre. Lesson count will be filtered by this brand if provided.
  * @returns {Promise<Genre[]|null>} - A promise that resolves to an genre object or null if not found.
  *
  * @example
@@ -54,7 +54,7 @@ export async function fetchGenres(brand: string): Promise<Genre[]> {
  *   .then(genres => console.log(genres))
  *   .catch(error => console.error(error));
  */
-export async function fetchGenreBySlug(slug: string, brand?: string): Promise<Genre | null> {
+export async function fetchGenreBySlug(slug: string, brand?: Brand): Promise<Genre | null> {
   const brandFilter = brand ? `brand == "${brand}" && ` : ''
   const filter = await new FilterBuilder(`${brandFilter} references(^._id)`, {
     bypassPermissions: true,
@@ -81,13 +81,14 @@ export interface FetchGenreLessonsOptions {
 }
 
 export interface LessonsByGenreResponse {
-  data: Genre[]
+  data: Lesson[]
+  total: number
 }
 
 /**
  * Fetch the genre's lessons.
  * @param {string} slug - The slug of the genre
- * @param {string} brand - The brand for which to fetch lessons.
+ * @param {Brand} brand - The brand for which to fetch lessons.
  * @param {Object} params - Parameters for sorting, searching, pagination and filtering.
  * @param {string} [params.sort="-published_on"] - The field to sort the lessons by.
  * @param {string} [params.searchTerm=""] - The search term to filter the lessons.
@@ -95,7 +96,7 @@ export interface LessonsByGenreResponse {
  * @param {number} [params.limit=10] - The number of items per page.
  * @param {Array<string>} [params.includedFields=[]] - Additional filters to apply to the query in the format of a key,value array. eg. ['difficulty,Intermediate', 'genre,rock'].
  * @param {Array<number>} [params.progressIds=[]] - The ids of the lessons that are in progress or completed
- * @returns {Promise<LessonsByGenreResponse|null>} - The lessons for the artist and some details about the artist (name and thumbnail).
+ * @returns {Promise<LessonsByGenreResponse|null>} - The lessons for the genre
  *
  * @example
  * fetchGenreLessons('Blues', 'drumeo', 'song', {'-published_on', '', 1, 10, ["difficulty,Intermediate"], [232168, 232824, 303375, 232194, 393125]})
@@ -104,8 +105,8 @@ export interface LessonsByGenreResponse {
  */
 export async function fetchGenreLessons(
   slug: string,
-  brand: string,
-  contentType: string,
+  brand: Brand,
+  contentType?: string,
   {
     sort = '-published_on',
     searchTerm = '',
@@ -115,28 +116,22 @@ export async function fetchGenreLessons(
     progressIds = [],
   }: FetchGenreLessonsOptions = {}
 ): Promise<LessonsByGenreResponse | null> {
-  const fieldsString = DEFAULT_FIELDS.join(',')
+  const fieldsString = getFieldsForContentType(contentType) as string
   const start = (page - 1) * limit
   const end = start + limit
   const searchFilter = searchTerm ? `&& title match "${searchTerm}*"` : ''
-  const sortOrder = getSortOrder(sort, brand)
-  const addType = contentType ? `_type == '${contentType}' && ` : ''
   const includedFieldsFilter = includedFields.length > 0 ? filtersToGroq(includedFields) : ''
-  // limits the results to supplied progressIds for started & completed filters
+  const addType = contentType ? `_type == '${contentType}' && ` : ''
   const progressFilter =
-    progressIds !== undefined ? `&& railcontent_id in [${progressIds.join(',')}]` : ''
-  const now = getSanityDate(new Date())
-  const query = `{
-    "data":
-      *[_type == 'genre' && slug.current == '${slug}']
-        {
-          'type': _type,
-          name,
-          'thumbnail': thumbnail_url.asset->url,
-          'lessons_count': count(*[${addType} brand == '${brand}' && references(^._id)]),
-          'lessons': *[${addType} brand == '${brand}' && references(^._id) && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}} [${start}...${end}]
-        }
-      |order(${sortOrder})
-  }`
-  return fetchSanity(query, true)
+    progressIds.length > 0 ? `&& railcontent_id in [${progressIds.join(',')}]` : ''
+  const filter = `${addType} brand == '${brand}' ${searchFilter} ${includedFieldsFilter} && references(*[_type=='genre' && slug.current == '${slug}']._id) ${progressFilter}`
+  const filterWithRestrictions = await new FilterBuilder(filter).buildFilter()
+
+  sort = getSortOrder(sort, brand)
+  const query = buildDataAndTotalQuery(filterWithRestrictions, fieldsString, {
+    sort: sort,
+    start: start,
+    end: end,
+  })
+  return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
 }

package/src/services/content/instructor.ts

@@ -3,8 +3,10 @@
  */
 import { FilterBuilder } from '../../filterBuilder.js'
 import { filtersToGroq, getFieldsForContentType } from '../../contentTypeConfig.js'
-import { fetchSanity, getSanityDate, getSortOrder } from '../sanity.js'
+import { fetchSanity, getSortOrder } from '../sanity.js'
 import { Lesson } from './content'
+import { buildDataAndTotalQuery } from '../../lib/sanity/query'
+import { Brand } from '../../lib/brands'
 
 export interface Instructor {
   lessonCount: number
@@ -17,7 +19,7 @@ export interface Instructor {
 /**
  * Fetch all instructor with lessons available for a specific brand.
  *
- * @param {string} brand - The brand for which to fetch instructors.
+ * @param {Brand} brand - The brand for which to fetch instructors.
  * @returns {Promise<Instructor[]>} - A promise that resolves to an array of instructor objects.
  *
  * @example
@@ -25,7 +27,7 @@ export interface Instructor {
  *   .then(instructors => console.log(instructors))
  *   .catch(error => console.error(error));
  */
-export async function fetchInstructors(brand: string): Promise<Instructor[]> {
+export async function fetchInstructors(brand: Brand): Promise<Instructor[]> {
   const filter = await new FilterBuilder(`brand == "${brand}" && references(^._id)`, {
     bypassPermissions: true,
   }).buildFilter()
@@ -34,8 +36,9 @@ export async function fetchInstructors(brand: string): Promise<Instructor[]> {
   *[_type == "instructor"] {
     name,
     "slug": slug.current,
-    "lessonsCount": count(*[${filter}])
-  }[lessonsCount > 0] |order(lower(name)) `
+    'thumbnail': thumbnail_url.asset->url,
+    "lessonCount": count(*[${filter}])
+  }[lessonCount > 0] |order(lower(name)) `
   return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
 }
 
@@ -43,7 +46,7 @@ export async function fetchInstructors(brand: string): Promise<Instructor[]> {
  * Fetch a single instructor by their name
  *
  * @param {string} slug - The slug of the instructor to fetch.
- * @param {string} [brand] - The brand for which to fetch the instructor. Lesson count will be filtered by this brand if provided.
+ * @param {Brand} [brand] - The brand for which to fetch the instructor. Lesson count will be filtered by this brand if provided.
  * @returns {Promise<Instructor[]>} - A promise that resolves to an instructor object or null if not found.
  *
  * @example
@@ -53,7 +56,7 @@ export async function fetchInstructors(brand: string): Promise<Instructor[]> {
  */
 export async function fetchInstructorBySlug(
   slug: string,
-  brand?: string
+  brand?: Brand
 ): Promise<Instructor | null> {
   const brandFilter = brand ? `brand == "${brand}" && ` : ''
   const filter = await new FilterBuilder(`${brandFilter} references(^._id)`, {
@@ -66,7 +69,7 @@ export async function fetchInstructorBySlug(
     "slug": slug.current,
     short_bio,
     'thumbnail': thumbnail_url.asset->url,
-    "lessonsCount": count(*[${filter}])
+    "lessonCount": count(*[${filter}])
   }`
   return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
 }
@@ -81,6 +84,7 @@ export interface FetchInstructorLessonsOptions {
 
 export interface InstructorLessonsResponse {
   data: Lesson[]
+  total: number
 }
 
 /**
@@ -95,15 +99,15 @@ export interface InstructorLessonsResponse {
  * @param {number} [options.limit=10] - The number of items per page.
  * @param {Array<string>} [options.includedFields=[]] - Additional filters to apply to the query in the format of a key,value array. eg. ['difficulty,Intermediate', 'genre,rock'].
  *
- * @returns {Promise<InstructorLessonsResponse|null>} - The lessons for the instructor or null if not found.
+ * @returns {Promise<InstructorLessonsResponse>} - The lessons for the instructor or null if not found.
  * @example
- * fetchInstructorLessons('instructor123', 'drumeo', { page: 2, limit: 10 })
+ * fetchInstructorLessons('instructor123')
  *   .then(lessons => console.log(lessons))
  *   .catch(error => console.error(error));
  */
 export async function fetchInstructorLessons(
   slug: string,
-  brand: string,
+  brand: Brand,
   {
     sortOrder = '-published_on',
     searchTerm = '',
@@ -111,26 +115,20 @@ export async function fetchInstructorLessons(
     limit = 20,
     includedFields = [],
   }: FetchInstructorLessonsOptions = {}
-): Promise<InstructorLessonsResponse | null> {
+): Promise<InstructorLessonsResponse> {
   const fieldsString = getFieldsForContentType() as string
   const start = (page - 1) * limit
   const end = start + limit
   const searchFilter = searchTerm ? `&& title match "${searchTerm}*"` : ''
   const includedFieldsFilter = includedFields.length > 0 ? filtersToGroq(includedFields) : ''
+  const filter = `brand == '${brand}' ${searchFilter} ${includedFieldsFilter} && references(*[_type=='instructor' && slug.current == '${slug}']._id)`
+  const filterWithRestrictions = await new FilterBuilder(filter).buildFilter()
 
   sortOrder = getSortOrder(sortOrder, brand)
-  const now = getSanityDate(new Date())
-  const query = `{
-    "data":
-      *[_type == 'instructor' && slug.current == '${slug}']
-        {
-          'type': _type,
-          name,
-          'thumbnail': thumbnail_url.asset->url,
-          'lessons_count': count(*[brand == '${brand}' && references(^._id)]),
-          'lessons': *[brand == '${brand}' && references(^._id) && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter}]{${fieldsString}} [${start}...${end}]
-        }
-      |order(${sortOrder})
-  }`
+  const query = buildDataAndTotalQuery(filterWithRestrictions, fieldsString, {
+    sort: sortOrder,
+    start: start,
+    end: end,
+  })
   return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
 }