Don't overwrite fqdn and motd when upserting node

Tox · Jan 21, 2024 · 383f7c3 · 383f7c3
1 parent 98a5de2
commit 383f7c3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
diff --git a/internal/db/queries.sql b/internal/db/queries.sql
@@ -16,12 +16,10 @@ SELECT COUNT(*)
 FROM node;
 
 -- name: UpsertNode :one
-INSERT INTO node(public_key, fqdn, motd)
-VALUES(?, ?, ?)
+INSERT INTO node(public_key)
+VALUES(?)
 ON CONFLICT(public_key)
-DO UPDATE SET fqdn = EXCLUDED.fqdn,
-              motd = EXCLUDED.motd,
-              last_seen_at = unixepoch('subsec')
+DO UPDATE SET last_seen_at = unixepoch('subsec')
 RETURNING *;
 
 -- name: UpdateNodeBootstrapInfo :exec

diff --git a/internal/db/queries.sql.go b/internal/db/queries.sql.go
diff --git a/internal/repo/repo.go b/internal/repo/repo.go
@@ -73,9 +73,7 @@ func (r *NodesRepo) TrackDHTNode(ctx context.Context, node *dht.Node) (*models.N
 	defer tx.Rollback()
 
 	q := r.q.WithTx(tx)
-	dbNode, err := q.UpsertNode(ctx, &db.UpsertNodeParams{
-		PublicKey: (*db.PublicKey)(node.PublicKey),
-	})
+	dbNode, err := q.UpsertNode(ctx, (*db.PublicKey)(node.PublicKey))
 	if err != nil {
 		return nil, fmt.Errorf("upsert node: %w", err)
 	}

diff --git a/internal/repo/repo_test.go b/internal/repo/repo_test.go
@@ -68,7 +68,7 @@ func TestAddNode(t *testing.T) {
 	defer close()
 
 	node := generateNode(t)
-	dbNode, err := repo.q.UpsertNode(ctx, &db.UpsertNodeParams{PublicKey: (*db.PublicKey)(node.PublicKey)})
+	dbNode, err := repo.q.UpsertNode(ctx, (*db.PublicKey)(node.PublicKey))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -93,7 +93,7 @@ func TestHasNodeByPublicKey(t *testing.T) {
 	defer close()
 
 	node := generateNode(t)
-	_, err := repo.q.UpsertNode(ctx, &db.UpsertNodeParams{PublicKey: (*db.PublicKey)(node.PublicKey)})
+	_, err := repo.q.UpsertNode(ctx, (*db.PublicKey)(node.PublicKey))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -120,7 +120,7 @@ func TestPongNonExistentNode(t *testing.T) {
 	defer close()
 
 	pk := generatePublicKey(t)
-	_, err := repo.q.UpsertNode(ctx, &db.UpsertNodeParams{PublicKey: (*db.PublicKey)(pk)})
+	_, err := repo.q.UpsertNode(ctx, (*db.PublicKey)(pk))
 	if err != nil {
 		t.Fatal(err)
 	}