musora-content-services 1.0.218 → 1.0.220

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 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.
 
+### [1.0.220](https://github.com/railroadmedia/musora-content-services/compare/v1.0.219...v1.0.220) (2024-12-06)
+
+### [1.0.219](https://github.com/railroadmedia/musora-content-services/compare/v1.0.218...v1.0.219) (2024-12-05)
+
 ### [1.0.218](https://github.com/railroadmedia/musora-content-services/compare/v1.0.209...v1.0.218) (2024-12-05)
 
 ### [1.0.217](https://github.com/railroadmedia/musora-content-services/compare/v1.0.216...v1.0.217) (2024-12-05)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "1.0.218",
+  "version": "1.0.220",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "scripts": {

package/src/contentMetaData.js

@@ -207,6 +207,27 @@ const commonMetadata ={
     },
     'coach-lessons':{
         allowableFilters: ['difficulty', 'genre', 'essential','theory','lifestyle','type'],
+    },
+    'lesson-history': {
+        name: 'Lesson History',
+        shortname: 'Lesson History',
+        icon: 'bookmark',
+        allowableFilters: ['difficulty', 'type'],
+        sortBy: '-published_on',
+        tabs: [
+            {
+                name: 'In Progress',
+                short_name: 'IN PROGRESS',
+                is_group_by: false,
+                value: 'inProgress',
+            },
+            {
+                name: 'Completed',
+                short_name: 'COMPLETED',
+                is_group_by: false,
+                value: 'completed',
+            },
+        ]
     }
 }
 const contentMetadata = {
@@ -219,7 +240,7 @@ const contentMetadata = {
             sortBy: '-published_on',
         },
         'song': {
-            sortBy: 'slug',
+            sortBy: '-published_on',
         },
         'student-review' : null,
         'student-focus': {
@@ -748,7 +769,7 @@ const contentMetadata = {
             shortname: 'songs',
             amountOfFutureLessonsToShow: 3,
             showFutureLessonAtTopOrBottom: 'bottom',
-            sortBy: 'slug',
+            sortBy: '-published_on',
         },
         'course': {
             thumbnailUrl: 'https://dpwjbsxqtam5n.cloudfront.net/shows/pianote/courses.jpg',

package/src/services/contentProgress.js

@@ -135,8 +135,11 @@ function saveContentProgress(localContext, contentId, progress, currentSeconds,
     }
 
     let data = localContext.data[contentId] ?? {};
-    data[DATA_KEY_PROGRESS] = progress;
-    data[DATA_KEY_STATUS] = STATE_STARTED;
+    const currentProgress = data[DATA_KEY_STATUS];
+    if (!currentProgress || currentProgress !== STATE_COMPLETED) {
+        data[DATA_KEY_PROGRESS] = progress;
+        data[DATA_KEY_STATUS] = STATE_STARTED;
+    }
     data[DATA_KEY_RESUME_TIME] = currentSeconds;
     data[DATA_KEY_LAST_UPDATED_TIME] = Math.round(new Date().getTime() / 1000);
     localContext.data[contentId] = data;

package/src/services/sanity.js

@@ -1082,7 +1082,11 @@ export async function fetchNextPreviousLesson(railcontentId) {
     let sortBy = processedData?.sortBy ?? 'published_on';
     const isDesc = sortBy.startsWith('-');
     sortBy = isDesc ? sortBy.substring(1) : sortBy;
-    const sortValue = document[sortBy];
+    let sortValue = document[sortBy];
+    if (sortValue == null) {
+        sortBy = 'railcontent_id';
+        sortValue = document['railcontent_id'];
+    }
     const isNumeric = !isNaN(sortValue);
     let prevComparison = isNumeric ? `${sortBy} <= ${sortValue}` : `${sortBy} <= "${sortValue}"`;
     let nextComparison = isNumeric ? `${sortBy} >= ${sortValue}` : `${sortBy} >= "${sortValue}"`;

package/test/contentProgress.test.js

@@ -131,6 +131,16 @@ describe('contentProgressDataContext', function () {
 
     });
 
+    // test('completedProgressNotOverwritten', async () => {
+    //     const contentId = 241262;
+    //     let progress = await getProgressPercentage(241250); //force load context
+    //     await contentStatusCompleted(contentId);
+    //     await recordWatchSession(contentId, "video", "vimeo", 100, 50, 50);
+    //     progress = await getProgressPercentage(contentId);
+    //     expect(progress).toBe(100);
+    // });
+
+
     test('assignmentCompleteBubbling', async () => {
         let assignmentId = 286048;
         let contentId = 286047;

package/test/sanityQueryService.test.js

@@ -633,6 +633,19 @@ describe('Sanity Queries', function () {
         expect(documentPublishedOn.getTime()).toBeLessThan(nextDocumentPublishedOn.getTime());
     });
 
+    test('fetchNextPreviousLesson-Song', async () => {
+        const id = 414041;
+        const response = await fetchNextPreviousLesson(id);
+        const document = await fetchByRailContentId(id, 'song');
+        const documentPublishedOn = new Date(document.published_on);
+        const prevDocumentPublishedOn = new Date(response.prevLesson.published_on);
+        const nextDocumentPublishedOn = new Date(response.nextLesson.published_on);
+        expect(response.prevLesson).toBeDefined();
+        expect(prevDocumentPublishedOn.getTime()).toBeLessThanOrEqual(documentPublishedOn.getTime());
+        expect(response.nextLesson).toBeDefined();
+        expect(documentPublishedOn.getTime()).toBeLessThanOrEqual(nextDocumentPublishedOn.getTime());
+    });
+
     test('fetchTopLevelParentId', async () => {
         let contentId = await fetchTopLevelParentId(241250);
         expect(contentId).toBe(241247);