musora-content-services 2.82.0 → 2.84.0

package/src/services/content/instructor.ts

@@ -3,7 +3,7 @@
  */
 import { FilterBuilder } from '../../filterBuilder.js'
 import { filtersToGroq, getFieldsForContentType } from '../../contentTypeConfig.js'
-import { buildEntityAndTotalQuery, fetchSanity, getSortOrder } from '../sanity.js'
+import { fetchSanity, getSanityDate, getSortOrder } from '../sanity.js'
 import { Lesson } from './content'
 
 export interface Instructor {
@@ -80,8 +80,7 @@ export interface FetchInstructorLessonsOptions {
 }
 
 export interface InstructorLessonsResponse {
-  entity: Lesson[]
-  total: number
+  data: Lesson[]
 }
 
 /**
@@ -96,9 +95,9 @@ 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<InstructorLessonsResponse|null>} - The lessons for the instructor or null if not found.
  * @example
- * fetchInstructorLessons('instructor123')
+ * fetchInstructorLessons('instructor123', 'drumeo', { page: 2, limit: 10 })
  *   .then(lessons => console.log(lessons))
  *   .catch(error => console.error(error));
  */
@@ -112,20 +111,26 @@ export async function fetchInstructorLessons(
     limit = 20,
     includedFields = [],
   }: FetchInstructorLessonsOptions = {}
-): Promise<InstructorLessonsResponse> {
+): Promise<InstructorLessonsResponse | null> {
   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 = buildEntityAndTotalQuery(filterWithRestrictions, fieldsString, {
-    sortOrder: sortOrder,
-    start: start,
-    end: end,
-  })
-  return fetchSanity(query, true)
+  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})
+  }`
+  return fetchSanity(query, true, { processNeedAccess: false, processPageType: false })
 }

package/src/services/contentAggregator.js

@@ -168,10 +168,20 @@ function extractItemsFromData(data, dataField, isParentArray, includeParent) {
   if (dataField) {
     if (isParentArray) {
       for (const parent of data) {
-        items = [...items, ...parent[dataField]]
+        const fieldValue = parent[dataField]
+        if (Array.isArray(fieldValue)) {
+          items = [...items, ...fieldValue]
+        } else if (fieldValue && typeof fieldValue === 'object') {
+          items = [...items, fieldValue]
+        }
       }
     } else {
-      items = data[dataField]
+      const fieldValue = data[dataField]
+      if (Array.isArray(fieldValue)) {
+        items = fieldValue
+      } else if (fieldValue && typeof fieldValue === 'object') {
+        items = [fieldValue]
+      }
     }
     if (includeParent) {
       if (isParentArray) {
@@ -194,14 +204,20 @@ async function processItems(data, addContext, dataField, isParentArray, includeP
   if (dataField) {
     if (isParentArray) {
       for (let parent of data) {
-        parent[dataField] = Array.isArray(parent[dataField])
-          ? await Promise.all(parent[dataField].map(addContext))
-          : await addContext(parent[dataField])
+        const fieldValue = parent[dataField]
+        if (Array.isArray(fieldValue)) {
+          parent[dataField] = await Promise.all(fieldValue.map(addContext))
+        } else if (fieldValue && typeof fieldValue === 'object') {
+          parent[dataField] = await addContext(fieldValue)
+        }
       }
     } else {
-      data[dataField] = Array.isArray(data[dataField])
-        ? await Promise.all(data[dataField].map(addContext))
-        : await addContext(data[dataField])
+      const fieldValue = data[dataField]
+      if (Array.isArray(fieldValue)) {
+        data[dataField] = await Promise.all(fieldValue.map(addContext))
+      } else if (fieldValue && typeof fieldValue === 'object') {
+        data[dataField] = await addContext(fieldValue)
+      }
     }
     if (includeParent) {
       data = isParentArray ? await Promise.all(data.map(addContext)) : await addContext(data)

package/src/services/forums/categories.ts

@@ -63,3 +63,22 @@ export async function updateForumCategory(
   const httpClient = new HttpClient(globalConfig.baseUrl)
   return httpClient.put<ForumCategory>(`${baseUrl}/v1/categories/${params.id}`, params)
 }
+
+export interface DeleteForumCategoryParams {
+  id: number
+  brand: string
+}
+
+/**
+ * Deletes a forum category.
+ *
+ * @param {DeleteForumCategoryParams} params - The parameters for deleting the forum category.
+ * @returns {Promise<void>} - A promise that resolves when the category is deleted.
+ * @throws {HttpError} - If the request fails.
+ */
+export async function deleteForumCategory(
+  params: DeleteForumCategoryParams
+): Promise<void> {
+  const httpClient = new HttpClient(globalConfig.baseUrl)
+  return httpClient.delete<void>(`${baseUrl}/v1/categories/${params.id}?brand=${params.brand}`)
+}

package/.claude/settings.local.json

@@ -1,14 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Read(//app/musora-platform-backend/**)",
-      "Read(//app/musora-platform-frontend/**)",
-      "Bash(find:*)",
-      "Bash(sed:*)",
-      "Read(//app/**)",
-      "Bash(cat:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

package/.yarnrc.yml

@@ -1 +0,0 @@
-nodeLinker: node-modules