refactored classified activity model to support multiple aggregated messages

Author: ndbroadbent

src/cache/integration.test.ts

@@ -56,11 +56,16 @@ function createCandidate(id: number, content: string): CandidateMessage {
 
 function createClassifiedActivity(id: number, activity: string, city: string): ClassifiedActivity {
   return createActivity({
-    messageId: id,
     activity,
     category: 'food',
-    originalMessage: `Lets go to ${city}`,
-    timestamp: new Date('2025-01-15T10:30:00Z'),
+    messages: [
+      {
+        id,
+        sender: 'Test User',
+        timestamp: new Date('2025-01-15T10:30:00Z'),
+        message: `Lets go to ${city}`
+      }
+    ],
     city
   })
 }

src/classifier/index.test.ts

@@ -602,9 +602,9 @@ describe('Classifier Module', () => {
 
     it('returns all activities (no filtering)', () => {
       const suggestions = [
-        createTestActivity({ messageId: 1, activity: 'Test 1' }),
-        createTestActivity({ messageId: 2, activity: 'Test 2' }),
-        createTestActivity({ messageId: 3, activity: 'Test 3' })
+        createTestActivity({ activity: 'Test 1', funScore: 0.9 }),
+        createTestActivity({ activity: 'Test 2', funScore: 0.5 }),
+        createTestActivity({ activity: 'Test 3', funScore: 0.2 })
       ]
 
       const filtered = filterActivities(suggestions)
@@ -618,10 +618,10 @@ describe('Classifier Module', () => {
 
     it('groups suggestions by category', () => {
       const suggestions = [
-        createTestActivity({ messageId: 1, activity: 'Food 1', category: 'food' }),
-        createTestActivity({ messageId: 2, activity: 'Nature 1', category: 'nature' }),
-        createTestActivity({ messageId: 3, activity: 'Food 2', category: 'food' }),
-        createTestActivity({ messageId: 4, activity: 'Entertainment 1', category: 'entertainment' })
+        createTestActivity({ activity: 'Restaurant 1', category: 'food' }),
+        createTestActivity({ activity: 'Restaurant 2', category: 'food' }),
+        createTestActivity({ activity: 'Hiking', category: 'nature' }),
+        createTestActivity({ activity: 'Movie', category: 'entertainment' })
       ]
 
       const groups = groupByCategory(suggestions)

src/classifier/index.ts

@@ -65,16 +65,20 @@ function toClassifiedActivity(
   const score = interestingScore * 2 + funScore
 
   const activity = {
-    messageId: candidate.messageId,
     activity: capitalizedTitle,
     funScore,
     interestingScore,
     score,
     category: normalizeCategory(response.cat),
     confidence: response.conf,
-    originalMessage: candidate.content,
-    sender: candidate.sender,
-    timestamp: candidate.timestamp,
+    messages: [
+      {
+        id: candidate.messageId,
+        timestamp: candidate.timestamp,
+        sender: candidate.sender,
+        message: candidate.content
+      }
+    ],
     isGeneric: response.gen,
     isCompound: response.com,
     action: response.act,

src/classifier/pronoun-resolution.integration.test.ts

@@ -82,12 +82,12 @@ describe('Classifier Pronoun Resolution', () => {
 
     expect(activity.action).toBe('visit')
     expect(activity.object).toBeOneOf(['person', 'friend'])
-    expect(activity.messageId).toBe(5)
-    expect(activity.sender).toBe('Bob Jones')
-    expect(activity.originalMessage).toBe('Can we visit her on Wednesday, please?')
+    expect(activity.messages[0]?.id).toBe(5)
+    expect(activity.messages[0]?.sender).toBe('Bob Jones')
+    expect(activity.messages[0]?.message).toBe('Can we visit her on Wednesday, please?')
     // AI may resolve "her" to "Sarah" or keep it as "her" depending on prompt
     expect(activity.activity.toLowerCase()).toContain('visit')
     // Timestamp is timezone-dependent, just verify it's a valid date
-    expect(activity.timestamp).toBeInstanceOf(Date)
+    expect(activity.messages[0]?.timestamp).toBeInstanceOf(Date)
   })
 })