refactor(collections): rule evaluators take the real row; both 45-field converter twins deleted
checkRulesAgainstBook/evaluateRule and the service's EvaluateRules existed in two parallel universes: one over database.MediaItems (what every query actually returns) and one over ListMediaItemsRow (what two hand-written 45-field mediaItemsToListMediaItemsRow converters produced — verbatim twins in the handler and the dashboard service, with a URL-resolution side effect baked into a "converter"). The rule fields (genre/series/author/language/publisher/copyright_year/tags) all exist on MediaItems, so the evaluators now take the real row and the converters, their three call-site loops, and the dead ApplyAutoAssignRules entry point (zero callers) are gone. The rules surface is wire-covered by the collections rules scenarios; handlers+services suites and the full pin/H1/H3 battery green.
This commit is contained in:
1 parent
b47a2b86a7
commit
18727fef93
7 files changed
+54
-193
No files matched your search
@@ -509,7 +509,7 @@ func (s *CollectionService) mediaItemMatchesRule(item database.MediaItems, rule
|
||||
}
|
||||
|
||||
// EvaluateRules evaluates auto-assign rules for a media item
|
||||
func (s *CollectionService) EvaluateRules(mediaItem database.ListMediaItemsRow, rules []Rule) []RuleEvaluation {
|
||||
func (s *CollectionService) EvaluateRules(mediaItem database.MediaItems, rules []Rule) []RuleEvaluation {
|
||||
var evaluations []RuleEvaluation
|
||||
|
||||
// Sort rules by priority (higher priority first)
|
||||
@@ -708,40 +708,6 @@ func (s *CollectionService) DeleteDeviceShelfMapping(ctx context.Context, mappin
|
||||
return nil
|
||||
}
|
||||
|
||||
// ApplyAutoAssignRules applies auto-assign rules for all collections to a media item
|
||||
func (s *CollectionService) ApplyAutoAssignRules(ctx context.Context, mediaItem database.ListMediaItemsRow, userID uuid.UUID) ([]uuid.UUID, error) {
|
||||
var matchedCollectionIDs []uuid.UUID
|
||||
|
||||
collections, err := s.GetUserCollections(ctx, userID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get user collections: %v", err)
|
||||
}
|
||||
|
||||
for _, collection := range collections {
|
||||
if len(collection.AutoAssignRules) == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
var rules []Rule
|
||||
if err := json.Unmarshal(collection.AutoAssignRules, &rules); err != nil {
|
||||
continue
|
||||
}
|
||||
|
||||
evaluations := s.EvaluateRules(mediaItem, rules)
|
||||
|
||||
// Check if any rules match
|
||||
for _, eval := range evaluations {
|
||||
if eval.Matches && eval.Confidence > 0.7 {
|
||||
matchedCollectionIDs = append(matchedCollectionIDs, uuid.UUID(collection.ID.Bytes))
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return matchedCollectionIDs, nil
|
||||
}
|
||||
|
||||
// Helper functions (Go standard library functions)
|
||||
func toLower(s string) string {
|
||||
if len(s) == 0 {
|
||||
return s
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
func TestEvaluateRules_Equality(t *testing.T) {
|
||||
service := &CollectionService{}
|
||||
|
||||
mediaItem := database.ListMediaItemsRow{
|
||||
mediaItem := database.MediaItems{
|
||||
Genre: pgtype.Text{String: "Science Fiction", Valid: true},
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ func TestEvaluateRules_Equality(t *testing.T) {
|
||||
func TestEvaluateRules_NoMatch(t *testing.T) {
|
||||
service := &CollectionService{}
|
||||
|
||||
mediaItem := database.ListMediaItemsRow{
|
||||
mediaItem := database.MediaItems{
|
||||
Genre: pgtype.Text{String: "Fantasy", Valid: true},
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@ func TestEvaluateRules_NoMatch(t *testing.T) {
|
||||
func TestEvaluateRules_Contains(t *testing.T) {
|
||||
service := &CollectionService{}
|
||||
|
||||
mediaItem := database.ListMediaItemsRow{
|
||||
mediaItem := database.MediaItems{
|
||||
Series: pgtype.Text{String: "The Expanse", Valid: true},
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ func TestEvaluateRules_Contains(t *testing.T) {
|
||||
func TestEvaluateRules_PriorityOrder(t *testing.T) {
|
||||
service := &CollectionService{}
|
||||
|
||||
mediaItem := database.ListMediaItemsRow{
|
||||
mediaItem := database.MediaItems{
|
||||
Genre: pgtype.Text{String: "Science Fiction", Valid: true},
|
||||
Series: pgtype.Text{String: "Foundation", Valid: true},
|
||||
}
|
||||
@@ -150,7 +150,7 @@ func TestEvaluateRules_PriorityOrder(t *testing.T) {
|
||||
func TestEvaluateRules_CopyrightYear(t *testing.T) {
|
||||
service := &CollectionService{}
|
||||
|
||||
mediaItem := database.ListMediaItemsRow{
|
||||
mediaItem := database.MediaItems{
|
||||
CopyrightYear: pgtype.Int4{Int32: 2020, Valid: true},
|
||||
}
|
||||
|
||||
@@ -178,7 +178,7 @@ func TestEvaluateRules_CopyrightYear(t *testing.T) {
|
||||
func TestEvaluateRules_MissingField(t *testing.T) {
|
||||
service := &CollectionService{}
|
||||
|
||||
mediaItem := database.ListMediaItemsRow{}
|
||||
mediaItem := database.MediaItems{}
|
||||
|
||||
rules := []Rule{
|
||||
{
|
||||
@@ -204,7 +204,7 @@ func TestEvaluateRules_MissingField(t *testing.T) {
|
||||
func TestEvaluateRules_CaseInsensitive(t *testing.T) {
|
||||
service := &CollectionService{}
|
||||
|
||||
mediaItem := database.ListMediaItemsRow{
|
||||
mediaItem := database.MediaItems{
|
||||
Genre: pgtype.Text{String: "science fiction", Valid: true},
|
||||
}
|
||||
|
||||
@@ -232,7 +232,7 @@ func TestEvaluateRules_CaseInsensitive(t *testing.T) {
|
||||
func TestEvaluateRules_PriorityBoost(t *testing.T) {
|
||||
service := &CollectionService{}
|
||||
|
||||
mediaItem := database.ListMediaItemsRow{
|
||||
mediaItem := database.MediaItems{
|
||||
Genre: pgtype.Text{String: "Science Fiction", Valid: true},
|
||||
}
|
||||
|
||||
|
||||
@@ -13,55 +13,6 @@ import (
|
||||
"github.com/jackc/pgx/v5/pgtype"
|
||||
)
|
||||
|
||||
func mediaItemsToListMediaItemsRow(item database.MediaItems) database.ListMediaItemsRow {
|
||||
return database.ListMediaItemsRow{
|
||||
ID: item.ID,
|
||||
LibraryID: item.LibraryID,
|
||||
Title: item.Title,
|
||||
Author: item.Author,
|
||||
Isbn: item.Isbn,
|
||||
Description: item.Description,
|
||||
FilePath: utils.ResolveMediaURL(item.LibraryID, pgtype.Text{String: item.FilePath, Valid: true}),
|
||||
FileSize: item.FileSize,
|
||||
MimeType: item.MimeType,
|
||||
CoverImagePath: pgtype.Text{String: utils.ResolveMediaURL(item.LibraryID, item.CoverImagePath), Valid: true},
|
||||
Series: item.Series,
|
||||
SeriesNumber: item.SeriesNumber,
|
||||
Tags: item.Tags,
|
||||
Asin: item.Asin,
|
||||
DatePublished: item.DatePublished,
|
||||
Publisher: item.Publisher,
|
||||
Contributors: item.Contributors,
|
||||
Language: item.Language,
|
||||
Edition: item.Edition,
|
||||
PageCount: item.PageCount,
|
||||
Genre: item.Genre,
|
||||
CopyrightYear: item.CopyrightYear,
|
||||
GoodreadsID: item.GoodreadsID,
|
||||
OpenlibraryID: item.OpenlibraryID,
|
||||
GoogleBooksID: item.GoogleBooksID,
|
||||
AddedByAdminID: item.AddedByAdminID,
|
||||
CreatedAt: item.CreatedAt,
|
||||
UpdatedAt: item.UpdatedAt,
|
||||
FormatGroup: item.FormatGroup,
|
||||
FormatMimetype: item.FormatMimetype,
|
||||
IsReflowable: item.IsReflowable,
|
||||
HasFixedLayout: item.HasFixedLayout,
|
||||
TotalCharacters: item.TotalCharacters,
|
||||
ChapterCount: item.ChapterCount,
|
||||
EntitlementID: item.EntitlementID,
|
||||
RevisionNumber: item.RevisionNumber,
|
||||
KoboContentID: item.KoboContentID,
|
||||
KoboMetadata: item.KoboMetadata,
|
||||
TagsSearch: item.TagsSearch,
|
||||
ContributorsSearch: item.ContributorsSearch,
|
||||
FileSha256: item.FileSha256,
|
||||
OpfIdentifier: item.OpfIdentifier,
|
||||
OpfUuid: item.OpfUuid,
|
||||
HashConfidence: item.HashConfidence,
|
||||
}
|
||||
}
|
||||
|
||||
func getCollectionItemsRowToMediaItems(item database.GetCollectionItemsForDashboardRow) database.MediaItems {
|
||||
return database.MediaItems{
|
||||
ID: item.ID,
|
||||
@@ -353,8 +304,7 @@ func (s *DashboardService) getUserCollectionItems(ctx context.Context, coll data
|
||||
continue
|
||||
}
|
||||
|
||||
listItem := mediaItemsToListMediaItemsRow(item)
|
||||
evaluations := s.collectionService.EvaluateRules(listItem, rules)
|
||||
evaluations := s.collectionService.EvaluateRules(item, rules)
|
||||
for _, eval := range evaluations {
|
||||
if eval.Matches {
|
||||
autoItems = append(autoItems, item)
|
||||
|
||||
@@ -561,9 +561,9 @@ type UsageItemStats struct {
|
||||
Title string `json:"title"`
|
||||
Author string `json:"author"`
|
||||
CoverImage string `json:"cover_image_path"`
|
||||
Seconds float64 `json:"seconds"` // audio duration (0 unless hours_mode)
|
||||
PageCount int `json:"pages"` // text pages (0 unless !hours_mode)
|
||||
SizeBytes int64 `json:"size"` // always set, both modes
|
||||
Seconds float64 `json:"seconds"` // audio duration (0 unless hours_mode)
|
||||
PageCount int `json:"pages"` // text pages (0 unless !hours_mode)
|
||||
SizeBytes int64 `json:"size"` // always set, both modes
|
||||
}
|
||||
|
||||
// LibraryUsageStats is the whole tab payload for one scope: "" LibraryID
|
||||
@@ -573,18 +573,18 @@ type UsageItemStats struct {
|
||||
// text pages. TotalSeconds/TotalPages both always carry their sums so
|
||||
// the client never has to infer.
|
||||
type LibraryUsageStats struct {
|
||||
LibraryID string `json:"library_id"`
|
||||
Items int `json:"items"`
|
||||
Authors int `json:"authors"`
|
||||
Narrators int `json:"narrators"`
|
||||
TotalSizeBytes int64 `json:"total_size_bytes"`
|
||||
TotalSeconds int64 `json:"total_seconds"`
|
||||
TotalPages int `json:"total_pages"`
|
||||
HoursMode bool `json:"hours_mode"`
|
||||
Genres []NameCountStats `json:"genres"`
|
||||
AuthorsTop []NameCountStats `json:"top_authors"`
|
||||
LongestItems []UsageItemStats `json:"longest_items"`
|
||||
LargestItems []UsageItemStats `json:"largest_items"`
|
||||
LibraryID string `json:"library_id"`
|
||||
Items int `json:"items"`
|
||||
Authors int `json:"authors"`
|
||||
Narrators int `json:"narrators"`
|
||||
TotalSizeBytes int64 `json:"total_size_bytes"`
|
||||
TotalSeconds int64 `json:"total_seconds"`
|
||||
TotalPages int `json:"total_pages"`
|
||||
HoursMode bool `json:"hours_mode"`
|
||||
Genres []NameCountStats `json:"genres"`
|
||||
AuthorsTop []NameCountStats `json:"top_authors"`
|
||||
LongestItems []UsageItemStats `json:"longest_items"`
|
||||
LargestItems []UsageItemStats `json:"largest_items"`
|
||||
}
|
||||
|
||||
// LibraryUsage builds the /stats Library tab payload for one scope.
|
||||
|
||||
Reference in new issue
Block a user