musora-content-services 2.1.1 → 2.2.1

package/src/services/gamification/gamification.js

@@ -0,0 +1,4 @@
+/**
+ * @namespace Gamification
+ * @property {module:Awards} Awards
+ */

package/src/services/gamification/types.js

@@ -0,0 +1,26 @@
+/**
+ * @typedef {Object} Award
+ * @property {string} username - The username of the user.
+ * @property {number} streak - The name of the award.
+ * @property {number} minutes_practiced - The name of the award.
+ * @property {Date} date_completed - Date of completion
+ * @property {string} challenge_title - The name of the challenge completed.
+ * @property {string} award_text - Award description
+ * @property {string} tier - Award tier [bronze, silver, gold]
+ * @property {string} award - Award image URL
+ * @property {string} award_64 - Award image in base64
+ * @property {string} instructor_signature - Instructor signature image URL
+ * @property {string} instructor_signature_64 - Instructor signature image in base64
+ * @property {string} musora_logo - Musora logo image URL
+ * @property {string} musora_logo_64 - Musora logo image in base64
+ * @property {string} brand_logo - Brand logo image URL
+ * @property {string} brand_logo_64 - Brand logo image in base64
+ * @property {string} ribbon_image - Ribbon image URL
+ * @property {string} ribbon_image_64 - Ribbon image in base64
+ * @property {number} id - ID of the challenge completed
+ * @property {string} artist_name - Name of the artist featured in the challenge
+ * @property {string} dark_mode_logo_url - Dark mode logo image URL
+ * @property {string} light_mode_logo_url - Light mode logo image URL
+ * @property {string} logo_image_url - Name of the artist featured in the challenge
+ * @property {string} web_url_path - URL path for the challenge
+ */

package/src/services/railcontent.js

@@ -1176,6 +1176,66 @@ export async function editComment(commentId, comment) {
   return await patchDataHandler(url, data)
 }
 
