musora-content-services 2.79.0 → 2.79.1

package/src/services/content-org/learning-paths.ts

@@ -101,21 +101,28 @@ export async function resetAllLearningPaths() {
  * @returns {Promise<Object>} Learning path with enriched lesson data
  */
 export async function getEnrichedLearningPath(learningPathId) {
-  //TODO BEH-1410: refactor/cleanup
-  let learningPath = await fetchByRailContentId(learningPathId, 'learning-path-v2')
-  learningPath.children = mapContentToParent(
-    learningPath.children,
+  // TODO: replace addNextLesson with addNaviageTo
+  const response = (await addContextToContent(
+    fetchByRailContentId,
+    learningPathId,
+    'learning-path-v2',
+    {
+      dataField: 'children',
+      dataField_includeParent: true,
+      addProgressStatus: true,
+      addProgressPercentage: true,
+      addProgressTimestamp: true,
+      addNextLesson: true,
+    }
+  )) as any
+  if (!response) return response
+  
+  response.children = mapContentToParent(
+    response.children,
     'learning-path-lesson-v2',
     learningPathId
   )
-
-  learningPath.children = await addContextToContent(() => learningPath.children, {
-    addProgressStatus: true,
-    addProgressPercentage: true,
-    addProgressTimestamp: true,
-  })
-  learningPath = await addContextToContent(() => learningPath, { addNextLesson: true })
-  return learningPath
+  return response
 }
 
 /**
@@ -234,7 +241,7 @@ interface completeMethodIntroVideo {
 }
 /**
  * Handles completion of method intro video and other related actions.
- * @param introVideoId - The intro video content ID.
+ * @param introVideoId - The method intro video content ID.
  * @param brand
  * @returns {Promise<Array>} response - The response object.
  * @returns {Promise<Object|null>} response.intro_video_response - The intro video completion response or null if already completed.
@@ -245,8 +252,11 @@ export async function completeMethodIntroVideo(introVideoId: number, brand: stri
 
   response.intro_video_response = await completeIfNotCompleted(introVideoId)
 
+  const methodStructure = await fetchMethodV2Structure(brand)
+  const learningPathId = methodStructure.learningPaths[0].id
+
   const url: string = `${LEARNING_PATHS_PATH}/start`
-  const body = { brand: brand }
+  const body = { learning_path_id: learningPathId, brand: brand }
   response.active_path_response = await fetchHandler(url, 'POST', null, body)
 
   return response
@@ -254,13 +264,18 @@ export async function completeMethodIntroVideo(introVideoId: number, brand: stri
 
 interface completeLearningPathIntroVideo {
   intro_video_response: Object | null,
-  learning_path_reset_response: void | Object[] | Object
+  learning_path_reset_response: void | null,
+  lesson_import_response: Object[] | null
 }
 /**
  * Handles completion of learning path intro video and other related actions.
- * @param introVideoId
- * @param learningPathId
- * @param lessonsToImport
+ * @param introVideoId - The learning path intro video content ID.
+ * @param learningPathId - The content_id of the learning path that this learning path intro video belongs to.
+ * @param lessonsToImport - content ids for all lessons with progress found during intro video progress check. empty if user chose not to keep learning path progress.
+ * @returns {Promise<Array>} response - The response object.
+ * @returns {Promise<Object|null>} response.intro_video_response - The intro video completion response or null if already completed.
+ * @returns {Promise<void>} response.learning_path_reset_response - The reset learning path response.
+ * @returns {Promise<Object[]>} response.lesson_import_response - The responses for completing each content_id within the learning path.
  */
 export async function completeLearningPathIntroVideo(introVideoId: number, learningPathId: number, lessonsToImport: number[] | null) {
   let response = {} as completeLearningPathIntroVideo
@@ -268,14 +283,13 @@ export async function completeLearningPathIntroVideo(introVideoId: number, learn
   response.intro_video_response = await completeIfNotCompleted(introVideoId)
 
   if (!lessonsToImport) {
-    // reset progress within the learning path
+    // returns nothing now, but it will when watermelon comes 'round
     response.learning_path_reset_response = await contentStatusReset(learningPathId)
   } else {
-    response.learning_path_reset_response = null
 
     // todo: add collection context + optimize with bulk calls with watermelon
     for (const contentId of lessonsToImport) {
-      response.learning_path_reset_response[contentId] = await contentStatusCompleted(contentId)
+      response.lesson_import_response[contentId] = await contentStatusCompleted(contentId)
     }
   }
 

package/src/services/user/account.ts

@@ -39,6 +39,7 @@ export interface AccountSetupProps {
   token?: string
   revenuecatAppUserId?: string
   deviceName?: string
+  from?: string
 }
 
 /**
@@ -56,23 +57,16 @@ export interface AccountSetupProps {
  */
 export async function setupAccount(props: AccountSetupProps): Promise<void> {
   const httpClient = new HttpClient(globalConfig.baseUrl)
-  if (!globalConfig.isMA && !props.token) {
+  if ((!globalConfig.isMA || props.from === 'mobile-ios-app') && !props.token) {
     throw new Error('Token is required for non-MA environments')
   }
 
-  // NOTE: remove deviceName temporarily. It will be required late
-  // if (globalConfig.isMA && (!props.deviceName || !props.revenuecatAppUserId)) {
-  if (globalConfig.isMA && !props.revenuecatAppUserId) {
-    throw new Error('Device name and RevenueCat App User ID are required for MA environments')
-  }
-
   return httpClient.post(`/api/user-management-system/v1/accounts`, {
     email: props.email,
     password: props.password,
     password_confirmation: props.passwordConfirmation,
     token: props.token,
-    revenuecat_origin_app_user_id: props.revenuecatAppUserId,
-    device_name: props.deviceName,
+    from: props.from,
   })
 }
 

package/.yarnrc.yml

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