musora-content-services 2.61.1 → 2.62.0

package/.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(rg:*)"
+    ],
+    "deny": []
+  }
+}

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.62.0](https://github.com/railroadmedia/musora-content-services/compare/v2.61.1...v2.62.0) (2025-10-30)
+
+
+### Features
+
+* **MU2E1-137:** number of active accounts ([#515](https://github.com/railroadmedia/musora-content-services/issues/515)) ([fd8b57e](https://github.com/railroadmedia/musora-content-services/commit/fd8b57ee401596471cdc4e940b1282c800483bf5))
+
+
+### Bug Fixes
+
+* sanity function refactors ([#520](https://github.com/railroadmedia/musora-content-services/issues/520)) ([2667c25](https://github.com/railroadmedia/musora-content-services/commit/2667c25dd876bec81c49a524823efac66f846fbf))
+* sort in fetch all ([#521](https://github.com/railroadmedia/musora-content-services/issues/521)) ([f353410](https://github.com/railroadmedia/musora-content-services/commit/f353410c210a1185337ae737e6f0c047bd95c751))
+
 ### [2.61.1](https://github.com/railroadmedia/musora-content-services/compare/v2.61.0...v2.61.1) (2025-10-29)
 
 

package/package.json

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

package/src/contentTypeConfig.js

@@ -583,13 +583,14 @@ export let contentTypeConfig = {
   "method-v2": [
     `"id":_id`,
     `"type":_type`,
+    "title",
     "brand",
     `"intro_video": intro_video->{ ${getIntroVideoFields().join(", ")} }`,
     `child[]->{
       "resource": ${resourcesField},
       total_skills,
-      "difficulty":difficulty,
-      "published_on":published_on,
+      difficulty,
+      published_on,
       "type":_type,
       brand,
       title,
@@ -601,16 +602,17 @@ export let contentTypeConfig = {
         hlsManifestUrl,
         video_playback_endpoints
       },
-      lp_lessons[]->{
+      child[]->{
         ${DEFAULT_FIELDS.join(',')}
       }
     }`,
   ],
-  "method-v2-intro-video": getIntroVideoFields(),
+  "method-intro": getIntroVideoFields(),
 }
 
 export function getIntroVideoFields() {
   return [
+    "title",
     "brand",
     `"description": ${descriptionField}`,
     `"thumbnail": thumbnail.asset->url`,
@@ -764,7 +766,7 @@ export function getChildFieldsForContentType(contentType, asQueryString = true)
   if (!contentType) {
     return asQueryString ? DEFAULT_CHILD_FIELDS.toString() + ',' : DEFAULT_CHILD_FIELDS
   }
-  
+
   if (contentTypeConfig[contentType]?.childFields || contentTypeConfig[contentType]?.includeChildFields) {
     const childFields = contentType
       ? DEFAULT_CHILD_FIELDS.concat(contentTypeConfig?.[contentType]?.childFields ?? [])

package/src/index.d.ts

@@ -213,7 +213,6 @@ import {
 	fetchCommentModContentData,
 	fetchContentRows,
 	fetchFoundation,
-	fetchFullMethodV2StructureFor,
 	fetchGenreLessons,
 	fetchHierarchy,
 	fetchLeaving,
@@ -226,6 +225,7 @@ import {
 	fetchMethodChildrenIds,
 	fetchMethodPreviousNextLesson,
 	fetchMethodV2IntroVideo,
+	fetchMethodV2Structure,
 	fetchNewReleases,
 	fetchNextPreviousLesson,
 	fetchOtherSongVersions,
@@ -255,6 +255,7 @@ import {
 import {
 	confirmEmailChange,
 	deleteAccount,
+	numberOfActiveUsers,
 	requestEmailChange,
 	resetPassword,
 	sendAccountSetupEmail,
@@ -437,7 +438,6 @@ declare module 'musora-content-services' {
 		fetchFollowedThreads,
 		fetchForumCategories,
 		fetchFoundation,
-		fetchFullMethodV2StructureFor,
 		fetchGenreLessons,
 		fetchHandler,
 		fetchHierarchy,
@@ -457,6 +457,7 @@ declare module 'musora-content-services' {
 		fetchMethodChildrenIds,
 		fetchMethodPreviousNextLesson,
 		fetchMethodV2IntroVideo,
+		fetchMethodV2Structure,
 		fetchNewReleases,
 		fetchNextContentDataForParent,
 		fetchNextPreviousLesson,
@@ -566,6 +567,7 @@ declare module 'musora-content-services' {
 		markContentAsNotInterested,
 		markNotificationAsRead,
 		markNotificationAsUnread,
+		numberOfActiveUsers,
 		openComment,
 		otherStats,
 		pauseLiveEventPolling,

package/src/index.js

@@ -213,7 +213,6 @@ import {
 	fetchCommentModContentData,
 	fetchContentRows,
 	fetchFoundation,
-	fetchFullMethodV2StructureFor,
 	fetchGenreLessons,
 	fetchHierarchy,
 	fetchLeaving,
@@ -226,6 +225,7 @@ import {
 	fetchMethodChildrenIds,
 	fetchMethodPreviousNextLesson,
 	fetchMethodV2IntroVideo,
+	fetchMethodV2Structure,
 	fetchNewReleases,
 	fetchNextPreviousLesson,
 	fetchOtherSongVersions,
@@ -255,6 +255,7 @@ import {
 import {
 	confirmEmailChange,
 	deleteAccount,
+	numberOfActiveUsers,
 	requestEmailChange,
 	resetPassword,
 	sendAccountSetupEmail,
@@ -436,7 +437,6 @@ export {
 	fetchFollowedThreads,
 	fetchForumCategories,
 	fetchFoundation,
-	fetchFullMethodV2StructureFor,
 	fetchGenreLessons,
 	fetchHandler,
 	fetchHierarchy,
@@ -456,6 +456,7 @@ export {
 	fetchMethodChildrenIds,
 	fetchMethodPreviousNextLesson,
 	fetchMethodV2IntroVideo,
+	fetchMethodV2Structure,
 	fetchNewReleases,
 	fetchNextContentDataForParent,
 	fetchNextPreviousLesson,
@@ -565,6 +566,7 @@ export {
 	markContentAsNotInterested,
 	markNotificationAsRead,
 	markNotificationAsUnread,
+	numberOfActiveUsers,
 	openComment,
 	otherStats,
 	pauseLiveEventPolling,

package/src/services/sanity.js

@@ -748,17 +748,17 @@ async function getProgressFilter(progress, progressIds) {
 }
 
 export function getSortOrder(sort = '-published_on', brand, groupBy) {
-  // Determine the sort order
+  const sanitizedSort = sort?.trim() || '-published_on'
+  const isDesc = sanitizedSort.startsWith('-')
+  const sortField = isDesc ? sanitizedSort.substring(1) : sanitizedSort
+
   let sortOrder = ''
-  let isDesc = sort.startsWith('-')
-  sort = isDesc ? sort.substring(1) : sort
-  switch (sort) {
+
+  switch (sortField) {
     case 'slug':
       sortOrder = groupBy ? 'name' : '!defined(title), lower(title)'
       break
-    case 'name':
-      sortOrder = sort
-      break
+
     case 'popularity':
       if (groupBy == 'artist' || groupBy == 'genre') {
         sortOrder = isDesc ? `coalesce(popularity.${brand}, -1)` : 'popularity'
@@ -766,15 +766,17 @@ export function getSortOrder(sort = '-published_on', brand, groupBy) {
         sortOrder = isDesc ? 'coalesce(popularity, -1)' : 'popularity'
       }
       break
+
     case 'recommended':
       sortOrder = 'published_on'
       isDesc = true
       break
-    case 'published_on':
+
     default:
-      sortOrder = 'published_on'
+      sortOrder = sortField
       break
   }
+
   sortOrder += isDesc ? ' desc' : ' asc'
   return sortOrder
 }
@@ -2280,20 +2282,23 @@ export async function fetchShows(brand, type, sort = 'sort') {
 
 
 export async function fetchMethodV2IntroVideo(brand) {
-  const _type = "method-intro";
-  const filter = `_type == '${_type}' && brand == '${brand}'`;
+  const type = "method-intro";
+  const filter = `_type == '${type}' && brand == '${brand}'`;
   const fields = getIntroVideoFields();
 
   const query = `*[${filter}] { ${fields.join(", ")} }`;
   return fetchSanity(query, false);
 }
 
-export async function fetchFullMethodV2StructureFor(brand) {
+export async function fetchMethodV2Structure(brand) {
   const _type = "method-v2";
-  const filter = `_type == '${_type}' && brand == '${brand}'`;
-
-  const fields = contentTypeConfig[_type];
-  const query = `*[${filter}] { ${fields.join(",")} }`;
+  const query = `*[_type == '${_type}' && brand == '${brand}'][0...1]{
+    'sanity_id': _id,
+    'children': child[]->{
+      'id': railcontent_id,
+      'children': child[]->railcontent_id
+    }
+  }`;
 
-  return await fetchSanity(query, true);
+  return await fetchSanity(query, false);
 }

package/src/services/user/account.ts

@@ -151,3 +151,15 @@ export async function deleteAccount(userId: number): Promise<void> {
   return httpClient.delete(apiUrl)
 }
 
+/**
+ * Calls a public API endpoint to get the number of active users.
+ *
+ * @returns {Promise<number>} - A promise that resolves to the number of active users.
+ * @throws {HttpError} - Throws HttpError if the request fails.
+ */
+export async function numberOfActiveUsers(): Promise<number> {
+  const apiUrl = `/api/user-management-system/v1/accounts/active-users/count`
+  const httpClient = new HttpClient(globalConfig.baseUrl)
+  const response = await httpClient.get<{ active_users: number }>(apiUrl)
+  return response.active_users
+}