Organization: You can now update the organization user role directly (without removing and readding the organization user). Closes #1899

pkg/services/sqlstore/org_test.go

@@ -80,6 +80,19 @@ func TestAccountDataAccess(t *testing.T) {
 					So(err, ShouldBeNil)
 				})
 
+				Convey("Can update org user role", func() {
+					updateCmd := m.UpdateOrgUserCommand{OrgId: ac1.OrgId, UserId: ac2.Id, Role: m.ROLE_ADMIN}
+					err = UpdateOrgUser(&updateCmd)
+					So(err, ShouldBeNil)
+
+					orgUsersQuery := m.GetOrgUsersQuery{OrgId: ac1.OrgId}
+					err = GetOrgUsers(&orgUsersQuery)
+					So(err, ShouldBeNil)
+
+					So(orgUsersQuery.Result[1].Role, ShouldEqual, m.ROLE_ADMIN)
+
+				})
+
 				Convey("Can get logged in user projection", func() {
 					query := m.GetSignedInUserQuery{UserId: ac2.Id}
 					err := GetSignedInUser(&query)

pkg/services/sqlstore/org_users.go

@@ -14,6 +14,7 @@ func init() {
 	bus.AddHandler("sql", AddOrgUser)
 	bus.AddHandler("sql", RemoveOrgUser)
 	bus.AddHandler("sql", GetOrgUsers)
+	bus.AddHandler("sql", UpdateOrgUser)
 }
 
 func AddOrgUser(cmd *m.AddOrgUserCommand) error {
@@ -32,6 +33,25 @@ func AddOrgUser(cmd *m.AddOrgUserCommand) error {
 	})
 }
 
+func UpdateOrgUser(cmd *m.UpdateOrgUserCommand) error {
+	return inTransaction(func(sess *xorm.Session) error {
+		var orgUser m.OrgUser
+		exists, err := sess.Where("org_id=? AND user_id=?", cmd.OrgId, cmd.UserId).Get(&orgUser)
+		if err != nil {
+			return err
+		}
+
+		if !exists {
+			return m.ErrOrgUserNotFound
+		}
+
+		orgUser.Role = cmd.Role
+		orgUser.Updated = time.Now()
+		_, err = sess.Id(orgUser.Id).Update(&orgUser)
+		return err
+	})
+}
+
 func GetOrgUsers(query *m.GetOrgUsersQuery) error {
 	query.Result = make([]*m.OrgUserDTO, 0)
 	sess := x.Table("org_user")