musora-content-services 2.93.1 → 2.94.1

package/src/services/sync/models/ContentProgress.ts

@@ -3,7 +3,7 @@ import { SYNC_TABLES } from '../schema'
 
 export enum COLLECTION_TYPE {
   SKILL_PACK = 'skill-pack',
-  LEARNING_PATH = 'learning-path',
+  LEARNING_PATH = 'learning-path-v2',
   PLAYLIST = 'playlist',
 }
 

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

@@ -115,10 +115,10 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     return await this.queryAll(...clauses)
   }
 
-  recordProgressRemotely(contentId: number, collection: { type: COLLECTION_TYPE; id: number } | null, progressPct: number, resumeTime?: number) {
+  recordProgress(contentId: number, collection: { type: COLLECTION_TYPE; id: number } | null, progressPct: number, resumeTime?: number) {
     const id = ProgressRepository.generateId(contentId, collection)
 
-    return this.upsertOneRemote(id, (r) => {
+    return this.upsertOne(id, (r) => {
       r.content_id = contentId
       r.collection_type = collection?.type ?? null
       r.collection_id = collection?.id ?? null
@@ -132,12 +132,16 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     })
   }
 
-  recordProgressesTentative(contentProgresses: Map<number, number>, collection: { type: COLLECTION_TYPE; id: number } | null) {
-    return this.upsertSomeTentative(
+  recordProgresses(
+    contentIds: number[],
+    collection: { type: COLLECTION_TYPE; id: number } | null,
+    progressPct: number
+  ) {
+    return this.upsertSome(
       Object.fromEntries(
-        Array.from(contentProgresses, ([contentId, progressPct]) => [
-          ProgressRepository.generateId(contentId, null),
-          (r) => {
+        contentIds.map((contentId) => [
+          ProgressRepository.generateId(contentId, collection),
+          (r: ContentProgress) => {
             r.content_id = contentId
             r.collection_type = collection?.type ?? null
             r.collection_id = collection?.id ?? null
@@ -150,6 +154,29 @@ export default class ProgressRepository extends SyncRepository<ContentProgress>
     )
   }
 
+  recordProgressesTentative(
+    contentProgresses: Record<string, number>, // Accept plain object
+    collection: { type: COLLECTION_TYPE; id: number } | null
+  ) {
+    const data = Object.fromEntries(
+      Object.entries(contentProgresses).map(([contentId, progressPct]) => {
+        const generatedId = ProgressRepository.generateId(Number(contentId), collection)
+        console.log('Processing:', { contentId, progressPct, generatedId, collection })
+        return [
+          generatedId,
+          (record: ContentProgress) => {
+            record.content_id = Number(contentId)
+            record.collection_type = collection?.type ?? null
+            record.collection_id = collection?.id ?? null
+            record.state = progressPct === 100 ? STATE.COMPLETED : STATE.STARTED
+            record.progress_percent = progressPct
+          },
+        ]
+      })
+    )
+    return this.upsertSomeTentative(data)
+  }
+
   eraseProgress(contentId: number, collection: { type: COLLECTION_TYPE; id: number } | null) {
     return this.deleteOne(ProgressRepository.generateId(contentId, collection))
   }

package/src/services/userActivity.js

@@ -40,6 +40,7 @@ import dayjs from 'dayjs'
 import { addContextToContent } from './contentAggregator.js'
 import { getMethodCard } from './progress-row/method-card.js'
 import { db, Q } from './sync'
+import {COLLECTION_TYPE} from "./sync/models/ContentProgress";
 
 const DATA_KEY_PRACTICES = 'practices'
 
@@ -1039,7 +1040,7 @@ export async function getProgressRows({ brand = 'drumeo', limit = 8 } = {}) {
       switch (item.type) {
         case 'playlist':
           return processPlaylistItem(item)
-        case 'learning-path-v2':
+        case COLLECTION_TYPE.LEARNING_PATH:
         case 'method':
           return item
         default:
@@ -1282,7 +1283,7 @@ function mergeAndSortItems(items, limit) {
 
 export function findIncompleteLesson(progressOnItems, currentContentId, contentType) {
   const ids = Object.keys(progressOnItems).map(Number)
-  if (contentType === 'guided-course' || contentType === 'learning-path-v2') {
+  if (contentType === 'guided-course' || contentType === COLLECTION_TYPE.LEARNING_PATH) {
     // Return first incomplete lesson
     return ids.find((id) => progressOnItems[id] !== 'completed') || ids.at(0)
   }

package/test/reporting.test.js

@@ -0,0 +1,132 @@
+/**
+ * Tests for Reporting Service
+ *
+ * Note: These tests use mocked HTTP calls. For integration tests,
+ * ensure the backend API is running at the configured baseUrl.
+ */
+
+import { initializeTestService } from './initializeTests.js'
+import {
+  reportContent,
+  reportForumPost,
+  submitReport
+} from '../src/services/reporting/reporting.ts'
+
+// Mock HttpClient to avoid actual API calls in tests
+jest.mock('../src/infrastructure/http/HttpClient', () => {
+  return {
+    HttpClient: jest.fn().mockImplementation(() => ({
+      post: jest.fn().mockResolvedValue({
+        report_id: 12345,
+        message: 'Report submitted successfully',
+        is_duplicate: false
+      })
+    }))
+  }
+})
+
+describe('Reporting Service', () => {
+  beforeEach(() => {
+    initializeTestService()
+  })
+
+  describe('reportContent', () => {
+    test('should submit a content report with video_not_working category', async () => {
+      const result = await reportContent({
+        contentId: 123,
+        category: 'video_not_working',
+        description: 'Video freezes at 2:30'
+      })
+
+      expect(result).toBeDefined()
+      expect(result.report_id).toBe(12345)
+      expect(result.message).toBe('Report submitted successfully')
+      expect(result.is_duplicate).toBe(false)
+    })
+
+    test('should submit a content report without description', async () => {
+      const result = await reportContent({
+        contentId: 456,
+        category: 'incorrect_content'
+      })
+
+      expect(result).toBeDefined()
+      expect(result.report_id).toBeDefined()
+    })
+
+    test('should submit a content report with other category and description', async () => {
+      const result = await reportContent({
+        contentId: 789,
+        category: 'other',
+        description: 'Audio quality is very poor'
+      })
+
+      expect(result).toBeDefined()
+      expect(result.report_id).toBeDefined()
+      expect(result.message).toBeDefined()
+    })
+  })
+
+  describe('reportForumPost', () => {
+    test('should submit a forum post report with required brand', async () => {
+      const result = await reportForumPost({
+        postId: 555,
+        brand: 'drumeo',
+        category: 'spam'
+      })
+
+      expect(result).toBeDefined()
+      expect(result.report_id).toBeDefined()
+    })
+
+    test('should submit a forum post report with description', async () => {
+      const result = await reportForumPost({
+        postId: 666,
+        brand: 'pianote',
+        category: 'harassment',
+        description: 'User is harassing other members'
+      })
+
+      expect(result).toBeDefined()
+      expect(result.report_id).toBeDefined()
+      expect(result.message).toBeDefined()
+    })
+  })
+
+  describe('submitReport', () => {
+    test('should submit a generic report for content', async () => {
+      const result = await submitReport({
+        reportableType: 'content',
+        reportableId: 999,
+        category: 'technical_issue',
+        description: 'Page not loading'
+      })
+
+      expect(result).toBeDefined()
+      expect(result.report_id).toBeDefined()
+    })
+
+    test('should submit a generic report for playlist', async () => {
+      const result = await submitReport({
+        reportableType: 'playlist',
+        reportableId: 777,
+        category: 'incorrect_content'
+      })
+
+      expect(result).toBeDefined()
+      expect(result.report_id).toBeDefined()
+    })
+
+    test('should submit a generic report for comment', async () => {
+      const result = await submitReport({
+        reportableType: 'comment',
+        reportableId: 888,
+        category: 'inappropriate',
+        description: 'Comment contains offensive language'
+      })
+
+      expect(result).toBeDefined()
+      expect(result.report_id).toBeDefined()
+    })
+  })
+})