musora-content-services 2.131.4 → 2.131.5

package/.claude/settings.local.json

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

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.131.5](https://github.com/railroadmedia/musora-content-services/compare/v2.131.4...v2.131.5) (2026-02-05)
+
+
+### Bug Fixes
+
+* **T3PS-1401:** 5 minute ttl for pinned data ([#767](https://github.com/railroadmedia/musora-content-services/issues/767)) ([a14cea5](https://github.com/railroadmedia/musora-content-services/commit/a14cea5ce9e65297e5f16c9ab320445786da0c5d))
+
 ### [2.131.4](https://github.com/railroadmedia/musora-content-services/compare/v2.131.3...v2.131.4) (2026-02-05)
 
 

package/package.json

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

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

@@ -14,54 +14,29 @@ import { fetchByRailContentIds } from '../sanity.js'
 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 { GET, PUT } from '../../infrastructure/http/HttpClient.ts'
 import { postProcessBadge } from "../../contentTypeConfig.js";
 
 export const USER_PIN_PROGRESS_KEY = 'user_pin_progress_row'
+const CACHE_EXPIRY_MS = 5 * 60 * 1000
 
-/**
- * Gets the localStorage key for user pinned progress, scoped by user ID
- */
-export function getUserPinProgressKey(id) {
-  const userId = id || globalConfig.sessionConfig?.userId || globalConfig.railcontentConfig?.userId
-  return userId ? `user_pin_progress_row_${userId}` : USER_PIN_PROGRESS_KEY
-}
+async function getUserPinnedItem(brand) {
+  const key = getUserPinProgressKey()
 
-/**
- * Fetches and combines recent user progress rows and playlists, excluding certain types and parents.
- *
- * @param {Object} [options={}] - Options for fetching progress rows.
- * @param {string|null} [options.brand=null] - The brand context for progress data.
- * @param {number} [options.limit=8] - Maximum number of progress rows to return.
- * @returns {Promise<Object>} - A promise that resolves to an object containing progress rows formatted for UI.
- *
- * @example
- * getProgressRows({ brand: 'drumeo', limit: 10 })
- *   .then(data => console.log(data))
- *   .catch(error => console.error(error));
- */
-export async function getProgressRows({ brand = 'drumeo', limit = 8 } = {}) {
-  const [userPinnedItem, recentPlaylists] = await Promise.all([
-    getUserPinnedItem(brand),
-    getRecentPlaylists(brand, limit),
-  ])
-  const playlistEngagedOnContent = await getPlaylistEngagedOnContent(recentPlaylists)
-  const [contentCardMap, playlistCards, methodCard] = await Promise.all([
-    getContentCardMap(brand, limit, playlistEngagedOnContent, userPinnedItem),
-    getPlaylistCards(recentPlaylists),
-    getMethodCard(brand),
-  ])
-  const pinnedCard = await popPinnedItem(userPinnedItem, contentCardMap, playlistCards, methodCard)
-  let allResultsLength = playlistCards.length + contentCardMap.size
-  if (methodCard) {
-    allResultsLength += 1
+  const pinnedProgress = await getStoredPinnedData(key)
+  const cachedData = pinnedProgress[brand]
+
+  if (isCacheValid(cachedData)) {
+    return cachedData
   }
-  const results = sortCards(pinnedCard, contentCardMap, playlistCards, methodCard, limit)
-  return {
-    type: TabResponseType.PROGRESS_ROWS,
-    displayBrowseAll: allResultsLength > limit,
-    data: results,
+
+  const url = `/api/user-management-system/v1/progress/pin?brand=${brand}`
+  const response = await GET(url)
+
+  if (response && !response.error) {
+    return await setUserBrandPinnedItem(brand, response)
   }
+  return response
 }
 
 /**
@@ -80,11 +55,11 @@ export async function getProgressRows({ brand = 'drumeo', limit = 8 } = {}) {
 export async function pinProgressRow(brand, id, progressType) {
   const url = `/api/user-management-system/v1/progress/pin?brand=${brand}&id=${id}&progressType=${progressType}`
   const response = await PUT(url, null)
+
   if (response && !response.error) {
-    await updateUserPinnedProgressRow(brand, {
+    return await setUserBrandPinnedItem(brand, {
       id,
       progressType,
-      pinnedAt: new Date().toISOString(),
     })
   }
   return response
@@ -105,22 +80,90 @@ export async function unpinProgressRow(brand) {
   const url = `/api/user-management-system/v1/progress/unpin?brand=${brand}`
   const response = await PUT(url, null)
   if (response && !response.error) {
-    await updateUserPinnedProgressRow(brand, null)
+    await setUserBrandPinnedItem(brand, null)
   }
   return response
 }
 
+/**
+ * Gets the localStorage key for user pinned progress, scoped by user ID
+ */
+export function getUserPinProgressKey(id) {
+  const userId = id || globalConfig.sessionConfig?.userId || globalConfig.railcontentConfig?.userId
+  return USER_PIN_PROGRESS_KEY + `_${userId}`
+}
+
 export async function setUserPinnedProgressRow(userId, pinnedData) {
   const key = getUserPinProgressKey(userId)
+
+  pinnedData.map(item => ({...item, cachedAt: Date.now()}))
   await globalConfig.localStorage.setItem(key, JSON.stringify(pinnedData))
 }
 
-async function getUserPinnedItem(brand) {
+async function setUserBrandPinnedItem(brand, pinnedData) {
+  if (!brand) return
+
   const key = getUserPinProgressKey()
+  let pinnedProgress = await getStoredPinnedData(key)
+
+  pinnedProgress[brand] = setPinnedData(pinnedData)
+  await globalConfig.localStorage.setItem(key, JSON.stringify(pinnedProgress))
+  return pinnedProgress
+}
+
+async function getStoredPinnedData(key) {
   const pinnedProgressRaw = await globalConfig.localStorage.getItem(key)
-  let pinnedProgress = pinnedProgressRaw ? JSON.parse(pinnedProgressRaw) : {}
-  pinnedProgress = pinnedProgress || {}
-  return pinnedProgress[brand] ?? null
+  const pinnedProgress = pinnedProgressRaw ? JSON.parse(pinnedProgressRaw) : {}
+  return pinnedProgress || {}
+}
+
+function setPinnedData(pinnedData) {
+  const now = Date.now()
+  return {
+    ...pinnedData,
+    cachedAt: now
+  }
+}
+
+function isCacheValid(cachedData) {
+  return cachedData?.cachedAt && (Date.now() - cachedData.cachedAt) < CACHE_EXPIRY_MS
+}
+
+/**
+ * Fetches and combines recent user progress rows and playlists, excluding certain types and parents.
+ *
+ * @param {Object} [options={}] - Options for fetching progress rows.
+ * @param {string|null} [options.brand=null] - The brand context for progress data.
+ * @param {number} [options.limit=8] - Maximum number of progress rows to return.
+ * @returns {Promise<Object>} - A promise that resolves to an object containing progress rows formatted for UI.
+ *
+ * @example
+ * getProgressRows({ brand: 'drumeo', limit: 10 })
+ *   .then(data => console.log(data))
+ *   .catch(error => console.error(error));
+ */
+export async function getProgressRows({ brand = 'drumeo', limit = 8 } = {}) {
+  const [userPinnedItem, recentPlaylists] = await Promise.all([
+    getUserPinnedItem(brand),
+    getRecentPlaylists(brand, limit),
+  ])
+  const playlistEngagedOnContent = await getPlaylistEngagedOnContent(recentPlaylists)
+  const [contentCardMap, playlistCards, methodCard] = await Promise.all([
+    getContentCardMap(brand, limit, playlistEngagedOnContent, userPinnedItem),
+    getPlaylistCards(recentPlaylists),
+    getMethodCard(brand),
+  ])
+  const pinnedCard = await popPinnedItem(userPinnedItem, contentCardMap, playlistCards, methodCard)
+  let allResultsLength = playlistCards.length + contentCardMap.size
+  if (methodCard) {
+    allResultsLength += 1
+  }
+  const results = sortCards(pinnedCard, contentCardMap, playlistCards, methodCard, limit)
+  return {
+    type: TabResponseType.PROGRESS_ROWS,
+    displayBrowseAll: allResultsLength > limit,
+    data: results,
+  }
 }
 
 /**
@@ -131,7 +174,6 @@ async function getUserPinnedItem(brand) {
 async function popPinnedItem(userPinnedItem, contentCardMap, playlistCards, methodCard) {
   if (!userPinnedItem) return null
   const pinnedId = parseInt(userPinnedItem.id)
-  const pinnedAt = userPinnedItem.pinnedAt
   const progressType = userPinnedItem.progressType ?? userPinnedItem.type
 
   let item = null
@@ -163,7 +205,7 @@ async function popPinnedItem(userPinnedItem, contentCardMap, playlistCards, meth
         id: pinnedId,
         playlist: playlist,
         type: 'playlist',
-        progressTimestamp: new Date(pinnedAt).getTime(),
+        progressTimestamp: new Date().getTime(),
       })
     }
   } else if (progressType === 'method') {
@@ -218,12 +260,3 @@ function mergeAndSortItems(items, limit) {
     })
     .slice(0, limit)
 }
-
-async function updateUserPinnedProgressRow(brand, pinnedData) {
-  const key = getUserPinProgressKey()
-  const pinnedProgressRaw = await globalConfig.localStorage.getItem(key)
-  let pinnedProgress = pinnedProgressRaw ? JSON.parse(pinnedProgressRaw) : {}
-  pinnedProgress = pinnedProgress || {}
-  pinnedProgress[brand] = pinnedData
-  await globalConfig.localStorage.setItem(key, JSON.stringify(pinnedProgress))
-}