Mrixs/NaviWatcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: address code review findings

Browse Source 
- Fix notifications_sent schema: change to composite PK (rgid, sent_at) per plan spec, remove FK constraint
- Change MarkNotificationSent from INSERT OR REPLACE to INSERT (composite PK semantics)
- Update test: replace idempotent test with duplicate-second and different-time tests
- Refactor UpdateArtistSettings to use switch-based column validation instead of fmt.Sprintf with map lookup
- Remove generated coverage.out from repo, add to .gitignore

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Vladimir Zagainov
2026-05-20 11:23:22 +03:00
parent 47d4ec4e32
commit c23b698f67
6 changed files with 91 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -4,3 +4,4 @@ naviwatcher-linux
naviwatcher-mac
naviwatcher.exe
data/
coverage.out

139
coverage.out
View File

@@ -1,139 +0,0 @@
mode: set
naviwatcher/internal/config/config.go:58.47,60.16 2 1
naviwatcher/internal/config/config.go:60.16,62.3 1 1
naviwatcher/internal/config/config.go:64.2,65.51 2 1
naviwatcher/internal/config/config.go:65.51,67.3 1 1
naviwatcher/internal/config/config.go:69.2,71.39 2 1
naviwatcher/internal/config/config.go:71.39,73.3 1 1
naviwatcher/internal/config/config.go:75.2,75.18 1 1
naviwatcher/internal/config/config.go:79.33,80.27 1 1
naviwatcher/internal/config/config.go:80.27,82.3 1 1
naviwatcher/internal/config/config.go:83.2,83.26 1 1
naviwatcher/internal/config/config.go:83.26,85.3 1 1
naviwatcher/internal/config/config.go:86.2,86.37 1 1
naviwatcher/internal/config/config.go:86.37,88.3 1 1
naviwatcher/internal/config/config.go:92.34,93.29 1 1
naviwatcher/internal/config/config.go:93.29,95.3 1 1
naviwatcher/internal/config/config.go:96.2,96.30 1 1
naviwatcher/internal/config/config.go:96.30,98.3 1 1
naviwatcher/internal/config/config.go:99.2,99.34 1 1
naviwatcher/internal/config/config.go:99.34,101.3 1 1
naviwatcher/internal/config/config.go:102.2,102.52 1 1
naviwatcher/internal/config/config.go:102.52,104.3 1 1
naviwatcher/internal/config/config.go:105.2,105.74 1 1
naviwatcher/internal/config/config.go:105.74,107.3 1 1
naviwatcher/internal/config/config.go:108.2,108.37 1 1
naviwatcher/internal/config/config.go:108.37,110.3 1 1
naviwatcher/internal/config/config.go:111.2,111.12 1 1
naviwatcher/cmd/naviwatcher/main.go:17.13,24.16 5 0
naviwatcher/cmd/naviwatcher/main.go:24.16,26.3 1 0
naviwatcher/cmd/naviwatcher/main.go:28.2,36.12 6 0
naviwatcher/cmd/naviwatcher/main.go:36.12,40.3 3 0
naviwatcher/cmd/naviwatcher/main.go:42.2,42.38 1 0
naviwatcher/cmd/naviwatcher/main.go:42.38,44.3 1 0
naviwatcher/cmd/naviwatcher/main.go:46.2,46.37 1 0
naviwatcher/cmd/naviwatcher/main.go:49.57,57.2 3 1
naviwatcher/internal/database/artist_settings.go:9.68,15.16 3 1
naviwatcher/internal/database/artist_settings.go:15.16,17.3 1 1
naviwatcher/internal/database/artist_settings.go:18.2,18.16 1 1
naviwatcher/internal/database/artist_settings.go:22.65,27.16 2 1
naviwatcher/internal/database/artist_settings.go:27.16,29.3 1 0
naviwatcher/internal/database/artist_settings.go:30.2,30.12 1 1
naviwatcher/internal/database/artist_settings.go:34.61,38.16 2 1
naviwatcher/internal/database/artist_settings.go:38.16,40.3 1 0
naviwatcher/internal/database/artist_settings.go:41.2,44.18 3 1
naviwatcher/internal/database/artist_settings.go:44.18,46.106 2 1
naviwatcher/internal/database/artist_settings.go:46.106,48.4 1 0
naviwatcher/internal/database/artist_settings.go:49.3,49.31 1 1
naviwatcher/internal/database/artist_settings.go:51.2,51.35 1 1
naviwatcher/internal/database/artist_settings.go:51.35,53.3 1 0
naviwatcher/internal/database/artist_settings.go:54.2,54.21 1 1
naviwatcher/internal/database/artist_settings.go:59.84,70.32 4 1
naviwatcher/internal/database/artist_settings.go:70.32,71.20 1 1
naviwatcher/internal/database/artist_settings.go:71.20,73.4 1 1
naviwatcher/internal/database/artist_settings.go:74.3,74.22 1 1
naviwatcher/internal/database/artist_settings.go:74.22,76.4 1 1
naviwatcher/internal/database/artist_settings.go:77.3,78.27 2 1
naviwatcher/internal/database/artist_settings.go:81.2,81.20 1 1
naviwatcher/internal/database/artist_settings.go:81.20,83.3 1 1
naviwatcher/internal/database/artist_settings.go:85.2,88.16 4 1
naviwatcher/internal/database/artist_settings.go:88.16,90.3 1 0
naviwatcher/internal/database/artist_settings.go:92.2,93.16 2 1
naviwatcher/internal/database/artist_settings.go:93.16,95.3 1 0
naviwatcher/internal/database/artist_settings.go:96.2,96.23 1 1
naviwatcher/internal/database/artist_settings.go:96.23,98.3 1 1
naviwatcher/internal/database/artist_settings.go:100.2,100.12 1 1
naviwatcher/internal/database/database.go:17.38,19.16 2 1
naviwatcher/internal/database/database.go:19.16,21.3 1 0
naviwatcher/internal/database/database.go:24.2,24.64 1 1
naviwatcher/internal/database/database.go:24.64,27.3 2 0
naviwatcher/internal/database/database.go:29.2,30.37 2 1
naviwatcher/internal/database/database.go:30.37,33.3 2 0
naviwatcher/internal/database/database.go:35.2,35.16 1 1
naviwatcher/internal/database/database.go:39.29,41.2 1 1
naviwatcher/internal/database/database.go:44.30,46.2 1 1
naviwatcher/internal/database/database.go:49.31,55.19 1 1
naviwatcher/internal/database/database.go:55.19,57.3 1 0
naviwatcher/internal/database/database.go:59.2,94.31 2 1
naviwatcher/internal/database/database.go:94.31,96.17 2 1
naviwatcher/internal/database/database.go:96.17,98.4 1 0
naviwatcher/internal/database/database.go:99.3,99.14 1 1
naviwatcher/internal/database/database.go:99.14,100.12 1 1
naviwatcher/internal/database/database.go:103.3,103.48 1 1
naviwatcher/internal/database/database.go:103.48,105.4 1 0
naviwatcher/internal/database/database.go:107.3,107.57 1 1
naviwatcher/internal/database/database.go:107.57,109.4 1 0
naviwatcher/internal/database/database.go:112.2,112.12 1 1
naviwatcher/internal/database/database.go:116.61,119.16 3 1
naviwatcher/internal/database/database.go:119.16,121.3 1 0
naviwatcher/internal/database/database.go:122.2,122.23 1 1
naviwatcher/internal/database/database.go:126.55,129.2 2 1
naviwatcher/internal/database/external_releases.go:9.72,15.16 3 1
naviwatcher/internal/database/external_releases.go:15.16,17.3 1 1
naviwatcher/internal/database/external_releases.go:18.2,18.16 1 1
naviwatcher/internal/database/external_releases.go:22.66,27.16 2 1
naviwatcher/internal/database/external_releases.go:27.16,29.3 1 0
naviwatcher/internal/database/external_releases.go:30.2,30.12 1 1
naviwatcher/internal/database/external_releases.go:34.86,39.16 2 1
naviwatcher/internal/database/external_releases.go:39.16,41.3 1 0
naviwatcher/internal/database/external_releases.go:42.2,45.18 3 1
naviwatcher/internal/database/external_releases.go:45.18,47.106 2 1
naviwatcher/internal/database/external_releases.go:47.106,49.4 1 0
naviwatcher/internal/database/external_releases.go:50.3,50.31 1 1
naviwatcher/internal/database/external_releases.go:52.2,52.35 1 1
naviwatcher/internal/database/external_releases.go:52.35,54.3 1 0
naviwatcher/internal/database/external_releases.go:55.2,55.21 1 1
naviwatcher/internal/database/external_releases.go:59.60,63.16 2 1
naviwatcher/internal/database/external_releases.go:63.16,65.3 1 0
naviwatcher/internal/database/external_releases.go:66.2,69.18 3 1
naviwatcher/internal/database/external_releases.go:69.18,71.106 2 1
naviwatcher/internal/database/external_releases.go:71.106,73.4 1 0
naviwatcher/internal/database/external_releases.go:74.3,74.31 1 1
naviwatcher/internal/database/external_releases.go:76.2,76.35 1 1
naviwatcher/internal/database/external_releases.go:76.35,78.3 1 0
naviwatcher/internal/database/external_releases.go:79.2,79.21 1 1
naviwatcher/internal/database/external_releases.go:83.65,88.16 2 1
naviwatcher/internal/database/external_releases.go:88.16,90.3 1 0
naviwatcher/internal/database/external_releases.go:92.2,93.16 2 1
naviwatcher/internal/database/external_releases.go:93.16,95.3 1 0
naviwatcher/internal/database/external_releases.go:96.2,96.23 1 1
naviwatcher/internal/database/external_releases.go:96.23,98.3 1 1
naviwatcher/internal/database/external_releases.go:100.2,100.12 1 1
naviwatcher/internal/database/notifications.go:8.54,13.16 2 1
naviwatcher/internal/database/notifications.go:13.16,15.3 1 0
naviwatcher/internal/database/notifications.go:16.2,16.12 1 1
naviwatcher/internal/database/notifications.go:20.60,25.16 3 1
naviwatcher/internal/database/notifications.go:25.16,27.3 1 0
naviwatcher/internal/database/notifications.go:28.2,28.23 1 1
naviwatcher/internal/database/notifications.go:32.63,39.16 2 1
naviwatcher/internal/database/notifications.go:39.16,41.3 1 0
naviwatcher/internal/database/notifications.go:42.2,45.18 3 1
naviwatcher/internal/database/notifications.go:45.18,47.106 2 1
naviwatcher/internal/database/notifications.go:47.106,49.4 1 0
naviwatcher/internal/database/notifications.go:50.3,50.31 1 1
naviwatcher/internal/database/notifications.go:52.2,52.35 1 1
naviwatcher/internal/database/notifications.go:52.35,54.3 1 0
naviwatcher/internal/database/notifications.go:55.2,55.21 1 1
naviwatcher/internal/database/notifications.go:60.65,65.16 3 1
naviwatcher/internal/database/notifications.go:65.16,67.3 1 1
naviwatcher/internal/database/notifications.go:68.2,68.20 1 1