+export async function fetchUserPractices(currentVersion) {
+  const url = `/api/user/practices/v1/practices`
+  const response =  await fetchDataHandler(url, currentVersion)
+  const { data, version } = response;
+  const userPractices = data;
+
+  let formattedPractices = userPractices.reduce((acc, practice) => {
+    // Initialize the array if the day does not exist
+    if (!acc[practice.day]) {
+      acc[practice.day] = [];
+    }
+
+    // Push the practice entry into the array
+    acc[practice.day].push({ id:practice.id, duration_seconds: practice.duration_seconds });
+
+    return acc;
+  }, {});
+
+  let json = {
+    data: {
+      practices: formattedPractices
+    },
+    version: version
+  };
+
+  return json;
+}
+
+export async function logUserPractice(practiceDetails) {
+  const url = `/api/user/practices/v1/practices`
+  return await fetchHandler(url, 'POST', null, practiceDetails)
+}
+export async function fetchUserPracticeMeta(practiceIds) {
+  if(practiceIds.length == 0)
+  {
+    return [];
+  }
+  let idsString = '';
+  if (practiceIds && practiceIds.length > 0) {
+    idsString = '?';
+    practiceIds.forEach((id, index) => {
+      idsString += `practice_ids[]=${id}${index < practiceIds.length - 1 ? '&' : ''}`;
+    });
+  }
+  const url = `/api/user/practices/v1/practices${idsString}`
+  return await fetchHandler(url, 'GET', null)
+}
+
+function fetchAbsolute(url, params) {
+  if (globalConfig.railcontentConfig.authToken) {
+    params.headers['Authorization'] = `Bearer ${globalConfig.railcontentConfig.authToken}`
+  }
+
+  if (globalConfig.railcontentConfig.baseUrl) {
+    if (url.startsWith('/')) {
+      return fetch(globalConfig.railcontentConfig.baseUrl + url, params)
+    }
+  }
+  return fetch(url, params)
+}
 export async function fetchHandler(url, method = 'get', dataVersion = null, body = null) {
   return fetchJSONHandler(
     url,

package/src/services/sanity.js

@@ -15,7 +15,7 @@ import {
   getNewReleasesTypes,
   coachLessonsTypes,
   getChildFieldsForContentType,
-  SONG_TYPES
+  SONG_TYPES,
 } from '../contentTypeConfig.js'
 import { fetchSimilarItems } from './recommendations.js'
 import { processMetadata, typeWithSortOrder } from '../contentMetaData.js'
@@ -353,6 +353,7 @@ export async function fetchNewReleases(
      "id": railcontent_id,
       title,
       "image": thumbnail.asset->url,
+      "thumbnail": thumbnail.asset->url,
       ${artistOrInstructorName()},
       "artists": instructor[]->name,
       difficulty,
@@ -396,6 +397,7 @@ export async function fetchUpcomingEvents(brand, { page = 1, limit = 10 } = {})
         "id": railcontent_id,
         title,
         "image": thumbnail.asset->url,
+        "thumbnail": thumbnail.asset->url,
         ${artistOrInstructorName()},
         "artists": instructor[]->name,
         difficulty,
@@ -444,6 +446,7 @@ export async function fetchScheduledReleases(brand, { page = 1, limit = 10 }) {
       "id": railcontent_id,
       title,
       "image": thumbnail.asset->url,
+      "thumbnail": thumbnail.asset->url,
       ${artistOrInstructorName()},
       "artists": instructor[]->name,
       difficulty,
@@ -1071,7 +1074,7 @@ export async function fetchMethod(brand, slug) {
         child_count,
         difficulty,
         difficulty_string,
-        "thumbnail_url": thumbnail.asset->url,
+        "thumbnail": thumbnail.asset->url,
         "instructor": instructor[]->{name},
         title,
         "type": _type,
@@ -1097,7 +1100,7 @@ export async function fetchMethodChildren(railcontentId) {
     "child_count":coalesce(count(child[${childrenFilter}]->), 0),
     "id": railcontent_id,
     "description": ${descriptionField},
-    "thumbnail_url": thumbnail.asset->url,
+    "thumbnail": thumbnail.asset->url,
     title,
     xp,
     total_xp,
@@ -1261,7 +1264,7 @@ export async function fetchLessonContent(railContentId) {
           railcontent_id,
           "id":railcontent_id,
           slug, artist->,
-          "thumbnail_url":thumbnail.asset->url,
+          "thumbnail":thumbnail.asset->url,
           "url": web_url_path,
           soundslice_slug,
           "description": description[0].children[0].text,
@@ -1321,7 +1324,7 @@ export async function fetchLessonContent(railContentId) {
  * @param count
  * @returns {Promise<Array<Object>|null>}
  */
-export async function fetchRelatedRecommendedContent(railContentId, brand, count=10) {
+export async function fetchRelatedRecommendedContent(railContentId, brand, count = 10) {
   const recommendedItems = await fetchSimilarItems(railContentId, brand, count)
   return fetchByRailContentIds(recommendedItems)
 }
@@ -1333,9 +1336,9 @@ export async function fetchRelatedRecommendedContent(railContentId, brand, count
  * @param railcontentId
  * @param brand
  * @param count
- * @returns {Promise<*>}
+ * @returns {Promise<Array<Object>>}
  */
-export async function fetchOtherSongVersions(railcontentId, brand, count=3){
+export async function fetchOtherSongVersions(railcontentId, brand, count = 3) {
   return fetchRelatedByLicense(railcontentId, brand, true, count)
 }
 
@@ -1346,9 +1349,9 @@ export async function fetchOtherSongVersions(railcontentId, brand, count=3){
  * @param {integer} railcontentId
  * @param {string} brand
  * @param {integer:3} count
- * @returns {Promise<*>}
+ * @returns {Promise<Array<Object>>}
  */
-export async function fetchLessonsFeaturingThisContent(railcontentId, brand, count=3){
+export async function fetchLessonsFeaturingThisContent(railcontentId, brand, count = 3) {
   return fetchRelatedByLicense(railcontentId, brand, false, count)
 }
 
@@ -1359,16 +1362,15 @@ export async function fetchLessonsFeaturingThisContent(railcontentId, brand, cou
  * @param {string} brand
  * @param {boolean} onlyUseSongTypes - if true, only return the song type documents. If false, return everything except those
  * @param {integer:3} count
- * @returns {Promise<*[]>}
+ * @returns {Promise<Array<Object>>}
  */
 async function fetchRelatedByLicense(railcontentId, brand, onlyUseSongTypes, count) {
   const typeCheck = `@->_type in [${arrayJoinWithQuotes(SONG_TYPES)}]`
   const typeCheckString = onlyUseSongTypes ? `${typeCheck}` : `!(${typeCheck})`
-  const contentFromLicenseFilter =`_type == 'license' && references(^._id)].content[${typeCheckString} && @->railcontent_id != ${railcontentId}`
-  let filterSongTypesWithSameLicense = await new FilterBuilder(
-    contentFromLicenseFilter,
-    {isChildrenFilter: true},
-  ).buildFilter()
+  const contentFromLicenseFilter = `_type == 'license' && references(^._id)].content[${typeCheckString} && @->railcontent_id != ${railcontentId}`
+  let filterSongTypesWithSameLicense = await new FilterBuilder(contentFromLicenseFilter, {
+    isChildrenFilter: true,
+  }).buildFilter()
   let queryFields = getFieldsForContentType()
   const baseParentQuery = `railcontent_id == ${railcontentId}`
   let parentQuery = await new FilterBuilder(baseParentQuery).buildFilter()
@@ -1383,7 +1385,7 @@ async function fetchRelatedByLicense(railcontentId, brand, onlyUseSongTypes, cou
       }[0...1]`
 
   const results = await fetchSanity(query, false)
-  return results['related_by_license'] ?? [];
+  return results['related_by_license'] ?? []
 }
 
 /**
@@ -1407,7 +1409,7 @@ export async function fetchRelatedLessons(railContentId, brand) {
   ).buildFilter()
   const filterNeighbouringSiblings = await new FilterBuilder(`references(^._id)`).buildFilter()
   const childrenFilter = await new FilterBuilder(``, { isChildrenFilter: true }).buildFilter()
-  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail_url":thumbnail.asset->url, length_in_seconds, web_url_path, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type, "genre": genre[]->name`
+  const queryFields = `_id, "id":railcontent_id, published_on, "instructor": instructor[0]->name, title, "thumbnail":thumbnail.asset->url, length_in_seconds, web_url_path, "type": _type, difficulty, difficulty_string, railcontent_id, artist->,"permission_id": permission[]->railcontent_id,_type, "genre": genre[]->name`
   const queryFieldsWithSort = queryFields + ', sort'
   const query = `*[railcontent_id == ${railContentId} && brand == "${brand}" && (!defined(permission) || references(*[_type=='permission']._id))]{
    _type, parent_type, railcontent_id,
@@ -1698,11 +1700,11 @@ export async function fetchArtistLessons(
   const query = `{
     "entity":
       *[_type == 'artist' && name == '${name}']
-        {'type': _type, name, 'thumbnail_url':thumbnail_url.asset->url,
+        {'type': _type, name, 'thumbnail':thumbnail_url.asset->url,
         'lessons_count': count(*[${addType} brand == '${brand}' && references(^._id)]),
         'lessons': *[${addType} brand == '${brand}' && references(^._id) && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
       [${start}...${end}]}
-      |order(${sortOrder})
+      |order(${sortOrder})f
   }`
   return fetchSanity(query, true)
 }
@@ -1752,7 +1754,7 @@ export async function fetchGenreLessons(
   const query = `{
     "entity":
       *[_type == 'genre' && name == '${name}']
-        {'type': _type, name, 'thumbnail_url':thumbnail_url.asset->url,
+        {'type': _type, name, 'thumbnail':thumbnail_url.asset->url,
         'lessons_count': count(*[${addType} brand == '${brand}' && references(^._id)]),
         'lessons': *[${addType} brand == '${brand}' && references(^._id) && (status in ['published'] || (status == 'scheduled' && defined(published_on) && published_on >= '${now}')) ${searchFilter} ${includedFieldsFilter} ${progressFilter}]{${fieldsString}}
       [${start}...${end}]}
@@ -2350,4 +2352,3 @@ export async function fetchScheduledAndNewReleases(
 
   return fetchSanity(query, true)
 }
-

package/src/services/userActivity.js

@@ -2,31 +2,385 @@
  * @module User-Activity
  */
 
-import {fetchHandler} from "./railcontent";
-const userActivityStats = {
-    user: {
-      id: 1,
-      fullName: 'John Doe',
-      profilePictureUrl: 'https://i.pravatar.cc/300',
+import {fetchUserPractices, logUserPractice, fetchUserPracticeMeta, fetchHandler} from './railcontent'
+import { DataContext, UserActivityVersionKey } from './dataContext.js'
+import {fetchByRailContentIds} from "./sanity";
+import {lessonTypesMapping} from "../contentTypeConfig";
+
+const recentActivity = {
+  data: [
+    { id: 5,title: '3 Easy Classical Songs For Beginners', action: 'Comment', thumbnail: 'https://s3-alpha-sig.figma.com/img/22c3/1eb9/d819a2c6727b78deb2fcf051349a0667?Expires=1743984000&Key-Pair-Id=APKAQ4GOSFWCW27IBOMQ&Signature=RGusttOtnWP80iL68~l4XqFrQNe-kOTnUSLtMXQwGJNLfWNze6~fMZ15LsH4IYpz85mJKgILgCegi1sEPF6loBJpKYF9AH5HC2Zz1fenM1T3V387dgb4FifujKtR-DJuBpknPNFvZ9wC9ebCfoXhc1HLe7BJUDSr8gJssiqsimQPU-9TanAOJAFTaxOfvQ0-WEW1VIdCWLX0OOjn1qs~jZTeOGcxy3b~OD1CxiUmwp5tA3lBgqya18Mf8kmcfHjByNmYysd2FwV5tS19dCnmzbE9hwvLwMOnQ38SYOKhxCLsteDRBIxLNjTGJFDUm4wF~089Kkd1zA8pn8-kVfYtwg__', summary: 'Just completed the advanced groove lesson! I’m finally feeling more confident with my fills. Thanks for the clear explanations and practice tips! ', date: '2025-03-25 10:09:48' },
+    { id:4, title: 'Piano Man by Billy Joel', action: 'Play', thumbnail:'https://s3-alpha-sig.figma.com/img/fab0/fffe/3cb08e0256a02a18ac37b2db1c2b4a1f?Expires=1743984000&Key-Pair-Id=APKAQ4GOSFWCW27IBOMQ&Signature=smjF95zM9b469lFJ8F6mmjpRs4jPlDcBnflDXc9G~Go1ab87fnWpmg-megUoLmSkqu-Rf3s8P5buzqNP-YnqQl413g3grqNURTIwHRaI2HplN1OXL~OBLU9jHjgQxZmMI6VfSLs301W~cU9NHmMLYRr38r9mVQM6ippSMawj7MFSywiPhvHSvAIXt65o6HlNszhq1n5eZmxVdiL7tjifSja~fGVtHDsX0wuD3L-KAN5TIqywAgRzzFFMHw3yYxiOHajbRSi0s0LJNIHRF4iBJFFZWVXY5vdNX5YKmAmblnbfYIK3GrwJiaVEv6rGzOo~nN4Zh-FKJWvjyPd2oBmfbg__', date: '2025-03-25 10:04:48'  },
+    { id:3, title: 'General Piano Discussion', action: 'Post', thumbnail: 'https://s3-alpha-sig.figma.com/img/22c3/1eb9/d819a2c6727b78deb2fcf051349a0667?Expires=1743984000&Key-Pair-Id=APKAQ4GOSFWCW27IBOMQ&Signature=RGusttOtnWP80iL68~l4XqFrQNe-kOTnUSLtMXQwGJNLfWNze6~fMZ15LsH4IYpz85mJKgILgCegi1sEPF6loBJpKYF9AH5HC2Zz1fenM1T3V387dgb4FifujKtR-DJuBpknPNFvZ9wC9ebCfoXhc1HLe7BJUDSr8gJssiqsimQPU-9TanAOJAFTaxOfvQ0-WEW1VIdCWLX0OOjn1qs~jZTeOGcxy3b~OD1CxiUmwp5tA3lBgqya18Mf8kmcfHjByNmYysd2FwV5tS19dCnmzbE9hwvLwMOnQ38SYOKhxCLsteDRBIxLNjTGJFDUm4wF~089Kkd1zA8pn8-kVfYtwg__', summary: 'Just completed the advanced groove lesson! I’m finally feeling more confident with my fills. Thanks for the clear explanations and practice tips! ', date: '2025-03-25 09:49:48' },
+    { id:2, title: 'Welcome To Guitareo', action: 'Complete', thumbnail: 'https://s3-alpha-sig.figma.com/img/22c3/1eb9/d819a2c6727b78deb2fcf051349a0667?Expires=1743984000&Key-Pair-Id=APKAQ4GOSFWCW27IBOMQ&Signature=RGusttOtnWP80iL68~l4XqFrQNe-kOTnUSLtMXQwGJNLfWNze6~fMZ15LsH4IYpz85mJKgILgCegi1sEPF6loBJpKYF9AH5HC2Zz1fenM1T3V387dgb4FifujKtR-DJuBpknPNFvZ9wC9ebCfoXhc1HLe7BJUDSr8gJssiqsimQPU-9TanAOJAFTaxOfvQ0-WEW1VIdCWLX0OOjn1qs~jZTeOGcxy3b~OD1CxiUmwp5tA3lBgqya18Mf8kmcfHjByNmYysd2FwV5tS19dCnmzbE9hwvLwMOnQ38SYOKhxCLsteDRBIxLNjTGJFDUm4wF~089Kkd1zA8pn8-kVfYtwg__',date: '2025-03-25 09:34:48'  },
+    { id:1, title: 'Welcome To Guitareo', action: 'Start', thumbnail: 'https://s3-alpha-sig.figma.com/img/22c3/1eb9/d819a2c6727b78deb2fcf051349a0667?Expires=1743984000&Key-Pair-Id=APKAQ4GOSFWCW27IBOMQ&Signature=RGusttOtnWP80iL68~l4XqFrQNe-kOTnUSLtMXQwGJNLfWNze6~fMZ15LsH4IYpz85mJKgILgCegi1sEPF6loBJpKYF9AH5HC2Zz1fenM1T3V387dgb4FifujKtR-DJuBpknPNFvZ9wC9ebCfoXhc1HLe7BJUDSr8gJssiqsimQPU-9TanAOJAFTaxOfvQ0-WEW1VIdCWLX0OOjn1qs~jZTeOGcxy3b~OD1CxiUmwp5tA3lBgqya18Mf8kmcfHjByNmYysd2FwV5tS19dCnmzbE9hwvLwMOnQ38SYOKhxCLsteDRBIxLNjTGJFDUm4wF~089Kkd1zA8pn8-kVfYtwg__',date: '2025-03-25 09:04:48'  },
+  ],
+}
+
+const DATA_KEY_PRACTICES = 'practices'
+const DATA_KEY_LAST_UPDATED_TIME = 'u'
+
+const DAYS = ['M', 'T', 'W', 'T', 'F', 'S', 'S']
+
+export let userActivityContext = new DataContext(UserActivityVersionKey, fetchUserPractices)
+
+// Get Weekly Stats
+export async function getUserWeeklyStats() {
+  let data = await userActivityContext.getData()
+
+  let practices = data?.[DATA_KEY_PRACTICES] ?? {}
+
+  let today = new Date()
+  let startOfWeek = getMonday(today) // Get last Monday
+  let dailyStats = []
+  const todayKey = today.toISOString().split('T')[0]
+  for (let i = 0; i < 7; i++) {
+    let day = new Date(startOfWeek)
+    day.setDate(startOfWeek.getDate() + i)
+    let dayKey = day.toISOString().split('T')[0]
+
+    let dayActivity = practices[dayKey] ?? null
+    let isActive = dayKey === todayKey
+    let type = (dayActivity !== null ? 'tracked' : (isActive ? 'active' : 'none'))
+    dailyStats.push({ key: i, label: DAYS[i], isActive, inStreak: dayActivity !== null, type })
+  }
+
+  let { streakMessage } = getStreaksAndMessage(practices);
+
+  return { data: { dailyActiveStats: dailyStats, streakMessage } }
+}
+
+export async function getUserMonthlyStats(year = new Date().getFullYear(), month = new Date().getMonth(), day = 1) {
+  let data = await userActivityContext.getData()
+  let practices = data?.[DATA_KEY_PRACTICES] ?? {}
+  // Get the first day of the specified month and the number of days in that month
+  let firstDayOfMonth = new Date(year, month, 1)
+  let today = new Date()
+
+  let startOfMonth = getMonday(firstDayOfMonth)
+  let endOfMonth = new Date(year, month + 1, 0)
+  while (endOfMonth.getDay() !== 0) {
+    endOfMonth.setDate(endOfMonth.getDate() + 1)
+  }
+
+  let daysInMonth = Math.ceil((endOfMonth - startOfMonth) / (1000 * 60 * 60 * 24)) + 1;
+
+  let dailyStats = []
+  let practiceDuration = 0
+  let daysPracticed = 0
+  let weeklyStats = {}
+
+  for (let i = 0; i < daysInMonth; i++) {
+    let day = new Date(startOfMonth)
+    day.setDate(startOfMonth.getDate() + i)
+    let dayKey = day.toISOString().split('T')[0]
+
+    // Check if the user has activity for the day, default to 0 if undefined
+    let dayActivity = practices[dayKey] ?? null
+    let weekKey = getWeekNumber(day)
+
+    if (!weeklyStats[weekKey]) {
+      weeklyStats[weekKey] = { key: weekKey, inStreak: false };
+    }
+
+    if (dayActivity) {
+      practiceDuration += dayActivity.reduce((sum, entry) => sum + entry.duration_seconds, 0)
+      daysPracticed++;
+    }
+    let isActive = dayKey === today.toISOString().split('T')[0]
+    let type = (dayActivity !== null ? 'tracked' : (isActive ? 'active' : 'none'))
+
+    let isInStreak = dayActivity !== null;
+    if (isInStreak) {
+      weeklyStats[weekKey].inStreak = true;
+    }
+
+    dailyStats.push({
+      key: i,
+      label: dayKey,
+      isActive,
+      inStreak: dayActivity !== null,
+      type,
+    })
+  }
+
+  let filteredPractices = Object.keys(practices)
+    .filter((date) => new Date(date) <= endOfMonth)
+    .reduce((obj, key) => {
+      obj[key] = practices[key]
+      return obj
+    }, {})
+
+  let { currentDailyStreak, currentWeeklyStreak } = calculateStreaks(filteredPractices);
+
+  return { data: {
+      dailyActiveStats:  dailyStats,
+      weeklyActiveStats: Object.values(weeklyStats),
+      practiceDuration,
+      currentDailyStreak,
+      currentWeeklyStreak,
+      daysPracticed,
+    }
+  }
+}
+
+export async function getUserPractices() {
+  let data = await userActivityContext.getData()
+  return data?.[DATA_KEY_PRACTICES] ?? []
+}
+
+export async function recordUserPractice(practiceDetails) {
+  practiceDetails.auto = 0;
+  if (practiceDetails.content_id) {
+    practiceDetails.auto = 1;
+  }
+
+  await userActivityContext.update(
+    async function (localContext) {
+      let userData = localContext.data ?? { [DATA_KEY_PRACTICES]: {} };
+      localContext.data = userData;
+    },
+    async function () {
+      const response = await logUserPractice(practiceDetails);
+      if (response) {
+        await userActivityContext.updateLocal(async function (localContext) {
+          const newPractices = response.data ?? []
+          newPractices.forEach(newPractice => {
+            const { date } = newPractice;
+            if (!localContext.data[DATA_KEY_PRACTICES][date]) {
+              localContext.data[DATA_KEY_PRACTICES][date] = [];
+            }
+              localContext.data[DATA_KEY_PRACTICES][date][DATA_KEY_LAST_UPDATED_TIME] = Math.round(new Date().getTime() / 1000)
+              localContext.data[DATA_KEY_PRACTICES][date].push({
+                id: newPractice.id,
+                duration_seconds: newPractice.duration_seconds  // Add the new practice for this date
+              });
+          });
+        });
+      }
+      return response;
+    }
+  );
+}
+
+export async function updateUserPractice(id, practiceDetails) {
+  const url = `/api/user/practices/v1/practices/${id}`
+  return await fetchHandler(url, 'PUT', null, practiceDetails)
+}
+
+export async function removeUserPractice(id) {
+  let url = `/api/user/practices/v1/practices${buildQueryString([id])}`;
+  await userActivityContext.update(
+    async function (localContext) {
+      if (localContext.data?.[DATA_KEY_PRACTICES]) {
+        Object.keys(localContext.data[DATA_KEY_PRACTICES]).forEach(date => {
+          localContext.data[DATA_KEY_PRACTICES][date] = localContext.data[DATA_KEY_PRACTICES][date].filter(
+            practice => practice.id !== id
+          );
+        });
+      }
     },
-    dailyActiveStats: [
-      { label: 'M', isActive: false, inStreak: false, type: 'none' },
-      { label: 'T', isActive: false, inStreak: false, type: 'none' },
-      { label: 'W', isActive: true, inStreak: true, type: 'tracked' },
-      { label: 'T', isActive: true, inStreak: true,  type: 'tracked' },
-      { label: 'F', isActive: false, inStreak: false,  type: 'none' },
-      { label: 'S', isActive: true, inStreak: false,  type: 'active' },
-      { label: 'S', isActive: false, inStreak: false, type: 'none' }
-    ],
-  currentDailyStreak: 3,
-  currentWeeklyStreak: 2,
-  streakMessage: "That's 8 weeks in a row! Way to keep your streak going.",
-};
-
-export async function getUserActivityStats(brand) {
-  return userActivityStats;
-  //return await fetchHandler(`/api/user-activity/v1/stats`);
+    async function () {
+      return await fetchHandler(url, 'delete');
+    }
+  );
+}
+
+export async function restoreUserPractice(id) {
+  let url = `/api/user/practices/v1/practices/restore${buildQueryString([id])}`;
+  const response = await fetchHandler(url, 'put');
+  if (response?.data) {
+    await userActivityContext.updateLocal(async function (localContext) {
+      const restoredPractice = response.data;
+      const { date } = restoredPractice;
+      if (!localContext.data[DATA_KEY_PRACTICES][date]) {
+        localContext.data[DATA_KEY_PRACTICES][date] = [];
+      }
+      localContext.data[DATA_KEY_PRACTICES][date].push({
+        id: restoredPractice.id,
+        duration_seconds: restoredPractice.duration_seconds,
+      });
+    });
+  }
+  return response;
 }
 
+export async function deletePracticeSession(day) {
+  const userPracticesIds = await getUserPracticeIds(day);
+  if (!userPracticesIds.length) return [];
+
+  const url = `/api/user/practices/v1/practices${buildQueryString(userPracticesIds)}`;
+  return await fetchHandler(url, 'delete', null);
+}
+
+export async function restorePracticeSession(date) {
+  const url = `/api/user/practices/v1/practices/restore?date=${date}`;
+  return await fetchHandler(url, 'put', null);
+}
+
+export async function getPracticeSessions(day) {
+  const userPracticesIds = await getUserPracticeIds(day);
+  if (!userPracticesIds.length) return { data: { practices: [], practiceDuration: 0 } };
+
+  const meta = await fetchUserPracticeMeta(userPracticesIds);
+  const practiceDuration = meta.data.reduce((total, practice) => total + (practice.duration_seconds || 0), 0);
+  const contentIds = meta.data.map(practice => practice.content_id).filter(id => id !== null);
+
+  const contents = await fetchByRailContentIds(contentIds);
+  const getFormattedType = (type) => {
+    for (const [key, values] of Object.entries(lessonTypesMapping)) {
+      if (values.includes(type)) {
+        return key.replace(/\b\w/g, char => char.toUpperCase());
+      }
+    }
+    return null;
+  };
+
+  const formattedMeta = meta.data.map(practice => {
+    const content = contents.find(c => c.id === practice.content_id) || {};
+    return {
+      id: practice.id,
+      auto: practice.auto,
+      thumbnail: (practice.content_id)? content.thumbnail : '',
+      duration: practice.duration_seconds || 0,
+      content_url: content.url || null,
+      title: (practice.content_id)? content.title : practice.title,
+      category_id: practice.category_id || null,
+      instrument_id: practice.instrument_id || null,
+      content_type: getFormattedType(content.type || ''),
+      content_id: practice.content_id || null,
+      content_brand: content.brand || null,
+    };
+  });
+  return { data: { practices: formattedMeta, practiceDuration } };
+}
+
+
+export async function getRecentActivity() {
+  return { data: recentActivity };
+}
+
+function getStreaksAndMessage(practices)
+{
+  let { currentDailyStreak, currentWeeklyStreak } = calculateStreaks(practices)
+
+  let streakMessage = currentWeeklyStreak > 1
+    ? `That's ${currentWeeklyStreak} weeks in a row! Keep going!`
+    : `Nice! You have a ${currentDailyStreak} day streak! Way to keep it going!`
+  return {
+    currentDailyStreak,
+    currentWeeklyStreak,
+    streakMessage,
+  }
+}
+
+async function getUserPracticeIds(day = new Date().toISOString().split('T')[0]) {
+  let data = await userActivityContext.getData();
+  let practices = data?.[DATA_KEY_PRACTICES] ?? {};
+  let userPracticesIds = [];
+  Object.keys(practices).forEach(date => {
+    if (date === day) {
+      practices[date].forEach(practice => userPracticesIds.push(practice.id));
+    }
+  });
+
+  return userPracticesIds;
+}
+
+function buildQueryString(ids, paramName = 'practice_ids') {
+  if (!ids.length) return '';
+  return '?' + ids.map(id => `${paramName}[]=${id}`).join('&');
+}
+
+
+// Helper: Get start of the week (Monday)
+function getMonday(d) {
+  d = new Date(d)
+  var day = d.getDay(),
+    diff = d.getDate() - day + (day == 0 ? -6 : 1) // adjust when day is sunday
+  return new Date(d.setDate(diff))
+}
+
+// Helper: Get the week number
+function getWeekNumber(date) {
+  let startOfYear = new Date(date.getFullYear(), 0, 1)
+  let diff = date - startOfYear
+  let oneWeekMs = 7 * 24 * 60 * 60 * 1000
+  return Math.ceil((diff / oneWeekMs) + startOfYear.getDay() / 7)
+}
+
+// Helper: function to check if two dates are consecutive days
+function isNextDay(prevDateStr, currentDateStr) {
+  let prevDate = new Date(prevDateStr)
+  let currentDate = new Date(currentDateStr)
+  let diff = (currentDate - prevDate) / (1000 * 60 * 60 * 24)
+  return diff === 1
+}
+
+// Helper: Calculate streaks
+function calculateStreaks(practices) {
+  let currentDailyStreak = 0
+  let currentWeeklyStreak = 0
+
+  let sortedPracticeDays = Object.keys(practices).sort() // Ensure dates are sorted in order
+
+  if (sortedPracticeDays.length === 0) {
+    return { currentDailyStreak: 1, currentWeeklyStreak: 1 }
+  }
+
+  let dailyStreak = 0
+  let longestDailyStreak = 0
+  let prevDay = null
+
+  sortedPracticeDays.forEach((dayKey) => {
+    if (prevDay === null || isNextDay(prevDay, dayKey)) {
+      dailyStreak++
+      longestDailyStreak = Math.max(longestDailyStreak, dailyStreak)
+    } else {
+      dailyStreak = 1 // Reset streak if there's a gap
+    }
+    prevDay = dayKey
+  })
+
+  currentDailyStreak = dailyStreak
+
+  // Calculate weekly streaks
+  let weeklyStreak = 0
+  let prevWeek = null
+  let currentWeekActivity = false
+
+  sortedPracticeDays.forEach((dayKey) => {
+    let date = new Date(dayKey)
+    let weekNumber = getWeekNumber(date)
+
+    if (prevWeek === null) {
+      prevWeek = weekNumber
+      currentWeekActivity = true
+    } else if (weekNumber !== prevWeek) {
+      // A new week has started
+      if (currentWeekActivity) {
+        weeklyStreak++
+        currentWeekActivity = false
+      }
+      prevWeek = weekNumber
+    }
+
+    if (practices[dayKey]) {
+      currentWeekActivity = true
+    }
+  })
+
+  // If the user has activity in the current week, count it
+  if (currentWeekActivity) {
+    weeklyStreak++
+  }
+
+  currentWeeklyStreak = weeklyStreak
+
+  return { currentDailyStreak, currentWeeklyStreak }
+}
+
+
+
 
 

package/test/contentLikes.test.js

@@ -5,6 +5,7 @@ import {
   unlikeContent,
 } from '../src/services/contentLikes'
 import { initializeTestService } from './initializeTests'
+import { userActivityContext } from '../src/services/userActivity.js'
 
 const railContentModule = require('../src/services/railcontent.js')
 
@@ -17,6 +18,7 @@ describe('contentLikesDataContext', function () {
     mock = jest.spyOn(dataContext, 'fetchData')
     var json = JSON.parse(`{"version":${testVersion},"data":[308516,308515,308514,308518]}`)
     mock.mockImplementation(() => json)
+    dataContext.ensureLocalContextLoaded()
   })
 
   test('contentLiked', async () => {