musora-content-services 2.102.1 → 2.102.3

package/src/services/content/genre.ts

@@ -1,12 +1,12 @@
 /**
  * @module Genre
  */
-import { filtersToGroq, getFieldsForContentType } from '../../contentTypeConfig.js'
+import { getFieldsForContentType } from '../../contentTypeConfig.js'
 import { fetchSanity, getSortOrder } from '../sanity.js'
-import { FilterBuilder } from '../../filterBuilder.js'
 import { Lesson } from './content'
 import { BuildQueryOptions, query } from '../../lib/sanity/query'
 import { Brands } from '../../lib/brands'
+import { Filters as f } from '../../lib/sanity/filter'
 
 export interface Genre {
   name: string
@@ -35,27 +35,28 @@ export async function fetchGenres(
   brand: Brands | string,
   options: BuildQueryOptions = { sort: 'lower(name) asc' }
 ): Promise<Genres> {
-  const lessonFilter = await new FilterBuilder(`brand == "${brand}" && references(^._id)`, {
-    bypassPermissions: true,
-  }).buildFilter()
+  const lesson = f.combine(f.brand(brand), f.referencesParent())
+  const type = f.type('genre')
+  const lessonCount = `count(*[${lesson}])`
+  const postFilter = `lessonCount > 0`
 
   const data = query()
-    .and(`_type == "genre"`)
+    .and(type)
     .order(options?.sort || 'lower(name) asc')
-    .slice(options?.offset || 0, (options?.offset || 0) + (options?.limit || 20))
+    .slice(options?.offset || 0, options?.limit || 20)
     .select(
       'name',
       `"slug": slug.current`,
       `"thumbnail": thumbnail_url.asset->url`,
-      `"lessons_count": count(*[${lessonFilter}])`
+      `"lessons_count": ${lessonCount}`
     )
-    .postFilter(`lessons_count > 0`)
+    .postFilter(postFilter)
     .build()
 
   const total = query()
-    .and(`_type == "genre"`)
-    .select(`"lessons_count": count(*[${lessonFilter}])`)
-    .postFilter(`lessons_count > 0`)
+    .and(type)
+    .select(`"lessons_count": ${lessonCount}`)
+    .postFilter(postFilter)
     .build()
 
   const q = `{
@@ -82,14 +83,11 @@ export async function fetchGenreBySlug(
   slug: string,
   brand?: Brands | string
 ): Promise<Genre | null> {
-  const brandFilter = brand ? `brand == "${brand}" && ` : ''
-  const filter = await new FilterBuilder(`${brandFilter} references(^._id)`, {
-    bypassPermissions: true,
-  }).buildFilter()
+  const filter = f.combine(brand ? f.brand(brand) : f.empty, f.referencesParent())
 
   const q = query()
-    .and(`_type == "genre"`)
-    .and(`slug.current == "${slug}"`)
+    .and(f.type('genre'))
+    .and(f.slug(slug))
     .select(
       'name',
       `"slug": slug.current`,
@@ -144,24 +142,25 @@ export async function fetchGenreLessons(
     progressIds = [],
   }: GenreLessonsOptions = {}
 ): Promise<GenreLessons> {
-  const fieldsString = getFieldsForContentType(contentType) as string
-  const searchFilter = searchTerm ? `&& title match "${searchTerm}*"` : ''
-  const includedFieldsFilter = includedFields.length > 0 ? filtersToGroq(includedFields) : ''
-  const addType = contentType ? `_type == '${contentType}' && ` : ''
-  const progressFilter =
-    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 restrictions = await f.combineAsync(
+    f.contentFilter(),
+    f.referencesIDWithFilter(f.combine(f.type('genre'), f.slug(slug)))
+  )
+
   const data = query()
-    .and(filterWithRestrictions)
+    .and(f.brand(brand))
+    .and(f.searchMatch('title', searchTerm))
+    .and(f.includedFields(includedFields))
+    .and(f.progressIds(progressIds))
+    .and(restrictions)
     .order(sort)
-    .slice(offset, offset + limit)
-    .select(...(fieldsString ? [fieldsString] : []))
+    .slice(offset, limit)
+    .select(getFieldsForContentType(contentType) as string)
     .build()
 
-  const total = query().and(filterWithRestrictions).build()
+  const total = query().and(restrictions).build()
 
   const q = `{
     "data": ${data},

package/src/services/content/instructor.ts

@@ -1,12 +1,12 @@
 /**
  * @module Instructor
  */
-import { FilterBuilder } from '../../filterBuilder.js'
-import { filtersToGroq, getFieldsForContentType } from '../../contentTypeConfig.js'
+import { getFieldsForContentType } from '../../contentTypeConfig.js'
 import { fetchSanity, getSortOrder } from '../sanity.js'
 import { Lesson } from './content'
 import { BuildQueryOptions, query } from '../../lib/sanity/query'
 import { Brands } from '../../lib/brands'
+import { Filters as f } from '../../lib/sanity/filter'
 
 export interface Instructor {
   lessonCount: number
@@ -36,27 +36,28 @@ export async function fetchInstructors(
   brand: Brands | string,
   options: BuildQueryOptions
 ): Promise<Instructors> {
-  const lessonFilter = await new FilterBuilder(`brand == "${brand}" && references(^._id)`, {
-    bypassPermissions: true,
-  }).buildFilter()
+  const type = f.type('instructor')
+  const lesson = f.combine(f.brand(brand), f.referencesParent())
+  const lessonCount = `count(*[${lesson}])`
+  const postFilter = `lessonCount > 0`
 
   const data = query()
-    .and(`_type == "instructor"`)
+    .and(type)
     .order(options?.sort || 'lower(name) asc')
-    .slice(options?.offset || 0, (options?.offset || 0) + (options?.limit || 20))
+    .slice(options?.offset || 0, options?.limit || 20)
     .select(
       'name',
       `"slug": slug.current`,
       `"thumbnail": thumbnail_url.asset->url`,
-      `"lessonCount": count(*[${lessonFilter}])`
+      `"lessonCount": ${lessonCount}`
     )
-    .postFilter(`lessonCount > 0`)
+    .postFilter(postFilter)
     .build()
 
   const total = query()
-    .and(`_type == "instructor"`)
-    .select(`"lessonCount": count(*[${lessonFilter}])`)
-    .postFilter(`lessonCount > 0`)
+    .and(type)
+    .select(`"lessonCount": ${lessonCount}`)
+    .postFilter(postFilter)
     .build()
 
   const q = `{
@@ -83,14 +84,11 @@ export async function fetchInstructorBySlug(
   slug: string,
   brand?: Brands | string
 ): Promise<Instructor | null> {
-  const brandFilter = brand ? `brand == "${brand}" && ` : ''
-  const filter = await new FilterBuilder(`${brandFilter} references(^._id)`, {
-    bypassPermissions: true,
-  }).buildFilter()
+  const filter = f.combine(brand ? f.brand(brand) : f.empty, f.referencesParent())
 
   const q = query()
-    .and(`_type == "instructor"`)
-    .and(`slug.current == "${slug}"`)
+    .and(f.type('instructor'))
+    .and(f.slug(slug))
     .select(
       'name',
       `"slug": slug.current`,
@@ -143,22 +141,24 @@ export async function fetchInstructorLessons(
     includedFields = [],
   }: InstructorLessonsOptions = {}
 ): Promise<InstructorLessons> {
-  const fieldsString = getFieldsForContentType() as string
-  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()
-
   sort = getSortOrder(sort, brand)
 
+  const restrictions = await f.combineAsync(
+    f.contentFilter(),
+    f.referencesIDWithFilter(f.combine(f.type('instructor'), f.slug(slug)))
+  )
+
   const data = query()
-    .and(filterWithRestrictions)
+    .and(f.brand(brand))
+    .and(f.searchMatch('title', searchTerm))
+    .and(f.includedFields(includedFields))
+    .and(restrictions)
     .order(sort)
-    .slice(offset, offset + limit)
-    .select(...(fieldsString ? [fieldsString] : []))
+    .slice(offset, limit)
+    .select(getFieldsForContentType() as string)
     .build()
 
-  const total = query().and(filterWithRestrictions).build()
+  const total = query().and(restrictions).build()
 
   const q = `{
     "data": ${data},

package/test/lib/__snapshots__/filter.test.ts.snap

@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Filters - Async Methods (Integration) Integration & Edge Cases snapshot: admin complete filter 1`] = `"status in ['draft','scheduled','published','archived','unlisted'] && published_on <= "2024-01-15T14:01:00.000Z" && !defined(deprecated_railcontent_id)"`;
+
+exports[`Filters - Async Methods (Integration) Integration & Edge Cases snapshot: free user complete filter 1`] = `"status in ['scheduled','published'] && ((!defined(permission_v2) || count(permission_v2) == 0)) && published_on <= "2024-01-15T14:01:00.000Z" && !defined(deprecated_railcontent_id)"`;