Get clan details was missing c.allow_application and c.auto_join in t…

…he query.
topfreegames · Jun 28, 2016 · 985fc78 · 985fc78
1 parent f30da64
commit 985fc78
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/db/migrations.go b/db/migrations.go
diff --git a/models/clan.go b/models/clan.go
@@ -273,6 +273,7 @@ func GetClanDetails(db DB, gameID, publicID string, maxClansPerPlayer int) (util
 	SELECT
 		c.game_id GameID,
 		c.public_id ClanPublicID, c.name ClanName, c.metadata ClanMetadata,
+		c.allow_application ClanAllowApplication, c.auto_join ClanAutoJoin,
 		m.membership_level MembershipLevel, m.approved MembershipApproved, m.denied MembershipDenied,
 		m.Banned MembershipBanned,
 		m.created_at MembershipCreatedAt, m.updated_at MembershipUpdatedAt,

diff --git a/models/clan_test.go b/models/clan_test.go
@@ -614,11 +614,17 @@ func TestClanModel(t *testing.T) {
 					testDb, 0, 0, 0, 0, "clan-details-2", "clan-details-2-clan",
 				)
 				g.Assert(err == nil).IsTrue()
+				clan.AllowApplication = true
+				clan.AutoJoin = true
+				_, err = testDb.Update(clan)
+				g.Assert(err == nil).IsTrue()
 
 				clanData, err := GetClanDetails(testDb, clan.GameID, clan.PublicID, 1)
 				g.Assert(err == nil).IsTrue()
 				g.Assert(clanData["name"]).Equal(clan.Name)
 				g.Assert(clanData["metadata"]).Equal(clan.Metadata)
+				g.Assert(clanData["allowApplication"]).Equal(clan.AllowApplication)
+				g.Assert(clanData["autoJoin"]).Equal(clan.AutoJoin)
 				roster := clanData["roster"].([]util.JSON)
 				g.Assert(len(roster)).Equal(0)
 			})