summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-02-07 08:57:41 -0800
committerHarrison Healey <harrisonmhealey@gmail.com>2017-02-07 08:57:41 -0800
commitba18374bd1b2644e577247204fad17dd52913b9b (patch)
tree1399082cc810f0708497bc2fc95a6da49d793bd3 /store
parentd91fea65188a51dd41976cad47f9c8ebacd75a04 (diff)
downloadchat-ba18374bd1b2644e577247204fad17dd52913b9b.tar.gz
chat-ba18374bd1b2644e577247204fad17dd52913b9b.tar.bz2
chat-ba18374bd1b2644e577247204fad17dd52913b9b.zip
Implement a few team endpoints for APIv4 (#5296)
* Implement GET /teams/{team_id} endpoint for APIv4 * Implement GET /users/{user_id}/teams endpoint for APIv4 * Implement GET /teams/{team_id}/members/{user_id} endpoint for APIv4
Diffstat (limited to 'store')
-rw-r--r--store/sql_team_store.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/store/sql_team_store.go b/store/sql_team_store.go
index f1b023854..9ef420943 100644
--- a/store/sql_team_store.go
+++ b/store/sql_team_store.go
@@ -165,7 +165,7 @@ func (s SqlTeamStore) Get(id string) StoreChannel {
if obj, err := s.GetReplica().Get(model.Team{}, id); err != nil {
result.Err = model.NewLocAppError("SqlTeamStore.Get", "store.sql_team.get.finding.app_error", nil, "id="+id+", "+err.Error())
} else if obj == nil {
- result.Err = model.NewLocAppError("SqlTeamStore.Get", "store.sql_team.get.find.app_error", nil, "id="+id)
+ result.Err = model.NewAppError("SqlTeamStore.Get", "store.sql_team.get.find.app_error", nil, "id="+id, http.StatusNotFound)
} else {
team := obj.(*model.Team)
if len(team.InviteId) == 0 {
@@ -455,7 +455,7 @@ func (s SqlTeamStore) GetMember(teamId string, userId string) StoreChannel {
err := s.GetReplica().SelectOne(&member, "SELECT * FROM TeamMembers WHERE TeamId = :TeamId AND UserId = :UserId", map[string]interface{}{"TeamId": teamId, "UserId": userId})
if err != nil {
if err == sql.ErrNoRows {
- result.Err = model.NewLocAppError("SqlTeamStore.GetMember", "store.sql_team.get_member.missing.app_error", nil, "teamId="+teamId+" userId="+userId+" "+err.Error())
+ result.Err = model.NewAppError("SqlTeamStore.GetMember", "store.sql_team.get_member.missing.app_error", nil, "teamId="+teamId+" userId="+userId+" "+err.Error(), http.StatusNotFound)
} else {
result.Err = model.NewLocAppError("SqlTeamStore.GetMember", "store.sql_team.get_member.app_error", nil, "teamId="+teamId+" userId="+userId+" "+err.Error())
}