From 39f14a2ec2ea5cfec6848ae837be12418ce98a2d Mon Sep 17 00:00:00 2001
From: Kat Yang <69819079+yangkb09@users.noreply.github.com>
Date: Thu, 24 Mar 2022 13:00:41 -0400
Subject: [PATCH] Chore: Remove x from login attempt (#46853)

---
 pkg/services/sqlstore/login_attempt.go      | 26 +++++++++++----------
 pkg/services/sqlstore/login_attempt_test.go |  8 +++----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkg/services/sqlstore/login_attempt.go b/pkg/services/sqlstore/login_attempt.go
index cf2b78dac2e..fbbf85d786b 100644
--- a/pkg/services/sqlstore/login_attempt.go
+++ b/pkg/services/sqlstore/login_attempt.go
@@ -14,7 +14,7 @@ var getTimeNow = time.Now
 func (ss *SQLStore) addLoginAttemptQueryAndCommandHandlers() {
 	bus.AddHandler("sql", ss.CreateLoginAttempt)
 	bus.AddHandler("sql", ss.DeleteOldLoginAttempts)
-	bus.AddHandler("sql", GetUserLoginAttemptCount)
+	bus.AddHandler("sql", ss.GetUserLoginAttemptCount)
 }
 
 func (ss *SQLStore) CreateLoginAttempt(ctx context.Context, cmd *models.CreateLoginAttemptCommand) error {
@@ -65,19 +65,21 @@ func (ss *SQLStore) DeleteOldLoginAttempts(ctx context.Context, cmd *models.Dele
 	})
 }
 
-func GetUserLoginAttemptCount(ctx context.Context, query *models.GetUserLoginAttemptCountQuery) error {
-	loginAttempt := new(models.LoginAttempt)
-	total, err := x.
-		Where("username = ?", query.Username).
-		And("created >= ?", query.Since.Unix()).
-		Count(loginAttempt)
+func (ss *SQLStore) GetUserLoginAttemptCount(ctx context.Context, query *models.GetUserLoginAttemptCountQuery) error {
+	return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
+		loginAttempt := new(models.LoginAttempt)
+		total, err := dbSession.
+			Where("username = ?", query.Username).
+			And("created >= ?", query.Since.Unix()).
+			Count(loginAttempt)
 
-	if err != nil {
-		return err
-	}
+		if err != nil {
+			return err
+		}
 
-	query.Result = total
-	return nil
+		query.Result = total
+		return nil
+	})
 }
 
 func toInt64(i interface{}) int64 {
diff --git a/pkg/services/sqlstore/login_attempt_test.go b/pkg/services/sqlstore/login_attempt_test.go
index 5d8f0a4bd1f..158a7de64db 100644
--- a/pkg/services/sqlstore/login_attempt_test.go
+++ b/pkg/services/sqlstore/login_attempt_test.go
@@ -51,7 +51,7 @@ func TestLoginAttempts(t *testing.T) {
 			Username: user,
 			Since:    timePlusTwoMinutes.Add(time.Second * 1),
 		}
-		err := GetUserLoginAttemptCount(context.Background(), &query)
+		err := sqlStore.GetUserLoginAttemptCount(context.Background(), &query)
 		require.Nil(t, err)
 		require.Equal(t, int64(0), query.Result)
 	})
@@ -62,7 +62,7 @@ func TestLoginAttempts(t *testing.T) {
 			Username: user,
 			Since:    beginningOfTime,
 		}
-		err := GetUserLoginAttemptCount(context.Background(), &query)
+		err := sqlStore.GetUserLoginAttemptCount(context.Background(), &query)
 		require.Nil(t, err)
 		require.Equal(t, int64(3), query.Result)
 	})
@@ -73,7 +73,7 @@ func TestLoginAttempts(t *testing.T) {
 			Username: user,
 			Since:    timePlusOneMinute,
 		}
-		err := GetUserLoginAttemptCount(context.Background(), &query)
+		err := sqlStore.GetUserLoginAttemptCount(context.Background(), &query)
 		require.Nil(t, err)
 		require.Equal(t, int64(2), query.Result)
 	})
@@ -84,7 +84,7 @@ func TestLoginAttempts(t *testing.T) {
 			Username: user,
 			Since:    timePlusTwoMinutes,
 		}
-		err := GetUserLoginAttemptCount(context.Background(), &query)
+		err := sqlStore.GetUserLoginAttemptCount(context.Background(), &query)
 		require.Nil(t, err)
 		require.Equal(t, int64(1), query.Result)
 	})