Changing the way we mattermost handles URLs. team.domain.com becomes domain.com/team.

Renaming team.Name to team.DisplayName and team.Domain to team.Name.
So: team.Name -> url safe name. team.DisplayName -> nice name for users

store/sql_team_store.go

@@ -19,8 +19,8 @@ func NewSqlTeamStore(sqlStore *SqlStore) TeamStore {
 	for _, db := range sqlStore.GetAllConns() {
 		table := db.AddTableWithName(model.Team{}, "Teams").SetKeys(false, "Id")
 		table.ColMap("Id").SetMaxSize(26)
-		table.ColMap("Name").SetMaxSize(64)
-		table.ColMap("Domain").SetMaxSize(64).SetUnique(true)
+		table.ColMap("DisplayName").SetMaxSize(64)
+		table.ColMap("Name").SetMaxSize(64).SetUnique(true)
 		table.ColMap("Email").SetMaxSize(128)
 		table.ColMap("CompanyName").SetMaxSize(64)
 		table.ColMap("AllowedDomains").SetMaxSize(500)
@@ -35,6 +35,10 @@ func (s SqlTeamStore) UpgradeSchemaIfNeeded() {
 		defaultValue = "1"
 	}
 	s.CreateColumnIfNotExists("Teams", "AllowValet", "AllowedDomains", "tinyint(1)", defaultValue)
+	if !s.DoesColumnExist("Teams", "DisplayName") {
+		s.RenameColumnIfExists("Teams", "Name", "DisplayName", "varchar(64)")
+		s.RenameColumnIfExists("Teams", "Domain", "Name", "varchar(64)")
+	}
 }
 
 func (s SqlTeamStore) CreateIndexesIfNotExists() {
@@ -62,7 +66,7 @@ func (s SqlTeamStore) Save(team *model.Team) StoreChannel {
 		}
 
 		if err := s.GetMaster().Insert(team); err != nil {
-			if strings.Contains(err.Error(), "Duplicate entry") && strings.Contains(err.Error(), "for key 'Domain'") {
+			if strings.Contains(err.Error(), "Duplicate entry") && strings.Contains(err.Error(), "for key 'Name'") {
 				result.Err = model.NewAppError("SqlTeamStore.Save", "A team with that domain already exists", "id="+team.Id+", "+err.Error())
 			} else {
 				result.Err = model.NewAppError("SqlTeamStore.Save", "We couldn't save the team", "id="+team.Id+", "+err.Error())
@@ -100,7 +104,7 @@ func (s SqlTeamStore) Update(team *model.Team) StoreChannel {
 		} else {
 			oldTeam := oldResult.(*model.Team)
 			team.CreateAt = oldTeam.CreateAt
-			team.Domain = oldTeam.Domain
+			team.Name = oldTeam.Name
 
 			if count, err := s.GetMaster().Update(team); err != nil {
 				result.Err = model.NewAppError("SqlTeamStore.Update", "We encounted an error updating the team", "id="+team.Id+", "+err.Error())
@@ -118,15 +122,15 @@ func (s SqlTeamStore) Update(team *model.Team) StoreChannel {
 	return storeChannel
 }
 
-func (s SqlTeamStore) UpdateName(name string, teamId string) StoreChannel {
+func (s SqlTeamStore) UpdateDisplayName(name string, teamId string) StoreChannel {
 
 	storeChannel := make(StoreChannel)
 
 	go func() {
 		result := StoreResult{}
 
-		if _, err := s.GetMaster().Exec("UPDATE Teams SET Name = ? WHERE Id = ?", name, teamId); err != nil {
-			result.Err = model.NewAppError("SqlTeamStore.UpdateName", "We couldn't update the team name", "team_id="+teamId)
+		if _, err := s.GetMaster().Exec("UPDATE Teams SET DisplayName = ? WHERE Id = ?", name, teamId); err != nil {
+			result.Err = model.NewAppError("SqlTeamStore.UpdateDisplayName", "We couldn't update the team name", "team_id="+teamId)
 		} else {
 			result.Data = teamId
 		}
@@ -159,7 +163,7 @@ func (s SqlTeamStore) Get(id string) StoreChannel {
 	return storeChannel
 }
 
-func (s SqlTeamStore) GetByDomain(domain string) StoreChannel {
+func (s SqlTeamStore) GetByName(name string) StoreChannel {
 	storeChannel := make(StoreChannel)
 
 	go func() {
@@ -167,8 +171,8 @@ func (s SqlTeamStore) GetByDomain(domain string) StoreChannel {
 
 		team := model.Team{}
 
-		if err := s.GetReplica().SelectOne(&team, "SELECT * FROM Teams WHERE Domain=?", domain); err != nil {
-			result.Err = model.NewAppError("SqlTeamStore.GetByDomain", "We couldn't find the existing team", "domain="+domain+", "+err.Error())
+		if err := s.GetReplica().SelectOne(&team, "SELECT * FROM Teams WHERE Name=?", name); err != nil {
+			result.Err = model.NewAppError("SqlTeamStore.GetByName", "We couldn't find the existing team", "name="+name+", "+err.Error())
 		}
 
 		result.Data = &team