fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686

pkg/services/sqlstore/org.go

@@ -62,9 +62,31 @@ func GetOrgByName(query *m.GetOrgByNameQuery) error {
 	return nil
 }
 
+func isOrgNameTaken(name string, existingId int64, sess *session) (bool, error) {
+	// check if org name is taken
+	var org m.Org
+	exists, err := sess.Where("name=?", name).Get(&org)
+
+	if err != nil {
+		return false, nil
+	}
+
+	if exists && existingId != org.Id {
+		return true, nil
+	}
+
+	return false, nil
+}
+
 func CreateOrg(cmd *m.CreateOrgCommand) error {
 	return inTransaction2(func(sess *session) error {
 
+		if isNameTaken, err := isOrgNameTaken(cmd.Name, 0, sess); err != nil {
+			return err
+		} else if isNameTaken {
+			return m.ErrOrgNameTaken
+		}
+
 		org := m.Org{
 			Name:    cmd.Name,
 			Created: time.Now(),
@@ -99,6 +121,12 @@ func CreateOrg(cmd *m.CreateOrgCommand) error {
 func UpdateOrg(cmd *m.UpdateOrgCommand) error {
 	return inTransaction2(func(sess *session) error {
 
+		if isNameTaken, err := isOrgNameTaken(cmd.Name, cmd.OrgId, sess); err != nil {
+			return err
+		} else if isNameTaken {
+			return m.ErrOrgNameTaken
+		}
+
 		org := m.Org{
 			Name:    cmd.Name,
 			Updated: time.Now(),