musora-content-services 2.123.2 → 2.124.0

package/.claude/settings.local.json

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

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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.124.0](https://github.com/railroadmedia/musora-content-services/compare/v2.123.2...v2.124.0) (2026-01-29)
+
+
+### Features
+
+* **BEH-1505:** new award templates ([#740](https://github.com/railroadmedia/musora-content-services/issues/740)) ([e11f5f0](https://github.com/railroadmedia/musora-content-services/commit/e11f5f0db218132409b1d228a4c0a20500f73922))
+
+
+### Bug Fixes
+
+* **T3PS-1715:** lp lesson practices and activity mapping ([#732](https://github.com/railroadmedia/musora-content-services/issues/732)) ([922e455](https://github.com/railroadmedia/musora-content-services/commit/922e4558b720b17533b3923fd08939ef69afa4f2))
+
 ### [2.123.2](https://github.com/railroadmedia/musora-content-services/compare/v2.123.1...v2.123.2) (2026-01-28)
 
 

package/package.json

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

package/src/contentTypeConfig.js

@@ -20,6 +20,8 @@ export const SONG_TYPES_WITH_CHILDREN = [
 // Single hierarchy refers to only one element in the hierarchy has video lessons, not that they have a single parent
 export const SINGLE_PARENT_TYPES = ['course-lesson', 'pack-bundle-lesson', 'song-tutorial-lesson']
 
+export const LEARNING_PATH_LESSON = 'learning-path-lesson-v2'
+
 export const genreField = `genre[]->{
   name,
   'slug': slug.current,
@@ -387,6 +389,7 @@ export let contentTypeConfig = {
     fields: [
       '"parent_content_data": parent_content_data[].id',
       '"badge" : *[references(^._id) && _type == "content-award"][0].badge.asset->url',
+      '"badge_logo" : *[references(^._id) && _type == "content-award"][0].logo.asset->url',
     ],
     includeChildFields: true,
   },
@@ -986,3 +989,37 @@ export const getFormattedType = (type, brand) => {
 
   return null
 }
+
+export const awardTemplate = {
+  drumeo: "https://d3fzm1tzeyr5n3.cloudfront.net/v2/awards/drumeo.svg",
+  guitareo: "https://d3fzm1tzeyr5n3.cloudfront.net/v2/awards/guitareo.svg",
+  pianote: "https://d3fzm1tzeyr5n3.cloudfront.net/v2/awards/pianote.svg",
+  singeo: "https://d3fzm1tzeyr5n3.cloudfront.net/v2/awards/singeo.svg",
+  playbass: "https://d3fzm1tzeyr5n3.cloudfront.net/v2/awards/playbass.svg",
+}
+
+/**
+ * Adds award badge_template to content(s) where badge_logo exists
+ * @param {object|object[]} content - sanity content(s) response
+ * @param {string} brand - brand for if content brand is missing
+ * @returns {object|object[]} post-processed content
+ */
+export function addAwardTemplateToContent(content, brand= null) {
+  if (!content) return content
+
+  // should be fine with this; children don't need awards.
+  // assumes if badge_logo exists, it needs a badge_template.
+  if (Array.isArray(content)) {
+    content.forEach((item) => {
+      if (item['badge_logo'] && !item['badge_template']) {
+        item['badge_template'] = awardTemplate[item['brand'] || brand]
+      }
+    })
+  } else {
+    if (content['badge_logo'] && !content['badge_template']) {
+      content['badge_template'] = awardTemplate[content['brand'] || brand]
+    }
+  }
+
+  return content
+}

package/src/index.d.ts

@@ -55,6 +55,8 @@ import {
 	getEnrichedLearningPaths,
 	getLearningPathLessonsByIds,
 	mapContentToParent,
+	mapContentsThatWereLastProgressedFromMethod,
+	mapLearningPathParentsTo,
 	onContentCompletedLearningPathActions,
 	resetAllLearningPaths,
 	startLearningPath,
@@ -114,6 +116,7 @@ import {
 	getAllCompletedByIds,
 	getAllStarted,
 	getAllStartedOrCompleted,
+	getIdsWhereLastAccessedFromMethod,
 	getLastInteractedOf,
 	getNavigateTo,
 	getNavigateToForMethod,
@@ -286,6 +289,7 @@ import {
 	fetchOtherSongVersions,
 	fetchOwnedContent,
 	fetchPackData,
+	fetchParentChildRelationshipsFor,
 	fetchPlayAlongsCount,
 	fetchRecent,
 	fetchRelatedLessons,
@@ -540,6 +544,7 @@ declare module 'musora-content-services' {
 		fetchOtherSongVersions,
 		fetchOwnedContent,
 		fetchPackData,
+		fetchParentChildRelationshipsFor,
 		fetchPlayAlongsCount,
 		fetchPlaylist,
 		fetchPlaylistItems,
@@ -599,6 +604,7 @@ declare module 'musora-content-services' {
 		getDailySession,
 		getEnrichedLearningPath,
 		getEnrichedLearningPaths,
+		getIdsWhereLastAccessedFromMethod,
 		getInProgressAwards,
 		getLastInteractedOf,
 		getLearningPathLessonsByIds,
@@ -659,6 +665,8 @@ declare module 'musora-content-services' {
 		login,
 		logout,
 		mapContentToParent,
+		mapContentsThatWereLastProgressedFromMethod,
+		mapLearningPathParentsTo,
 		markAllNotificationsAsRead,
 		markContentAsInterested,
 		markContentAsNotInterested,

package/src/index.js

@@ -59,6 +59,8 @@ import {
 	getEnrichedLearningPaths,
 	getLearningPathLessonsByIds,
 	mapContentToParent,
+	mapContentsThatWereLastProgressedFromMethod,
+	mapLearningPathParentsTo,
 	onContentCompletedLearningPathActions,
 	resetAllLearningPaths,
 	startLearningPath,
@@ -118,6 +120,7 @@ import {
 	getAllCompletedByIds,
 	getAllStarted,
 	getAllStartedOrCompleted,
+	getIdsWhereLastAccessedFromMethod,
 	getLastInteractedOf,
 	getNavigateTo,
 	getNavigateToForMethod,
@@ -290,6 +293,7 @@ import {
 	fetchOtherSongVersions,
 	fetchOwnedContent,
 	fetchPackData,
+	fetchParentChildRelationshipsFor,
 	fetchPlayAlongsCount,
 	fetchRecent,
 	fetchRelatedLessons,
@@ -539,6 +543,7 @@ export {
 	fetchOtherSongVersions,
 	fetchOwnedContent,
 	fetchPackData,
+	fetchParentChildRelationshipsFor,
 	fetchPlayAlongsCount,
 	fetchPlaylist,
 	fetchPlaylistItems,
@@ -598,6 +603,7 @@ export {
 	getDailySession,
 	getEnrichedLearningPath,
 	getEnrichedLearningPaths,
+	getIdsWhereLastAccessedFromMethod,
 	getInProgressAwards,
 	getLastInteractedOf,
 	getLearningPathLessonsByIds,
@@ -658,6 +664,8 @@ export {
 	login,
 	logout,
 	mapContentToParent,
+	mapContentsThatWereLastProgressedFromMethod,
+	mapLearningPathParentsTo,
 	markAllNotificationsAsRead,
 	markContentAsInterested,
 	markContentAsNotInterested,

package/src/services/awards/award-query.js

@@ -57,6 +57,7 @@ import { awardDefinitions } from './internal/award-definitions'
 import { AwardMessageGenerator } from './internal/message-generator'
 import db from '../sync/repository-proxy'
 import UserAwardProgressRepository from '../sync/repositories/user-award-progress'
+import {awardTemplate} from "../../contentTypeConfig.js";
 
 function enhanceCompletionData(completionData) {
   if (!completionData) return null
@@ -222,7 +223,9 @@ function defineAwards(data) {
     return {
       awardId: def._id,
       awardTitle: def.name,
+      logo: def.logo,
       badge: def.badge,
+      badge_template: awardTemplate[def.brand],
       award: def.award,
       brand: def.brand,
       instructorName: def.instructor_name,
@@ -324,7 +327,9 @@ export async function getCompletedAwards(brand = null, options = {}) {
           awardId: progress.award_id,
           awardTitle: definition.name,
           awardType: definition.type,
+          logo: definition.logo,
           badge: definition.badge,
+          badge_template: awardTemplate[definition.brand],
           award: definition.award,
           brand: definition.brand,
           hasCertificate: hasCertificate,
@@ -445,7 +450,9 @@ export async function getInProgressAwards(brand = null, options = {}) {
         return {
           awardId: progress.award_id,
           awardTitle: definition.name,
+          logo: definition.logo,
           badge: definition.badge,
+          badge_template: awardTemplate[definition.brand],
           award: definition.award,
           brand: definition.brand,
           instructorName: definition.instructor_name,

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

@@ -3,13 +3,19 @@
  */
 
 import { GET, POST } from '../../infrastructure/http/HttpClient.ts'
-import { fetchByRailContentId, fetchByRailContentIds, fetchMethodV2Structure } from '../sanity.js'
+import {
+  fetchByRailContentId,
+  fetchByRailContentIds,
+  fetchMethodV2Structure,
+  fetchParentChildRelationshipsFor
+} from '../sanity.js'
 import { addContextToLearningPaths } from '../contentAggregator.js'
 import {
   contentStatusCompleted,
   contentStatusCompletedMany,
   contentStatusReset,
   getAllCompletedByIds,
+  getIdsWhereLastAccessedFromMethod,
   getProgressState,
 } from '../contentProgress.js'
 import { COLLECTION_TYPE, STATE } from '../sync/models/ContentProgress'
@@ -17,10 +23,10 @@ import { SyncWriteDTO } from '../sync'
 import { ContentProgress } from '../sync/models'
 import { CollectionParameter } from '../sync/repositories/content-progress'
 import dayjs from 'dayjs'
+import { LEARNING_PATH_LESSON } from "../../contentTypeConfig";
 
 const BASE_PATH: string = `/api/content-org`
 const LEARNING_PATHS_PATH = `${BASE_PATH}/v1/user/learning-paths`
-const LEARNING_PATH_LESSON = 'learning-path-lesson-v2'
 let dailySessionPromise: Promise<DailySessionResponse> | null = null
 let activePathPromise: Promise<ActiveLearningPathResponse> | null = null
 
@@ -202,7 +208,10 @@ export async function getEnrichedLearningPath(learningPathId) {
   response = await addContextToLearningPaths(() => response, { addAwards: true })
   if (!response) return response
 
-  response.children = mapContentToParent(response.children, LEARNING_PATH_LESSON, learningPathId)
+  response.children = mapContentToParent(
+      response.children,
+      {lessonType: LEARNING_PATH_LESSON, parentContentId: learningPathId}
+  )
   return response
 }
 
@@ -234,9 +243,8 @@ export async function getEnrichedLearningPaths(learningPathIds: number[]) {
 
   response.forEach((learningPath) => {
     learningPath.children = mapContentToParent(
-      learningPath.children,
-      LEARNING_PATH_LESSON,
-      learningPath.id
+        learningPath.children,
+        {lessonType: LEARNING_PATH_LESSON, parentContentId: learningPath.id}
     )
   })
   return response
@@ -257,15 +265,32 @@ export async function getLearningPathLessonsByIds(contentIds, learningPathId) {
 
 /**
  * Maps content to its parent learning path - fixes multi-parent problems for cta when lessons have a special collection.
- * @param lessons
+ * @param lessons - sanity documents
  * @param parentContentType
  * @param parentContentId
  */
-export function mapContentToParent(lessons, parentContentType, parentContentId) {
+export function mapContentToParent(
+  lessons: any,
+  options?: { lessonType?: string; parentContentId?: number }
+) {
   if (!lessons) return lessons
-  return lessons.map((lesson: any) => {
-    return { ...lesson, type: parentContentType, parent_id: parentContentId }
-  })
+
+  function mapIt(lesson: any) {
+    const mappedLesson = { ...lesson }
+    if (options?.lessonType !== undefined) mappedLesson.type = options.lessonType
+    if (options?.parentContentId !== undefined) mappedLesson.parent_id = options.parentContentId
+    return mappedLesson
+
+  }
+
+  if (typeof lessons === 'object' && !Array.isArray(lessons)) {
+    return mapIt(lessons)
+
+  } else if (Array.isArray(lessons)) {
+    return lessons.map((lesson: any) => {
+      return mapIt(lesson)
+    })
+  }
 }
 
 interface fetchLearningPathLessonsResponse {
@@ -539,3 +564,45 @@ export async function onContentCompletedLearningPathActions(
 
   await contentStatusReset(nextLearningPathData.intro_video.id, { skipPush: true })
 }
+
+export async function mapContentsThatWereLastProgressedFromMethod(objects: any[]) {
+  if (!objects || objects.length === 0) return objects
+
+  const contentIds = objects.map((obj) => obj.id) as number[]
+  const trueIds = await getIdsWhereLastAccessedFromMethod(contentIds)
+
+  if (trueIds.length === 0) return objects
+
+  let filtered = objects.filter((obj) => trueIds.includes(obj.id))
+
+  filtered = await mapLearningPathParentsTo(filtered, {type: true, parent_id: true})
+
+  // Map each filtered item back into the total contents object
+  objects = objects.map((item) => {
+    const replace = filtered.find((f) => f.id === item.id) || item
+    return replace
+  })
+
+  return objects
+
+}
+
+export async function mapLearningPathParentsTo(objects: any[], fieldsToMap?: {type?: boolean, parent_id?: boolean}): Promise<object[]> {
+  const ids = objects.map((obj: any) => obj.id) as number[]
+  const hierarchy = await fetchParentChildRelationshipsFor(ids, COLLECTION_TYPE.LEARNING_PATH)
+
+  const parentMap = new Map<number, number>()
+  hierarchy.forEach((relation) => {
+    relation.children.forEach((childId) => {
+      parentMap.set(childId, Number(relation.railcontent_id))
+    })
+  })
+
+  return objects.map((obj) => {
+    const parent_id = parentMap.get(obj.id) ?? undefined
+    return mapContentToParent(obj, {
+      lessonType: fieldsToMap.type ? LEARNING_PATH_LESSON : undefined,
+      parentContentId: fieldsToMap.parent_id ? parent_id : undefined
+    })
+  })
+}

package/src/services/contentProgress.js

@@ -797,3 +797,9 @@ function normalizeCollection(collection) {
     id: typeof collection.id === 'string' ? +collection.id : collection.id,
   }
 }
+
+export async function getIdsWhereLastAccessedFromMethod(contentIds) {
+  const records = await db.contentProgress.getSomeProgressWhereLastAccessedFromMethod(normalizeContentIds(contentIds))
+
+  return records.data.map(record => record.content_id)
+}

package/src/services/progress-row/base.js

@@ -15,6 +15,7 @@ import { addContextToContent } from '../contentAggregator.js'
 import { fetchPlaylist } from '../content-org/playlists.js'
 import { TabResponseType } from '../../contentMetaData.js'
 import { PUT } from '../../infrastructure/http/HttpClient.ts'
+import { addAwardTemplateToContent } from "../../contentTypeConfig.js";
 
 export const USER_PIN_PROGRESS_KEY = 'user_pin_progress_row'
 
@@ -141,6 +142,7 @@ async function popPinnedItem(userPinnedItem, contentCardMap, playlistCards, meth
     } else {
       // we use fetchByRailContentIds so that we don't have the _type restriction in the query
       let data = await fetchByRailContentIds([pinnedId], 'progress-tracker')
+      data = addAwardTemplateToContent(data)
       item = await processContentItem(
         await addContextToContent(() => data[0] ?? null, {
           addNextLesson: true,

package/src/services/progress-row/rows/content-card.js

@@ -5,6 +5,8 @@ import { getAllStartedOrCompleted, getProgressStateByIds } from '../../contentPr
 import { addContextToContent } from '../../contentAggregator.js'
 import { fetchByRailContentIds, fetchShows } from '../../sanity.js'
 import {
+  addAwardTemplateToContent,
+  awardTemplate,
   collectionLessonTypes,
   getFormattedType,
   recentTypes,
@@ -30,7 +32,7 @@ export async function getContentCardMap(brand, limit, playlistEngagedOnContent,
       recentContentIds = recentContentIds.filter(id => id !== item.id && !parentIds.includes(id))
     }
   }
-  const contents = recentContentIds.length > 0
+  let contents = recentContentIds.length > 0
     ? await addContextToContent(
       fetchByRailContentIds,
       recentContentIds,
@@ -44,6 +46,8 @@ export async function getContentCardMap(brand, limit, playlistEngagedOnContent,
       }
     )
     : []
+  contents = addAwardTemplateToContent(contents)
+
   const contentCards = await Promise.all(generateContentPromises(contents))
   return contentCards.reduce((contentMap, content) => {
     contentMap.set(content.id, content)
@@ -111,7 +115,9 @@ export async function processContentItem(content) {
       thumbnail: content.thumbnail,
       title: content.title,
       isLive: isLive,
+      badge_logo: content.logo ?? null,
       badge: content.badge ?? null,
+      badge_template: awardTemplate[content.brand],
       isLocked: content.is_locked ?? false,
       subtitle:
         collectionLessonTypes.includes(content.type) || content.lesson_count > 1

package/src/services/progress-row/rows/playlist-card.js

@@ -4,6 +4,7 @@
 import { fetchUserPlaylists } from '../../content-org/playlists.js'
 import { addContextToContent } from '../../contentAggregator.js'
 import { fetchByRailContentIds } from '../../sanity.js'
+import { addAwardTemplateToContent } from "../../../contentTypeConfig.js";
 
 export async function getPlaylistCards(recentPlaylists){
   return await Promise.all(
@@ -65,7 +66,7 @@ export async function getPlaylistEngagedOnContent(recentPlaylists){
   const playlistEngagedOnContents = recentPlaylists.map(
     (item) => item.playlist.last_engaged_on
   )
-  return playlistEngagedOnContents.length > 0
+  let contents = playlistEngagedOnContents.length > 0
     ? await addContextToContent(fetchByRailContentIds, playlistEngagedOnContents, 'progress-tracker', {
       addNavigateTo: true,
       addProgressStatus: true,
@@ -73,4 +74,6 @@ export async function getPlaylistEngagedOnContent(recentPlaylists){
       addProgressTimestamp: true,
     })
     : []
+  contents = addAwardTemplateToContent(contents)
+  return contents
 }

package/src/services/sanity.js

@@ -32,7 +32,7 @@ import {
   showsTypes,
   SONG_TYPES,
   SONG_TYPES_WITH_CHILDREN,
-  liveFields,
+  liveFields, awardTemplate, addAwardTemplateToContent,
 } from '../contentTypeConfig.js'
 import { fetchSimilarItems, recommendations } from './recommendations.js'
 import { getSongType, processMetadata, ALWAYS_VISIBLE_TABS, CONTENT_STATUSES } from '../contentMetaData.js'
@@ -944,6 +944,7 @@ export async function fetchLessonContent(railContentId, { addParent = false } =
       "dark_mode_logo": dark_mode_logo_url.asset->url,
       "light_mode_logo": light_mode_logo_url.asset->url,
       "badge": *[references(^._id) && _type == 'content-award'][0].badge.asset->url,
+      "badge_logo": *[references(^._id) && _type == 'content-award'][0].logo.asset->url,
     },`
     : ''
 
@@ -994,7 +995,10 @@ export async function fetchLessonContent(railContentId, { addParent = false } =
     return result
   }
 
-  return fetchSanity(query, false, { customPostProcess: chapterProcess, processNeedAccess: true })
+  let contents = await fetchSanity(query, false, { customPostProcess: chapterProcess, processNeedAccess: true })
+  contents = addAwardTemplateToContent(contents)
+
+  return contents
 }
 
 /**
@@ -2332,3 +2336,12 @@ function getContentTypesForFilterName(displayName) {
 export function getSongTypesFor(brand) {
   return getSongType(brand)
 }
+
+export function fetchParentChildRelationshipsFor(childIds, parentType) {
+  const stringIds = childIds.join(',')
+  const query = `*[_type == '${parentType}' && count(@.child[@->railcontent_id in [${stringIds}]]) > 0]{
+  railcontent_id,
+  "children": child[@->railcontent_id in [${stringIds}]]->railcontent_id
+}`
+  return fetchSanity(query, true)
+}

package/src/services/sync/repositories/content-progress.ts

@@ -1,5 +1,6 @@
 import SyncRepository, {Q} from './base'
 import ContentProgress, {COLLECTION_ID_SELF, COLLECTION_TYPE, STATE} from '../models/ContentProgress'
+import {EpochMs} from "../index";
 
 interface ContentIdCollectionTuple {
   contentId: number,
@@ -123,6 +124,31 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     return await this.queryAll(...clauses)
   }
 
+  // Two ways of checking this for a given content_id:
+  //   * grab both records (collection_type = self & and collection_type = learning-path-v2), and compare their updated_at timestamps.
+  //   * utilize the new last_interacted_a_la_carte, which is updated whenever the content is accessed OUTSIDE of an LP,  and compare THIS with the self updated_at (which will be greater than if it was last accessed from LP)
+  // I went with the second because it's an easier query
+  async getSomeProgressWhereLastAccessedFromMethod(contentIds: number[]) {
+    const clauses = [
+      Q.where('content_id', Q.oneOf(contentIds)),
+      Q.where('collection_type', COLLECTION_TYPE.SELF),
+      Q.where('collection_id', COLLECTION_ID_SELF),
+      Q.or(
+          Q.and(
+              Q.where('updated_at', Q.notEq(null)),
+              Q.where('last_interacted_a_la_carte', null)
+          ),
+          Q.and(
+              Q.where('updated_at', Q.notEq(null)),
+              Q.where('last_interacted_a_la_carte', Q.notEq(null)),
+              Q.where('updated_at', Q.gt(Q.column('last_interacted_a_la_carte')))
+          )
+      )
+    ]
+
+    return await this.queryAll(...clauses)
+  }
+
   async getSomeProgressByContentIdsAndCollections(tuples: ContentIdCollectionTuple[]) {
     const clauses = []
 
@@ -160,7 +186,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
       }
 
       if (!fromLearningPath) {
-        r.last_interacted_a_la_carte = Date.now()
+        r.last_interacted_a_la_carte = Date.now() as EpochMs
       }
 
     }, { skipPush })
@@ -210,7 +236,7 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
           r.progress_percent = progressPct
 
           if (!fromLearningPath) {
-            r.last_interacted_a_la_carte = Date.now()
+            r.last_interacted_a_la_carte = Date.now() as EpochMs
           }
         },
       ])

package/src/services/urlBuilder.ts

@@ -14,6 +14,8 @@
 
 import { globalConfig } from './config.js'
 import { Brands } from '../lib/brands.js'
+import { LEARNING_PATH_LESSON } from '../contentTypeConfig.js'
+import { COLLECTION_TYPE } from "./sync/models/ContentProgress";
 
 /**
  * Brand type - accepts enum values or string
@@ -149,7 +151,7 @@ export function generateContentUrl({
     'jam-track',
   ]
 
-  const methodTypes = ['learning-path-v2', 'learning-path-lesson-v2']
+  const methodTypes = [COLLECTION_TYPE.LEARNING_PATH, LEARNING_PATH_LESSON]
 
   let pageType: string
   if (songTypes.includes(type)) {

package/src/services/userActivity.js

@@ -5,15 +5,16 @@
 import { fetchUserPractices, fetchUserPracticeMeta, fetchRecentUserActivities } from './railcontent'
 import { GET, POST, PUT, DELETE } from '../infrastructure/http/HttpClient.ts'
 import { DataContext, UserActivityVersionKey } from './dataContext.js'
-import { fetchByRailContentIds } from './sanity'
+import { fetchByRailContentIds, fetchParentChildRelationshipsFor } from './sanity'
 import { getMonday, getWeekNumber, isSameDate, isNextDay } from './dateUtils.js'
 import { globalConfig } from './config'
-import { getFormattedType } from '../contentTypeConfig'
+import { addAwardTemplateToContent, getFormattedType, LEARNING_PATH_LESSON } from '../contentTypeConfig'
 import dayjs from 'dayjs'
 import { addContextToContent } from './contentAggregator.js'
 import { db, Q } from './sync'
 import { COLLECTION_TYPE } from './sync/models/ContentProgress'
 import { streakCalculator } from './user/streakCalculator'
+import { mapContentsThatWereLastProgressedFromMethod, mapLearningPathParentsTo } from "./content-org/learning-paths.js";
 
 const DATA_KEY_PRACTICES = 'practices'
 
@@ -490,11 +491,13 @@ export async function getPracticeNotes(date) {
  */
 export async function getRecentActivity({ page = 1, limit = 5, tabName = null } = {}) {
   const recentActivityData = await fetchRecentUserActivities({ page, limit, tabName })
-  const contentIds = recentActivityData.data.map((p) => p.contentId).filter((id) => id !== null)
 
-  const contents = await addContextToContent(
+  const filteredData = recentActivityData.data.filter((id) => id !== null)
+  const allContentIds = filteredData.map((p) => p.contentId)
+
+  let contents = await addContextToContent(
     fetchByRailContentIds,
-    contentIds,
+    allContentIds,
     'progress-tracker',
     undefined,
     true,
@@ -504,6 +507,9 @@ export async function getRecentActivity({ page = 1, limit = 5, tabName = null }
       addNextLesson: true,
     }
   )
+  contents = addAwardTemplateToContent(contents)
+
+  contents = await mapContentsThatWereLastProgressedFromMethod(contents)
 
   recentActivityData.data = recentActivityData.data.map((practice) => {
     const content = contents?.find((c) => c.id === practice.contentId) || {}
@@ -513,6 +519,7 @@ export async function getRecentActivity({ page = 1, limit = 5, tabName = null }
       title: content.title,
       parent_id: content.parent_id || null,
       navigateTo: content.navigateTo,
+      sanityType: content.type || practice.sanityType,
       artist_name: content.artist_name || null,
     }
   })
@@ -773,7 +780,7 @@ export async function calculateLongestStreaks(userId = globalConfig.sessionConfi
 
 async function formatPracticeMeta(practices = []) {
   const contentIds = practices.map((p) => p.content_id).filter((id) => id !== null)
-  const contents = await addContextToContent(
+  let contents = await addContextToContent(
     fetchByRailContentIds,
     contentIds,
     'progress-tracker',
@@ -785,6 +792,9 @@ async function formatPracticeMeta(practices = []) {
       addNextLesson: true,
     }
   )
+  contents = addAwardTemplateToContent(contents)
+
+  contents = await mapContentsThatWereLastProgressedFromMethod(contents)
 
   return practices.map((practice) => {
     const content =