musora-content-services 2.71.0 → 2.72.1

package/src/services/forums/forums.ts

@@ -1,6 +1,6 @@
-import {HttpClient} from "../../infrastructure/http/HttpClient";
-import {PaginatedResponse} from "../api/types";
-import {ForumThread} from "./types";
+import { HttpClient } from '../../infrastructure/http/HttpClient'
+import { PaginatedResponse } from '../api/types'
+import { ForumThread } from './types'
 import { globalConfig } from '../config.js'
 
 const baseUrl = `/api/forums`
@@ -13,39 +13,41 @@ const baseUrl = `/api/forums`
 
 export async function getActiveDiscussions(brand: string, { page = 1, limit = 10 } = {}) {
   const httpClient = new HttpClient(globalConfig.baseUrl)
-  const latestDiscussions = await httpClient.get<PaginatedResponse<ForumThread>>(`${baseUrl}/v1/threads/latest?brand=${brand}&page=${page}&limit=${limit}`)
+  const latestDiscussions = await httpClient.get<PaginatedResponse<ForumThread>>(
+    `${baseUrl}/v1/threads/latest?brand=${brand}&page=${page}&limit=${limit}`
+  )
 
   // Transform the response
-  return transformLatestDiscussions(latestDiscussions);
+  return transformLatestDiscussions(latestDiscussions)
 }
 
 interface TransformedDiscussion {
-  id: number;
-  url: string;
-  title: string;
-  post: string;
+  id: number
+  url: string
+  title: string
+  post: string
   author: {
-    id: number;
-    name: string;
-    avatar: string;
-  };
+    id: number
+    name: string
+    avatar: string
+  }
 }
 
 interface TransformedResponse {
-  data: TransformedDiscussion[];
-  meta: PaginatedResponse<ForumThread>['meta'];
+  data: TransformedDiscussion[]
+  meta: PaginatedResponse<ForumThread>['meta']
 }
 
 // Helper function to strip HTML tags and decode entities
 function stripHtml(html: string): string {
   // Remove blockquotes and their content first
-  let filtered = html.replace(/<blockquote[^>]*>.*?<\/blockquote>/gis, '');
+  let filtered = html.replace(/<blockquote[^>]*>[\s\S]*?<\/blockquote>/gi, '')
 
   // Remove iframes and their content
-  filtered = filtered.replace(/<iframe[^>]*>.*?<\/iframe>/gis, '');
+  filtered = filtered.replace(/<iframe[^>]*>[\s\S]*?<\/iframe>/gi, '')
 
   // Remove remaining HTML tags
-  const withoutTags = filtered.replace(/<[^>]*>/g, '');
+  const withoutTags = filtered.replace(/<[^>]*>/g, '')
 
   // Decode common HTML entities
   const decoded = withoutTags
@@ -54,35 +56,33 @@ function stripHtml(html: string): string {
     .replace(/&gt;/g, '>')
     .replace(/&quot;/g, '"')
     .replace(/&#39;/g, "'")
-    .replace(/&nbsp;/g, ' ');
+    .replace(/&nbsp;/g, ' ')
 
-  return decoded.trim();
+  return decoded.trim()
 }
 
-function transformLatestDiscussions(
-  response: PaginatedResponse<ForumThread>
-): TransformedResponse {
+function transformLatestDiscussions(response: PaginatedResponse<ForumThread>): TransformedResponse {
   const transformedData = response.data
     .filter((thread) => thread.last_post && thread.author) // Filter out null posts/authors
     .map((thread) => {
-        const postContent = stripHtml(thread.last_post!.content)
-        const postId = thread.last_post!.id
+      const postContent = stripHtml(thread.last_post!.content)
+      const postId = thread.last_post!.id
 
-        return {
-          id: thread.id,
-          url: `forums/post/${postId}`,
-          title: thread.title,
-          post: postContent,
-          author: {
-            id: thread.author!.id,
-            name: thread.author!.display_name,
-            avatar: thread.author!.profile_picture_url || '',
-          },
-        };
-  });
+      return {
+        id: thread.id,
+        url: `forums/post/${postId}`,
+        title: thread.title,
+        post: postContent,
+        author: {
+          id: thread.author!.id,
+          name: thread.author!.display_name,
+          avatar: thread.author!.profile_picture_url || '',
+        },
+      }
+    })
 
   return {
     data: transformedData,
     meta: response.meta,
-  };
+  }
 }

