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

1 files changed, 20 insertions, 20 deletions

diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go
index bd1a7de2e..1f13e466c 100644
--- a/store/sql_team_store_test.go
+++ b/store/sql_team_store_test.go
@@ -13,8 +13,8 @@ func TestTeamStoreSave(t *testing.T) {
 	Setup()
 
 	o1 := model.Team{}
-	o1.Name = "Name"
-	o1.Domain = "a" + model.NewId() + "b"
+	o1.DisplayName = "DisplayName"
+	o1.Name = "a" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 
@@ -36,8 +36,8 @@ func TestTeamStoreUpdate(t *testing.T) {
 	Setup()
 
 	o1 := model.Team{}
-	o1.Name = "Name"
-	o1.Domain = "a" + model.NewId() + "b"
+	o1.DisplayName = "DisplayName"
+	o1.Name = "a" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 	if err := (<-store.Team().Save(&o1)).Err; err != nil {
@@ -61,25 +61,25 @@ func TestTeamStoreUpdate(t *testing.T) {
 	}
 }
 
-func TestTeamStoreUpdateName(t *testing.T) {
+func TestTeamStoreUpdateDisplayName(t *testing.T) {
 	Setup()
 
 	o1 := &model.Team{}
-	o1.Name = "Name"
-	o1.Domain = "a" + model.NewId() + "b"
+	o1.DisplayName = "Display Name"
+	o1.Name = "a" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 	o1 = (<-store.Team().Save(o1)).Data.(*model.Team)
 
-	newName := "NewName"
+	newDisplayName := "NewDisplayName"
 
-	if err := (<-store.Team().UpdateName(newName, o1.Id)).Err; err != nil {
+	if err := (<-store.Team().UpdateDisplayName(newDisplayName, o1.Id)).Err; err != nil {
 		t.Fatal(err)
 	}
 
 	ro1 := (<-store.Team().Get(o1.Id)).Data.(*model.Team)
-	if ro1.Name != newName {
-		t.Fatal("Name not updated")
+	if ro1.DisplayName != newDisplayName {
+		t.Fatal("DisplayName not updated")
 	}
 }
 
@@ -87,8 +87,8 @@ func TestTeamStoreGet(t *testing.T) {
 	Setup()
 
 	o1 := model.Team{}
-	o1.Name = "Name"
-	o1.Domain = "a" + model.NewId() + "b"
+	o1.DisplayName = "DisplayName"
+	o1.Name = "a" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 	Must(store.Team().Save(&o1))
@@ -106,12 +106,12 @@ func TestTeamStoreGet(t *testing.T) {
 	}
 }
 
-func TestTeamStoreGetByDomain(t *testing.T) {
+func TestTeamStoreGetByName(t *testing.T) {
 	Setup()
 
 	o1 := model.Team{}
-	o1.Name = "Name"
-	o1.Domain = "a" + model.NewId() + "b"
+	o1.DisplayName = "DisplayName"
+	o1.Name = "a" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 
@@ -119,7 +119,7 @@ func TestTeamStoreGetByDomain(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if r1 := <-store.Team().GetByDomain(o1.Domain); r1.Err != nil {
+	if r1 := <-store.Team().GetByName(o1.Name); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		if r1.Data.(*model.Team).ToJson() != o1.ToJson() {
@@ -127,7 +127,7 @@ func TestTeamStoreGetByDomain(t *testing.T) {
 		}
 	}
 
-	if err := (<-store.Team().GetByDomain("")).Err; err == nil {
+	if err := (<-store.Team().GetByName("")).Err; err == nil {
 		t.Fatal("Missing id should have failed")
 	}
 }
@@ -136,8 +136,8 @@ func TestTeamStoreGetForEmail(t *testing.T) {
 	Setup()
 
 	o1 := model.Team{}
-	o1.Name = "Name"
-	o1.Domain = "a" + model.NewId() + "b"
+	o1.DisplayName = "DisplayName"
+	o1.Name = "a" + model.NewId() + "b"
 	o1.Email = model.NewId() + "@nowhere.com"
 	o1.Type = model.TEAM_OPEN
 	Must(store.Team().Save(&o1))