db: make name and username unique together in the key collection

Closes #194.
tsuru · Jul 27, 2015 · 6617ba6 · 6617ba6
1 parent 2959498
commit 6617ba6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/db/conn.go b/db/conn.go
@@ -56,8 +56,10 @@ func (s *Storage) User() *storage.Collection {
 }
 
 func (s *Storage) Key() *storage.Collection {
-	index := mgo.Index{Key: []string{"body"}, Unique: true}
+	bodyIndex := mgo.Index{Key: []string{"body"}, Unique: true}
+	nameIndex := mgo.Index{Key: []string{"username", "name"}, Unique: true}
 	c := s.Collection("key")
-	c.EnsureIndex(index)
+	c.EnsureIndex(bodyIndex)
+	c.EnsureIndex(nameIndex)
 	return c
 }
diff --git a/db/conn_test.go b/db/conn_test.go
@@ -56,16 +56,18 @@ func (s *S) TestSessionKeyShouldReturnKeyCollection(c *check.C) {
 	c.Assert(key, check.DeepEquals, cKey)
 }
 
-func (s *S) TestSessionKeyBodyIsUnique(c *check.C) {
+func (s *S) TestSessionKeyIndexes(c *check.C) {
 	conn, err := Conn()
 	c.Assert(err, check.IsNil)
 	defer conn.Close()
 	key := conn.Key()
 	indexes, err := key.Indexes()
 	c.Assert(err, check.IsNil)
-	c.Assert(indexes, check.HasLen, 2)
-	c.Assert(indexes[1].Key, check.DeepEquals, []string{"body"})
-	c.Assert(indexes[1].Unique, check.DeepEquals, true)
+	c.Check(indexes, check.HasLen, 3)
+	c.Check(indexes[1].Key, check.DeepEquals, []string{"body"})
+	c.Check(indexes[1].Unique, check.DeepEquals, true)
+	c.Check(indexes[2].Key, check.DeepEquals, []string{"username", "name"})
+	c.Check(indexes[2].Unique, check.DeepEquals, true)
 }
 
 func (s *S) TestConnect(c *check.C) {