test: tokenLock queries

Signed-off-by: ADIR <adir@il.ibm.com>

Author: aaadir

token/services/db/sql/postgres/tokenlock.go

@@ -40,8 +40,7 @@ func NewTokenLockStore(dbs *common2.RWDB, tableNames common.TableNames) (*TokenL
 }
 
 func (db *TokenLockStore) Cleanup(ctx context.Context, leaseExpiry time.Duration) error {
-	_, err := db.logStaleLocks(ctx, leaseExpiry)
-	if err != nil {
+	if _, err := db.logStaleLocks(ctx, leaseExpiry); err != nil {
 		db.Logger.Warnf("Could not log stale locks: %v", err)
 	}
 	tokenLocks, tokenRequests := q.Table(db.Table.TokenLocks), q.Table(db.Table.Requests)
@@ -57,14 +56,14 @@ func (db *TokenLockStore) Cleanup(ctx context.Context, leaseExpiry time.Duration
 		Build()
 
 	db.Logger.Debug(query)
-	_, err = db.WriteDB.ExecContext(ctx, query, args...)
+	_, err := db.WriteDB.ExecContext(ctx, query, args...)
 	if err != nil {
 		db.Logger.Errorf("query failed: %s", query)
 	}
 	return err
 }
 
-func (db *TokenLockStore) logStaleLocks(ctx context.Context, leaseExpiry time.Duration) ([]LockEntry, error) {
+func (db *TokenLockStore) logStaleLocks(ctx context.Context, leaseExpiry time.Duration) ([]lockEntry, error) {
 	if !db.Logger.IsEnabledFor(zapcore.InfoLevel) {
 		return nil, nil
 	}
@@ -84,7 +83,7 @@ func (db *TokenLockStore) logStaleLocks(ctx context.Context, leaseExpiry time.Du
 		return nil, err
 	}
 
-	it := common4.NewIterator(rows, func(entry *LockEntry) error {
+	it := common4.NewIterator(rows, func(entry *lockEntry) error {
 		entry.LeaseExpiry = leaseExpiry
 		return rows.Scan(&entry.ConsumerTxID, &entry.TokenID.TxId, &entry.TokenID.Index, &entry.Status, &entry.CreatedAt, &entry.Now)
 	})
@@ -97,7 +96,7 @@ func (db *TokenLockStore) logStaleLocks(ctx context.Context, leaseExpiry time.Du
 	return lockEntries, nil
 }
 
-type LockEntry struct {
+type lockEntry struct {
 	ConsumerTxID string
 	TokenID      token.ID
 	Status       *driver.TxStatus
@@ -106,11 +105,11 @@ type LockEntry struct {
 	LeaseExpiry  time.Duration
 }
 
-func (e LockEntry) Expired() bool {
+func (e lockEntry) Expired() bool {
 	return e.CreatedAt.Add(e.LeaseExpiry).Before(e.Now)
 }
 
-func (e LockEntry) String() string {
+func (e lockEntry) String() string {
 	if expired := e.Expired(); e.Status == nil && expired {
 		return fmt.Sprintf("Expired lock created at [%v] for token [%s] consumed by [%s]", e.CreatedAt, e.TokenID, e.ConsumerTxID)
 	} else if e.Status != nil && *e.Status == driver.Deleted && !expired {

token/services/db/sql/postgres/tokenlock_test.go

@@ -45,22 +45,21 @@ func mockTokenLockStore(db *sql.DB) *common.TokenLockStore {
 	return store.TokenLockStore
 }
 
-func TestLogStaleLocks(t *testing.T) {
+func TestCleanup(t *testing.T) {
 	gomega.RegisterTestingT(t)
 	db, mockDB, err := sqlmock.New()
 	gomega.Expect(err).ToNot(gomega.HaveOccurred())
 
 	input := driver.Deleted
 
-	record := LockEntry{
-		ConsumerTxID: "1234",
-		TokenID:      token.ID{TxId: "5678", Index: 5},
-		Status:       &input,
-		CreatedAt:    time.Date(2025, time.June, 8, 10, 0, 0, 0, time.UTC),
-	}
+	consumerTxID := "1234"
+	tokenID := token.ID{TxId: "5678", Index: 5}
+	status := &input
+	createdAt := time.Date(2025, time.June, 8, 10, 0, 0, 0, time.UTC)
+
 	var timeNow time.Time
 	output := []driver2.Value{
-		record.ConsumerTxID, record.TokenID.TxId, record.TokenID.Index, *record.Status, record.CreatedAt, timeNow,
+		consumerTxID, tokenID.TxId, tokenID.Index, *status, createdAt, timeNow,
 	}
 	mockDB.
 		ExpectQuery("SELECT TOKEN_LOCKS.consumer_tx_id, TOKEN_LOCKS.tx_id, TOKEN_LOCKS.idx, REQUESTS.status, TOKEN_LOCKS.created_at, NOW\\(\\) AS now " +