package/src/services/forums/posts.ts

@@ -3,7 +3,7 @@
  */
 import { HttpClient } from '../../infrastructure/http/HttpClient'
 import { globalConfig } from '../config.js'
-import {ForumPost} from './types'
+import { ForumPost } from './types'
 import { PaginatedResponse } from '../api/types'
 
 const baseUrl = `/api/forums`
@@ -21,10 +21,7 @@ export interface CreatePostParams {
  * @returns {Promise<ForumPost>} - A promise that resolves to the created post.
  * @throws {HttpError} - If the request fails.
  */
-export async function createPost(
-  threadId: number,
-  params: CreatePostParams
-): Promise<ForumPost> {
+export async function createPost(threadId: number, params: CreatePostParams): Promise<ForumPost> {
   const httpClient = new HttpClient(globalConfig.baseUrl)
   return httpClient.post<ForumPost>(`${baseUrl}/v1/threads/${threadId}/posts`, params)
 }
@@ -37,18 +34,14 @@ export async function createPost(
  * @returns {Promise<ForumPost>} - A promise that resolves to the updated post.
  * @throws {HttpError} - If the request fails.
  */
-export async function updatePost(
-  postId: number,
-  params: CreatePostParams
-): Promise<ForumPost> {
+export async function updatePost(postId: number, params: CreatePostParams): Promise<ForumPost> {
   const httpClient = new HttpClient(globalConfig.baseUrl)
   return httpClient.put<ForumPost>(`${baseUrl}/v1/posts/${postId}`, params)
 }
 
-
 export interface FetchPostParams {
-  page?: number,
-  limit?: number,
+  page?: number
+  limit?: number
   /** Sort order: "-published_on" (default), "published_on", or "mine". */
   sort?: '-published_on' | string
 }
@@ -67,9 +60,14 @@ export async function fetchPosts(
   params: FetchPostParams = {}
 ): Promise<PaginatedResponse<ForumPost>> {
   const httpClient = new HttpClient(globalConfig.baseUrl)
-  const queryObj: Record<string, string> = { brand, ...Object.fromEntries(
-      Object.entries(params).filter(([_, v]) => v !== undefined && v !== null).map(([k, v]) => [k, String(v)])
-    )}
+  const queryObj: Record<string, string> = {
+    brand,
+    ...Object.fromEntries(
+      Object.entries(params)
+        .filter(([_, v]) => v !== undefined && v !== null)
+        .map(([k, v]) => [k, String(v)])
+    ),
+  }
   const query = new URLSearchParams(queryObj).toString()
 
   const url = `${baseUrl}/v1/threads/${threadId}/posts?${query}`
@@ -126,7 +124,7 @@ export async function deletePost(postId: number, brand: string): Promise<void> {
 export async function fetchCommunityGuidelines(brand: string): Promise<ForumPost[]> {
   const httpClient = new HttpClient(globalConfig.baseUrl)
   const url = `${baseUrl}/v1/rules?brand=${brand}`
-  return httpClient.get<ForumPost[]>(url);
+  return httpClient.get<ForumPost[]>(url)
 }
 
 export interface SearchParams {
@@ -134,8 +132,8 @@ export interface SearchParams {
   limit?: number,
   category_id?: number,
   /** Sort order: "-published_on" (default), "published_on", or "mine". */
-  sort?: '-published_on' | string,
-  term: string
+  sort?: '-published_on' | string
+  term?: string
 }
 
 /**
@@ -151,9 +149,14 @@ export async function search(
   params: SearchParams
 ): Promise<PaginatedResponse<ForumPost>> {
   const httpClient = new HttpClient(globalConfig.baseUrl)
-  const queryObj: Record<string, string> = { brand, ...Object.fromEntries(
-      Object.entries(params).filter(([_, v]) => v !== undefined && v !== null).map(([k, v]) => [k, String(v)])
-    )}
+  const queryObj: Record<string, string> = {
+    brand,
+    ...Object.fromEntries(
+      Object.entries(params)
+        .filter(([_, v]) => v !== undefined && v !== null)
+        .map(([k, v]) => [k, String(v)])
+    ),
+  }
   const query = new URLSearchParams(queryObj).toString()
 
   const url = `${baseUrl}/v1/search?${query}`
@@ -175,12 +178,16 @@ export async function jumpToPost(
   params: FetchPostParams = {}
 ): Promise<PaginatedResponse<ForumPost>> {
   const httpClient = new HttpClient(globalConfig.baseUrl)
-  const queryObj: Record<string, string> = { brand, ...Object.fromEntries(
-      Object.entries(params).filter(([_, v]) => v !== undefined && v !== null).map(([k, v]) => [k, String(v)])
-    )}
+  const queryObj: Record<string, string> = {
+    brand,
+    ...Object.fromEntries(
+      Object.entries(params)
+        .filter(([_, v]) => v !== undefined && v !== null)
+        .map(([k, v]) => [k, String(v)])
+    ),
+  }
   const query = new URLSearchParams(queryObj).toString()
 
   const url = `${baseUrl}/v1/posts/${postId}/jump?${query}`
   return httpClient.get<PaginatedResponse<ForumPost>>(url)
 }
-

package/test/initializeTests.js

@@ -1,18 +1,32 @@
 import { globalConfig, initializeService } from '../src'
 import { LocalStorageMock } from './localStorageMock'
-
 const railContentModule = require('../src/services/railcontent.js')
 let token = null
 let userId = process.env.RAILCONTENT_USER_ID ?? null
 
 export async function initializeTestService(useLive = false, isAdmin = false) {
+  let token, userId
   if (useLive && !token && process.env.RAILCONTENT_BASE_URL) {
-    let data = await fetchLoginToken(
-      process.env.RAILCONTENT_EMAIL,
-      process.env.RAILCONTENT_PASSWORD
-    )
+    const baseUrl = `${process.env.RAILCONTENT_BASE_URL}/api/user-management-system`
+    const response = await fetch(`${baseUrl}/v1/sessions`, {
+      method: 'POST',
+      headers: {
+        'X-Client-Platform': 'mobile',
+        'Content-Type': 'application/json',
+        Authorization: null,
+      },
+      body: JSON.stringify({
+        email: process.env.RAILCONTENT_EMAIL,
+        password: process.env.RAILCONTENT_PASSWORD,
+        device_name: 'test',
+        device_token: '',
+        platform: '',
+      }),
+    })
+
+    let data = await response.json() // Parse the JSON body
     token = data['token']
-    userId = data['userId']
+    userId = data['user']['id']
   }
 
   const config = {
@@ -25,42 +39,13 @@ export async function initializeTestService(useLive = false, isAdmin = false) {
       debug: process.env.DEBUG === 'true' || false,
       useDummyRailContentMethods: true,
     },
-    sessionConfig: {
-      token: token,
-      userId: userId,
-      authToken: token,
-    },
+    sessionConfig: { token: token, userId: userId, authToken: token },
     baseUrl: process.env.RAILCONTENT_BASE_URL,
     localStorage: new LocalStorageMock(),
     isMA: true,
   }
   initializeService(config)
-
   let mock = jest.spyOn(railContentModule, 'fetchUserPermissionsData')
   let testData = { permissions: [78, 91, 92], isAdmin: isAdmin }
   mock.mockImplementation(() => testData)
 }
-
-async function fetchLoginToken(email, password) {
-  try {
-    const url = `${process.env.RAILCONTENT_BASE_URL}/user-management-system/login/token`
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ email: email, password: password, device_name: 'test' }),
-    })
-    if (response.ok) {
-      let data = await response.json()
-      return { token: data.token, userId: data.user.id }
-    } else {
-      console.log('fetch error:', response.status)
-      console.log(response)
-    }
-  } catch (error) {
-    console.error('Fetch error:', error)
-  }
-  return null
-}

package/test/learningPaths.test.js

@@ -0,0 +1,19 @@
+import { initializeTestService } from './initializeTests.js'
+import { fetchLearningPathLessons } from '../src/services/content-org/learning-paths.ts'
+import { fetchByRailContentId } from '../src/services/sanity.js'
+import { contentStatusCompleted } from '../src/services/contentProgress.js'
+describe('learning-paths', function () {
+  beforeEach(async () => {
+    await initializeTestService(true)
+  })
+
+  test('getLearningPathsV2Test', async () => {
+    const results = await fetchByRailContentId(417140, 'learning-path-v2')
+  })
+  test('getlearningPathLessonsTestNew', async () => {
+    await contentStatusCompleted(417105)
+    const userDate = new Date('2025-10-31')
+    const results = await fetchLearningPathLessons(422533, 'drumeo', userDate)
+    console.log(results)
+  })
+})