Chore: Delete duplicate models for user (#60906)

* Delete duplicate models for user

* Use new models in some tests

* Add auth model conversion back

pkg/services/contexthandler/auth_proxy_test.go

@@ -101,7 +101,7 @@ func getContextHandler(t *testing.T) *ContextHandler {
 	}
 	orgService := orgtest.NewOrgServiceFake()
 
-	authProxy := authproxy.ProvideAuthProxy(cfg, remoteCacheSvc, loginService, &userService, &FakeGetSignUserStore{})
+	authProxy := authproxy.ProvideAuthProxy(cfg, remoteCacheSvc, loginService, &userService, nil)
 	authenticator := &fakeAuthenticator{}
 
 	return ProvideService(cfg, userAuthTokenSvc, authJWTSvc, remoteCacheSvc,
@@ -109,22 +109,6 @@ func getContextHandler(t *testing.T) *ContextHandler {
 		&userService, orgService, nil, nil, &authntest.FakeService{})
 }
 
-type FakeGetSignUserStore struct {
-	db.DB
-}
-
-func (f *FakeGetSignUserStore) GetSignedInUser(ctx context.Context, query *models.GetSignedInUserQuery) error {
-	if query.UserId != userID {
-		return user.ErrUserNotFound
-	}
-
-	query.Result = &user.SignedInUser{
-		UserID: userID,
-		OrgID:  orgID,
-	}
-	return nil
-}
-
 type fakeAuthenticator struct{}
 
 func (fa *fakeAuthenticator) AuthenticateUser(c context.Context, query *models.LoginUserQuery) error {

pkg/services/notifications/notifications_test.go

@@ -206,9 +206,7 @@ func TestSendEmailAsync(t *testing.T) {
 		// verify code
 		query := models.ValidateResetPasswordCodeQuery{Code: code}
 		getUserByLogin := func(ctx context.Context, login string) (*user.User, error) {
-			query := models.GetUserByLoginQuery{LoginOrEmail: login}
-			query.Result = &testuser
-			return query.Result, nil
+			return &testuser, nil
 		}
 		err = sut.ValidateResetPasswordCode(context.Background(), &query, getUserByLogin)
 		require.NoError(t, err)

pkg/services/org/orgimpl/store.go

@@ -767,7 +767,7 @@ func (ss *sqlStore) RemoveOrgUser(ctx context.Context, cmd *org.RemoveOrgUserCom
 			}
 		} else if cmd.ShouldDeleteOrphanedUser {
 			// no other orgs, delete the full user
-			if err := ss.deleteUserInTransaction(sess, &models.DeleteUserCommand{UserId: usr.ID}); err != nil {
+			if err := ss.deleteUserInTransaction(sess, &user.DeleteUserCommand{UserID: usr.ID}); err != nil {
 				return err
 			}
 
@@ -784,9 +784,9 @@ func (ss *sqlStore) RemoveOrgUser(ctx context.Context, cmd *org.RemoveOrgUserCom
 	})
 }
 
-func (ss *sqlStore) deleteUserInTransaction(sess *db.Session, cmd *models.DeleteUserCommand) error {
+func (ss *sqlStore) deleteUserInTransaction(sess *db.Session, cmd *user.DeleteUserCommand) error {
 	// Check if user exists
-	usr := user.User{ID: cmd.UserId}
+	usr := user.User{ID: cmd.UserID}
 	has, err := sess.Where(ss.notServiceAccountFilter()).Get(&usr)
 	if err != nil {
 		return err
@@ -795,13 +795,13 @@ func (ss *sqlStore) deleteUserInTransaction(sess *db.Session, cmd *models.Delete
 		return user.ErrUserNotFound
 	}
 	for _, sql := range ss.userDeletions() {
-		_, err := sess.Exec(sql, cmd.UserId)
+		_, err := sess.Exec(sql, cmd.UserID)
 		if err != nil {
 			return err
 		}
 	}
 
-	return deleteUserAccessControl(sess, cmd.UserId)
+	return deleteUserAccessControl(sess, cmd.UserID)
 }
 
 func deleteUserAccessControl(sess *db.Session, userID int64) error {

pkg/services/sqlstore/mockstore/mockstore.go

@@ -71,7 +71,7 @@ func (m *SQLStoreMock) CreateUser(ctx context.Context, cmd user.CreateUserComman
 	return nil, m.ExpectedError
 }
 
-func (m *SQLStoreMock) GetUserProfile(ctx context.Context, query *models.GetUserProfileQuery) error {
+func (m *SQLStoreMock) GetUserProfile(ctx context.Context, query *user.GetUserProfileQuery) error {
 	return m.ExpectedError
 }