From b671b9704f2531d3804247967d2650f92530e3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 11 Oct 2018 12:20:53 -0700
Subject: [PATCH] changed property name to UserWasDeleted and added an assert
 for it

---
 pkg/api/org_users.go               | 6 +++---
 pkg/models/org_user.go             | 2 +-
 pkg/services/sqlstore/org_test.go  | 1 +
 pkg/services/sqlstore/org_users.go | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/api/org_users.go b/pkg/api/org_users.go
index 6b3159d799b..d79707d3ae2 100644
--- a/pkg/api/org_users.go
+++ b/pkg/api/org_users.go
@@ -103,8 +103,8 @@ func updateOrgUserHelper(cmd m.UpdateOrgUserCommand) Response {
 // DELETE /api/org/users/:userId
 func RemoveOrgUserForCurrentOrg(c *m.ReqContext) Response {
 	return removeOrgUserHelper(&m.RemoveOrgUserCommand{
-		UserId:                   c.ParamsInt64(":userId"),
-		OrgId:                    c.OrgId,
+		UserId: c.ParamsInt64(":userId"),
+		OrgId:  c.OrgId,
 		ShouldDeleteOrphanedUser: true,
 	})
 }
@@ -125,7 +125,7 @@ func removeOrgUserHelper(cmd *m.RemoveOrgUserCommand) Response {
 		return Error(500, "Failed to remove user from organization", err)
 	}
 
-	if cmd.UserWasRemoved {
+	if cmd.UserWasDeleted {
 		return Success("User deleted")
 	}
 
diff --git a/pkg/models/org_user.go b/pkg/models/org_user.go
index e7896b3cab8..b6ecd924e9a 100644
--- a/pkg/models/org_user.go
+++ b/pkg/models/org_user.go
@@ -75,7 +75,7 @@ type RemoveOrgUserCommand struct {
 	UserId                   int64
 	OrgId                    int64
 	ShouldDeleteOrphanedUser bool
-	UserWasRemoved           bool
+	UserWasDeleted           bool
 }
 
 type AddOrgUserCommand struct {
diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go
index eda20fe1b91..c02686c24ba 100644
--- a/pkg/services/sqlstore/org_test.go
+++ b/pkg/services/sqlstore/org_test.go
@@ -191,6 +191,7 @@ func TestAccountDataAccess(t *testing.T) {
 					remCmd := m.RemoveOrgUserCommand{OrgId: ac1.OrgId, UserId: ac2.Id, ShouldDeleteOrphanedUser: true}
 					err = RemoveOrgUser(&remCmd)
 					So(err, ShouldBeNil)
+					So(remCmd.UserWasDeleted, ShouldBeTrue)
 
 					err = GetSignedInUser(&m.GetSignedInUserQuery{UserId: ac2.Id})
 					So(err, ShouldEqual, m.ErrUserNotFound)
diff --git a/pkg/services/sqlstore/org_users.go b/pkg/services/sqlstore/org_users.go
index 925893325c1..abbc320020e 100644
--- a/pkg/services/sqlstore/org_users.go
+++ b/pkg/services/sqlstore/org_users.go
@@ -195,7 +195,7 @@ func RemoveOrgUser(cmd *m.RemoveOrgUserCommand) error {
 				return err
 			}
 
-			cmd.UserWasRemoved = true
+			cmd.UserWasDeleted = true
 		}
 
 		return nil