From 2eaad3701d98e2f1c29b815c0f5f8bbbb3921423 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Sat, 30 Jul 2022 13:20:48 +0200
Subject: [PATCH] osbuild-service-maintenance: Reword log messages and query
 name

The query is deleting multiple jobs, and it's deleting the entire job,
not just the results.
---
 cmd/osbuild-service-maintenance/db.go      | 14 ++++++--------
 cmd/osbuild-service-maintenance/db_test.go |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cmd/osbuild-service-maintenance/db.go b/cmd/osbuild-service-maintenance/db.go
index 548938d0e..b63ad697a 100644
--- a/cmd/osbuild-service-maintenance/db.go
+++ b/cmd/osbuild-service-maintenance/db.go
@@ -10,8 +10,7 @@ import (
 )
 
 const (
-	// Maintenance queries
-	sqlDeleteJob = `
+	sqlDeleteJobs = `
                 DELETE FROM jobs
                 WHERE id IN (
                     SELECT id FROM jobs
@@ -48,10 +47,10 @@ func (d *db) Close() {
 	d.Conn.Close(context.Background())
 }
 
-func (d *db) DeleteJob() (int64, error) {
-	tag, err := d.Conn.Exec(context.Background(), sqlDeleteJob)
+func (d *db) DeleteJobs() (int64, error) {
+	tag, err := d.Conn.Exec(context.Background(), sqlDeleteJobs)
 	if err != nil {
-		return tag.RowsAffected(), fmt.Errorf("Error deleting results from jobs: %v", err)
+		return tag.RowsAffected(), fmt.Errorf("Error deleting jobs: %v", err)
 	}
 	return tag.RowsAffected(), nil
 }
@@ -124,10 +123,9 @@ func DBCleanup(dbURL string, dryRun bool, cutoff time.Time) error {
 	var rows int64
 
 	for {
-		rows, err = db.DeleteJob()
-
+		rows, err = db.DeleteJobs()
 		if err != nil {
-			logrus.Errorf("Error deleting results for jobs: %v, %d rows affected", rows, err)
+			logrus.Errorf("Error deleting jobs: %v, %d rows affected", rows, err)
 			return err
 		}
 
diff --git a/cmd/osbuild-service-maintenance/db_test.go b/cmd/osbuild-service-maintenance/db_test.go
index 4ca008bfa..9ff66a24b 100644
--- a/cmd/osbuild-service-maintenance/db_test.go
+++ b/cmd/osbuild-service-maintenance/db_test.go
@@ -67,13 +67,13 @@ func testDeleteJob(t *testing.T, d db, q *dbjobqueue.DBJobQueue) {
 	require.NoError(t, json.Unmarshal(r, &r1))
 	require.Equal(t, result, r1)
 
-	rows, err := d.DeleteJob()
+	rows, err := d.DeleteJobs()
 	require.NoError(t, err)
 	require.Equal(t, int64(0), rows)
 
 	setExpired(t, d, id)
 
-	rows, err = d.DeleteJob()
+	rows, err = d.DeleteJobs()
 	require.NoError(t, err)
 	require.Equal(t, int64(1), rows)