49
internal/database/artist_settings.go
View File

@@ -57,33 +57,48 @@ func GetAllArtistSettings(db *DB) ([]ArtistSettings, error) {
// UpdateArtistSettings updates specific fields of an artist_settings row by ID.
// The updates map keys must match column names: "name", "ignore_singles", "ignore_compilations", "monitored".
func UpdateArtistSettings(db *DB, id string, updates map[string]interface{}) error {
// Build the SET clause dynamically from the provided updates.
allowed := map[string]bool{
"name": true,
"ignore_singles": true,
"ignore_compilations": true,
"monitored": true,
if len(updates) == 0 {
return fmt.Errorf("no updates provided")
}
// Build the query using a fixed set of allowed columns to avoid dynamic SQL.
const baseQuery = "UPDATE artist_settings SET"
var args []interface{}
setClause := ""
for col, val := range updates {
if !allowed[col] {
switch col {
case "name":
if setClause != "" {
setClause += ", "
}
setClause += "name = ?"
args = append(args, val)
case "ignore_singles":
if setClause != "" {
setClause += ", "
}
setClause += "ignore_singles = ?"
args = append(args, val)
case "ignore_compilations":
if setClause != "" {
setClause += ", "
}
setClause += "ignore_compilations = ?"
args = append(args, val)
case "monitored":
if setClause != "" {
setClause += ", "
}
setClause += "monitored = ?"
args = append(args, val)
default:
return fmt.Errorf("unknown column: %s", col)
}
if setClause != "" {
setClause += ", "
}
setClause += col + " = ?"
args = append(args, val)
}
if len(args) == 0 {
return fmt.Errorf("no updates provided")
}
args = append(args, id)
query := fmt.Sprintf("UPDATE artist_settings SET %s WHERE id = ?", setClause)
query := fmt.Sprintf("%s %s WHERE id = ?", baseQuery, setClause)
result, err := db.Conn().Exec(query, args...)
if err != nil {
return fmt.Errorf("update artist settings: %w", err)

5
internal/database/database.go
View File

@@ -96,8 +96,9 @@ func (db *DB) migrate() error {
{
name: "003_create_notifications_sent",
sql: `CREATE TABLE IF NOT EXISTS notifications_sent (
rgid TEXT PRIMARY KEY REFERENCES external_releases(rgid),
sent_at DATETIME DEFAULT CURRENT_TIMESTAMP
rgid TEXT NOT NULL,
sent_at DATETIME DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (rgid, sent_at)
);`,
},
}

2
internal/database/notifications.go
View File

@@ -7,7 +7,7 @@ import (
// MarkNotificationSent records that a notification has been sent for the given RGID.
func MarkNotificationSent(db *DB, rgid string) error {
_, err := db.Conn().Exec(
"INSERT OR REPLACE INTO notifications_sent (rgid) VALUES (?)",
"INSERT INTO notifications_sent (rgid) VALUES (?)",
rgid,
)
if err != nil {

58
internal/database/notifications_test.go
View File

@@ -41,8 +41,10 @@ func TestMarkNotificationSent_New(t *testing.T) {
}
}
// TestMarkNotificationSent_Idempotent verifies that marking the same RGID twice does not fail.
func TestMarkNotificationSent_Idempotent(t *testing.T) {
// TestMarkNotificationSent_DuplicateSecond verifies that inserting the same RGID twice
// within the same second fails due to the composite primary key (rgid, sent_at).
// In practice, notifications are sent at most once per day, so this is acceptable.
func TestMarkNotificationSent_DuplicateSecond(t *testing.T) {
db, err := New(":memory:")
if err != nil {
t.Fatalf("New() error: %v", err)
@@ -58,8 +60,10 @@ func TestMarkNotificationSent_Idempotent(t *testing.T) {
if err := MarkNotificationSent(db, "rgid-1"); err != nil {
t.Fatalf("first MarkNotificationSent() error: %v", err)
}
if err := MarkNotificationSent(db, "rgid-1"); err != nil {
t.Fatalf("second MarkNotificationSent() error: %v", err)
// Second insert in the same second should fail with a UNIQUE constraint error.
err = MarkNotificationSent(db, "rgid-1")
if err == nil {
t.Fatal("expected UNIQUE constraint error on duplicate insert, got nil")
}
// Should still have exactly one row.
@@ -73,6 +77,52 @@ func TestMarkNotificationSent_Idempotent(t *testing.T) {
}
}
// TestMarkNotificationSent_DifferentTime verifies that inserting the same RGID at a
// different explicit sent_at time succeeds (composite PK allows multiple rows per RGID).
func TestMarkNotificationSent_DifferentTime(t *testing.T) {
db, err := New(":memory:")
if err != nil {
t.Fatalf("New() error: %v", err)
}
defer db.Close()
if err := insertTestArtist(db, "artist-1"); err != nil {
t.Fatalf("insertTestArtist: %v", err)
}
if err := insertTestRelease(db, "rgid-1", "artist-1"); err != nil {
t.Fatalf("insertTestRelease: %v", err)
}
// Insert with explicit different timestamps.
_, err = db.Conn().Exec("INSERT INTO notifications_sent (rgid, sent_at) VALUES (?, ?)", "rgid-1", "2024-01-01T00:00:00Z")
if err != nil {
t.Fatalf("first insert error: %v", err)
}
_, err = db.Conn().Exec("INSERT INTO notifications_sent (rgid, sent_at) VALUES (?, ?)", "rgid-1", "2024-06-01T00:00:00Z")
if err != nil {
t.Fatalf("second insert error: %v", err)
}
// IsNotificationSent should return true.
sent, err := IsNotificationSent(db, "rgid-1")
if err != nil {
t.Fatalf("IsNotificationSent() error: %v", err)
}
if !sent {
t.Error("expected IsNotificationSent to return true")
}
// Should have two rows.
var count int
err = db.Conn().QueryRow("SELECT COUNT(*) FROM notifications_sent WHERE rgid = ?", "rgid-1").Scan(&count)
if err != nil {
t.Fatalf("count query error: %v", err)
}
if count != 2 {
t.Errorf("expected 2 notification rows, got %d", count)
}
}
// TestIsNotificationSent_True verifies true for a sent notification.
func TestIsNotificationSent_True(t *testing.T) {
db, err := New(":memory:")