fix: improve mappings for the fetch (again)

Author: gsanchietti

service/messages.go

@@ -223,7 +223,11 @@ func (s *MessageService) FetchMessages(ctx context.Context, req *models.FetchMes
 
 // resolveMatrixUser resolves an identifier to a valid Matrix user ID.
 // If the identifier is already a valid Matrix user ID (starts with @), it's returned as-is.
-// Otherwise, it tries to look up the identifier in the mapping store (e.g., phone number to user).
+// Otherwise, it tries to look up the identifier in the mapping store with the following logic:
+//   - First tries to match the identifier as the main number
+//   - If no match, tries to find the identifier in any entry's sub_numbers array
+//     (if a sub_number matches, returns the matrix_id of that entry)
+//
 // Returns empty string if the identifier cannot be resolved.
 func (s *MessageService) resolveMatrixUser(identifier string) id.UserID {
 	identifier = strings.TrimSpace(identifier)
@@ -239,6 +243,19 @@ func (s *MessageService) resolveMatrixUser(identifier string) id.UserID {
 		return id.UserID(entry.MatrixID)
 	}
 
+	// If not found as main number, try to find it in any sub_numbers
+	s.mu.RLock()
+	for _, entry := range s.mappings {
+		for _, subNum := range entry.SubNumbers {
+			if strings.EqualFold(strings.TrimSpace(subNum), identifier) {
+				s.mu.RUnlock()
+				logger.Debug().Str("original_identifier", identifier).Str("sub_number", subNum).Str("resolved_user", entry.MatrixID).Msg("identifier resolved from sub_number mapping")
+				return id.UserID(entry.MatrixID)
+			}
+		}
+	}
+	s.mu.RUnlock()
+
 	// Could not resolve
 	logger.Warn().Str("identifier", identifier).Msg("identifier could not be resolved to a Matrix user ID")
 	return ""

service/messages_test.go

@@ -365,6 +365,85 @@ func TestLoadMappingsFromFile_InvalidJSON(t *testing.T) {
 	assert.Contains(t, err.Error(), "failed to parse mapping file")
 }
 
+func TestResolveMatrixUser_SubNumbers(t *testing.T) {
+	// Test case 1: Resolve sub_number to matrix_id
+	t.Run("resolve sub_number to matrix_id", func(t *testing.T) {
+		svc := NewMessageService(nil, nil)
+		svc.SaveMapping(&models.MappingRequest{
+			Number:     "201",
+			MatrixID:   "@giacomo:example.com",
+			RoomID:     "!room1:example.com",
+			UserName:   "Giacomo Rossi",
+			SubNumbers: []string{"3344", "91201"},
+		})
+
+		// Resolve using a sub_number
+		result := svc.resolveMatrixUser("91201")
+		assert.Equal(t, "@giacomo:example.com", string(result), "should resolve sub_number to matrix_id")
+	})
+
+	// Test case 2: Resolve main number to matrix_id
+	t.Run("resolve main number to matrix_id", func(t *testing.T) {
+		svc := NewMessageService(nil, nil)
+		svc.SaveMapping(&models.MappingRequest{
+			Number:   "202",
+			MatrixID: "@mario:example.com",
+			RoomID:   "!room2:example.com",
+			UserName: "Mario Bianchi",
+		})
+
+		// Resolve using the main number
+		result := svc.resolveMatrixUser("202")
+		assert.Equal(t, "@mario:example.com", string(result), "should resolve main number to matrix_id")
+	})
+
+	// Test case 3: Resolve another sub_number
+	t.Run("resolve another sub_number", func(t *testing.T) {
+		svc := NewMessageService(nil, nil)
+		svc.SaveMapping(&models.MappingRequest{
+			Number:     "201",
+			MatrixID:   "@giacomo:example.com",
+			RoomID:     "!room1:example.com",
+			UserName:   "Giacomo Rossi",
+			SubNumbers: []string{"3344", "91201"},
+		})
+
+		// Resolve using a different sub_number
+		result := svc.resolveMatrixUser("3344")
+		assert.Equal(t, "@giacomo:example.com", string(result), "should resolve any sub_number to matrix_id")
+	})
+
+	// Test case 4: Matrix ID passed directly
+	t.Run("matrix id passed directly", func(t *testing.T) {
+		svc := NewMessageService(nil, nil)
+		result := svc.resolveMatrixUser("@test:example.com")
+		assert.Equal(t, "@test:example.com", string(result), "should return matrix_id as-is if it starts with @")
+	})
+
+	// Test case 5: No mapping found
+	t.Run("no mapping found", func(t *testing.T) {
+		svc := NewMessageService(nil, nil)
+		result := svc.resolveMatrixUser("9999")
+		assert.Equal(t, "", string(result), "should return empty string if no mapping found")
+	})
+
+	// Test case 6: Case insensitivity
+	t.Run("case insensitive sub_number resolution", func(t *testing.T) {
+		svc := NewMessageService(nil, nil)
+		svc.SaveMapping(&models.MappingRequest{
+			Number:     "201",
+			MatrixID:   "@giacomo:example.com",
+			RoomID:     "!room1:example.com",
+			UserName:   "Giacomo Rossi",
+			SubNumbers: []string{"3344", "91201"},
+		})
+
+		// Resolve with different case (though phone numbers are typically numeric)
+		result := svc.resolveMatrixUser("91201")
+		assert.Equal(t, "@giacomo:example.com", string(result), "should resolve case-insensitively")
+	})
+}
+
 func TestResolveMatrixIDToIdentifier_SubNumbers(t *testing.T) {
 	// Test case 1: Resolve via sub_number match
 	// When a matrix_id matches one of the sub_numbers, the main number should be returned (not the sub_number)