musora-content-services 2.95.2 → 2.95.4

package/src/services/content/instructor.ts

@@ -5,7 +5,7 @@ import { FilterBuilder } from '../../filterBuilder.js'
 import { filtersToGroq, getFieldsForContentType } from '../../contentTypeConfig.js'
 import { fetchSanity, getSortOrder } from '../sanity.js'
 import { Lesson } from './content'
-import { buildDataAndTotalQuery } from '../../lib/sanity/query'
+import { BuildQueryOptions, query } from '../../lib/sanity/query'
 import { Brands } from '../../lib/brands'
 
 export interface Instructor {
@@ -16,30 +16,55 @@ export interface Instructor {
   thumbnail: string
 }
 
+export interface Instructors {
+  data: Instructor[]
+  total: number
+}
+
 /**
  * Fetch all instructor with lessons available for a specific brand.
  *
  * @param {Brands|string} brand - The brand for which to fetch instructors.
- * @returns {Promise<Instructor[]>} - A promise that resolves to an array of instructor objects.
+ * @returns {Promise<Instructors>} - A promise that resolves to an array of instructor objects.
  *
  * @example
  * fetchInstructors('drumeo')
  *   .then(instructors => console.log(instructors))
  *   .catch(error => console.error(error));
  */
-export async function fetchInstructors(brand: Brands | string): Promise<Instructor[]> {
-  const filter = await new FilterBuilder(`brand == "${brand}" && references(^._id)`, {
+export async function fetchInstructors(
+  brand: Brands | string,
+  options: BuildQueryOptions
+): Promise<Instructor[]> {
+  const lessonFilter = await new FilterBuilder(`brand == "${brand}" && references(^._id)`, {
     bypassPermissions: true,
   }).buildFilter()
 
-  const query = `
-  *[_type == "instructor"] {
-    name,
-    "slug": slug.current,
-    'thumbnail': thumbnail_url.asset->url,
-    "lessonCount": count(*[${filter}])
-  }[lessonCount > 0] |order(lower(name)) `
-  return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
+  const data = query()
+    .and(`_type == "instructor"`)
+    .order(options.sort || 'lower(name) asc')
+    .slice(options.offset || 0, (options.offset || 0) + (options.limit || 20))
+    .select(
+      'name',
+      `"slug": slug.current`,
+      `"thumbnail": thumbnail_url.asset->url`,
+      `"lessonCount": count(*[${lessonFilter}])`
+    )
+    .postFilter(`lessonCount > 0`)
+    .build()
+
+  const total = query()
+    .and(`_type == "instructor"`)
+    .select(`"lessonCount": count(*[${lessonFilter}])`)
+    .postFilter(`lessonCount > 0`)
+    .build()
+
+  const q = `{
+    "data": ${data},
+    "total": count(${total})
+  }`
+
+  return fetchSanity(q, true, { processNeedAccess: false, processPageType: false })
 }
 
 /**
@@ -47,7 +72,7 @@ export async function fetchInstructors(brand: Brands | string): Promise<Instruct
  *
  * @param {string} slug - The slug of the instructor to fetch.
  * @param {Brands|string} [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.
+ * @returns {Promise<Instructor | null>} - A promise that resolves to an instructor object or null if not found.
  *
  * @example
  * fetchInstructorBySlug('66samus', 'drumeo')
@@ -63,26 +88,28 @@ export async function fetchInstructorBySlug(
     bypassPermissions: true,
   }).buildFilter()
 
-  const query = `
-  *[_type == "instructor" && slug.current == '${slug}'][0] {
-    name,
-    "slug": slug.current,
-    short_bio,
-    'thumbnail': thumbnail_url.asset->url,
-    "lessonCount": count(*[${filter}])
-  }`
-  return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
+  const q = query()
+    .and(`_type == "instructor"`)
+    .and(`slug.current == "${slug}"`)
+    .select(
+      'name',
+      `"slug": slug.current`,
+      'short_bio',
+      `"thumbnail": thumbnail_url.asset->url`,
+      `"lessonCount": count(*[${filter}])`
+    )
+    .first()
+    .build()
+
+  return fetchSanity(q, true, { processNeedAccess: false, processPageType: false })
 }
 
-export interface FetchInstructorLessonsOptions {
-  sortOrder?: string
+export interface InstructorLessonsOptions extends BuildQueryOptions {
   searchTerm?: string
-  page?: number
-  limit?: number
   includedFields?: Array<string>
 }
 
-export interface InstructorLessonsResponse {
+export interface InstructorLessons {
   data: Lesson[]
   total: number
 }
@@ -99,7 +126,7 @@ 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>} - The lessons for the instructor or null if not found.
+ * @returns {Promise<InstructorLessons>} - The lessons for the instructor or null if not found.
  * @example
  * fetchInstructorLessons('instructor123')
  *   .then(lessons => console.log(lessons))
@@ -109,26 +136,34 @@ export async function fetchInstructorLessons(
   slug: string,
   brand: Brands | string,
   {
-    sortOrder = '-published_on',
+    sort = '-published_on',
     searchTerm = '',
-    page = 1,
+    offset = 1,
     limit = 20,
     includedFields = [],
-  }: FetchInstructorLessonsOptions = {}
-): Promise<InstructorLessonsResponse> {
+  }: InstructorLessonsOptions = {}
+): Promise<InstructorLessons> {
   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 query = buildDataAndTotalQuery(filterWithRestrictions, fieldsString, {
-    sort: sortOrder,
-    start: start,
-    end: end,
-  })
-  return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
+  sort = getSortOrder(sort, brand)
+
+  const data = query()
+    .and(filterWithRestrictions)
+    .order(sort)
+    .slice(offset, offset + limit)
+    .select(...(fieldsString ? [fieldsString] : []))
+    .build()
+
+  const total = query().and(filterWithRestrictions).build()
+
+  const q = `{
+    "data": ${data},
+    "total": count(${total})
+  }`
+
+  return fetchSanity(q, true, { processNeedAccess: false, processPageType: false })
 }

package/src/services/user/onboarding.ts

@@ -134,8 +134,8 @@ export interface OnboardingRecommendedContent {
 
 const recommendedContentCache: { [brand: string]: OnboardingRecommendedContent } = {
   drumeo: {
-    id: 391995,
-    title: 'Getting Started On The Drums',
+    id: 415737,
+    title: 'The Power Of Your Left Hand (Beginner)',
     difficulty: 'Beginner',
     lesson_count: 12,
     skill_count: 1,
@@ -146,7 +146,7 @@ const recommendedContentCache: { [brand: string]: OnboardingRecommendedContent }
     video: {
       external_id: '1002267396',
       hlsManifestUrl:
-        'https://player.vimeo.com/external/1002267396.m3u8?s=abcdef1234567890abcdef1234567890abcdef12&oauth2_token_id=1284792284',
+        'https://player.vimeo.com/external/250467786.m3u8?s=52dc97fc96fe903d80bf71bc1b1709cc444db407&oauth2_token_id=1284792283',
       type: 'vimeo-video',
     },
   },
@@ -168,8 +168,8 @@ const recommendedContentCache: { [brand: string]: OnboardingRecommendedContent }
     },
   },
   guitareo: {
-    id: 294635,
-    title: 'Getting Started On The Acoustic Guitar',
+    id: 191346,
+    title: 'Understanding Your Instrument',
     difficulty: 'Beginner',
     lesson_count: 6,
     skill_count: 5,
@@ -180,13 +180,13 @@ const recommendedContentCache: { [brand: string]: OnboardingRecommendedContent }
     video: {
       external_id: '1003267397',
       hlsManifestUrl:
-        'https://player.vimeo.com/external/1003267397.m3u8?s=1234567890abcdef1234567890abcdef12345678&oauth2_token_id=1284792285',
+        'https://player.vimeo.com/external/166972298.m3u8?s=a93bfe96a4ce9ac5a4eba3441838847ef2eafc9b&oauth2_token_id=1284792283',
       type: 'vimeo-video',
     },
   },
   singeo: {
-    id: 712408,
-    title: 'Singing Starter Kit',
+    id: 415737,
+    title: 'Sound Like A Star — Mastering Iconic Pop Voices',
     difficulty: 'Beginner',
     lesson_count: 5,
     skill_count: 4,
@@ -197,13 +197,13 @@ const recommendedContentCache: { [brand: string]: OnboardingRecommendedContent }
     video: {
       external_id: '1004267398',
       hlsManifestUrl:
-        'https://player.vimeo.com/external/1004267398.m3u8?s=fedcba0987654321fedcba0987654321fedcba09&oauth2_token_id=1284792286',
+        'https://player.vimeo.com/external/1040159819.m3u8?s=f238ad1a650fb30a49c36d61996c982f06ffffb1&oauth2_token_id=1284792283',
       type: 'vimeo-video',
     },
   },
   playbass: {
-    id: 294635,
-    title: 'Getting Started On The Acoustic Guitar',
+    id: 191346,
+    title: 'Understanding Your Instrument',
     difficulty: 'Beginner',
     lesson_count: 6,
     skill_count: 5,
@@ -214,7 +214,7 @@ const recommendedContentCache: { [brand: string]: OnboardingRecommendedContent }
     video: {
       external_id: '1003267397',
       hlsManifestUrl:
-        'https://player.vimeo.com/external/1003267397.m3u8?s=1234567890abcdef1234567890abcdef12345678&oauth2_token_id=1284792285',
+        'https://player.vimeo.com/external/166972298.m3u8?s=a93bfe96a4ce9ac5a4eba3441838847ef2eafc9b&oauth2_token_id=1284792283',
       type: 'vimeo-video',
     },
   },