Changeset 0.29.0 (#195)

server/compaction/scanner.go

@@ -2,12 +2,10 @@ package compaction
 
 import (
 	"context"
-	"encoding/json"
 	"log"
 	"sync"
 	"time"
 
-	"git.gobha.me/xcaliber/chat-switchboard/database"
 	"git.gobha.me/xcaliber/chat-switchboard/models"
 	"git.gobha.me/xcaliber/chat-switchboard/roles"
 	"git.gobha.me/xcaliber/chat-switchboard/store"
@@ -236,47 +234,12 @@ func (sc *Scanner) findCandidates(ctx context.Context) []models.Channel {
 	activityGap := time.Now().Add(-candidateActivityGap)
 	maxAge := time.Now().Add(-candidateMaxAge)
 
-	rows, err := database.DB.QueryContext(ctx, `
-		SELECT c.id, c.user_id, COALESCE(c.model, ''), COALESCE(c.settings::text, '{}'),
-		       COUNT(m.id) AS msg_count,
-		       COALESCE(SUM(LENGTH(m.content)), 0) AS total_chars
-		FROM channels c
-		JOIN messages m ON m.channel_id = c.id AND m.deleted_at IS NULL
-		WHERE c.type = 'direct'
-		  AND c.is_archived = false
-		  AND c.updated_at < $1
-		  AND c.updated_at > $2
-		GROUP BY c.id
-		HAVING COUNT(m.id) >= $3
-		   AND COALESCE(SUM(LENGTH(m.content)), 0) > $4
-		ORDER BY c.updated_at DESC
-		LIMIT $5
-	`, activityGap,
-		maxAge,
-		candidateMinMessages,
-		candidateMinChars,
-		candidateBatchSize,
-	)
+	candidates, err := sc.stores.Channels.FindCompactionCandidates(ctx,
+		activityGap, maxAge, candidateMinMessages, candidateMinChars, candidateBatchSize)
 	if err != nil {
 		log.Printf("⚠ compaction: candidate query failed: %v", err)
 		return nil
 	}
-	defer rows.Close()
-
-	var candidates []models.Channel
-	for rows.Next() {
-		var ch models.Channel
-		var settingsRaw string
-		var msgCount, totalChars int
-		if err := rows.Scan(&ch.ID, &ch.UserID, &ch.Model, &settingsRaw, &msgCount, &totalChars); err != nil {
-			log.Printf("⚠ compaction: candidate scan: %v", err)
-			continue
-		}
-		if settingsRaw != "" {
-			_ = json.Unmarshal([]byte(settingsRaw), &ch.Settings)
-		}
-		candidates = append(candidates, ch)
-	}
 
 	return candidates
 }