From 8314b05540e77a28dd86742075b530f426e3667a Mon Sep 17 00:00:00 2001 From: cscatolini Date: Thu, 7 Jul 2016 11:03:50 -0300 Subject: [PATCH] Fix bug in retriveClan when no memberships for the clan. --- api/version.go | 2 +- db/migrations.go | 18 +++++++++--------- models/clan.go | 7 ++++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/api/version.go b/api/version.go index 1c07e10e..a872e5b7 100644 --- a/api/version.go +++ b/api/version.go @@ -8,4 +8,4 @@ package api // VERSION identifies Khan's current version -var VERSION = "0.6.2" +var VERSION = "0.6.3" diff --git a/db/migrations.go b/db/migrations.go index d81900c3..b5c52c64 100644 --- a/db/migrations.go +++ b/db/migrations.go @@ -91,7 +91,7 @@ func migrations20160608133902_creategametableSql() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "migrations/20160608133902_CreateGameTable.sql", size: 1193, mode: os.FileMode(420), modTime: time.Unix(1466798697, 0)} + info := bindataFileInfo{name: "migrations/20160608133902_CreateGameTable.sql", size: 1193, mode: os.FileMode(420), modTime: time.Unix(1466797802, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -111,7 +111,7 @@ func migrations20160608150958_createplayertableSql() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "migrations/20160608150958_CreatePlayerTable.sql", size: 730, mode: os.FileMode(420), modTime: time.Unix(1466707272, 0)} + info := bindataFileInfo{name: "migrations/20160608150958_CreatePlayerTable.sql", size: 730, mode: os.FileMode(420), modTime: time.Unix(1466707165, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -131,7 +131,7 @@ func migrations20160608174439_createclantableSql() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "migrations/20160608174439_CreateClanTable.sql", size: 906, mode: os.FileMode(420), modTime: time.Unix(1466707272, 0)} + info := bindataFileInfo{name: "migrations/20160608174439_CreateClanTable.sql", size: 906, mode: os.FileMode(420), modTime: time.Unix(1466707165, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -151,7 +151,7 @@ func migrations20160608182307_createmembershiptableSql() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "migrations/20160608182307_CreateMembershipTable.sql", size: 1018, mode: os.FileMode(420), modTime: time.Unix(1466792887, 0)} + info := bindataFileInfo{name: "migrations/20160608182307_CreateMembershipTable.sql", size: 1018, mode: os.FileMode(420), modTime: time.Unix(1466787920, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -171,7 +171,7 @@ func migrations20160621161411_createhookstableSql() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "migrations/20160621161411_CreateHooksTable.sql", size: 700, mode: os.FileMode(420), modTime: time.Unix(1466538319, 0)} + info := bindataFileInfo{name: "migrations/20160621161411_CreateHooksTable.sql", size: 700, mode: os.FileMode(420), modTime: time.Unix(1466601889, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -191,7 +191,7 @@ func migrations20160627110742_loaduuidmoduleSql() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "migrations/20160627110742_LoadUUIDModule.sql", size: 75, mode: os.FileMode(420), modTime: time.Unix(1467036481, 0)} + info := bindataFileInfo{name: "migrations/20160627110742_LoadUUIDModule.sql", size: 75, mode: os.FileMode(420), modTime: time.Unix(1467060502, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -211,7 +211,7 @@ func migrations20160627153918_createretrieveclanindexesSql() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "migrations/20160627153918_CreateRetrieveClanIndexes.sql", size: 674, mode: os.FileMode(420), modTime: time.Unix(1467054354, 0)} + info := bindataFileInfo{name: "migrations/20160627153918_CreateRetrieveClanIndexes.sql", size: 674, mode: os.FileMode(420), modTime: time.Unix(1467060534, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -231,7 +231,7 @@ func migrations20160627155249_createplayermembershipandownershipcountSql() (*ass return nil, err } - info := bindataFileInfo{name: "migrations/20160627155249_CreatePlayerMembershipAndOwnershipCount.sql", size: 415, mode: os.FileMode(420), modTime: time.Unix(1467061932, 0)} + info := bindataFileInfo{name: "migrations/20160627155249_CreatePlayerMembershipAndOwnershipCount.sql", size: 415, mode: os.FileMode(420), modTime: time.Unix(1467060707, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -251,7 +251,7 @@ func migrations20160628181530_createclanmembershipcountSql() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "migrations/20160628181530_CreateClanMembershipCount.sql", size: 287, mode: os.FileMode(420), modTime: time.Unix(1467237210, 0)} + info := bindataFileInfo{name: "migrations/20160628181530_CreateClanMembershipCount.sql", size: 287, mode: os.FileMode(420), modTime: time.Unix(1467154167, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/models/clan.go b/models/clan.go index 37336dba..ccb89fae 100644 --- a/models/clan.go +++ b/models/clan.go @@ -380,9 +380,10 @@ func GetClanDetails(db DB, gameID, publicID string, maxClansPerPlayer int) (util //Otherwise return empty array of object result["roster"] = []util.JSON{} result["memberships"] = util.JSON{ - "pending": []util.JSON{}, - "banned": []util.JSON{}, - "denied": []util.JSON{}, + "pendingApplications": []util.JSON{}, + "pendingInvites": []util.JSON{}, + "banned": []util.JSON{}, + "denied": []util.JSON{}, } }