Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

Deprecates ResponseMsgUses. Introduces common/requests.go

Browse source
This commit is contained in:
smavros 2019-08-13 17:41:04 +02:00
parent ae2737571f
commit b6a269bdeb
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/requests.go Normal file
View file

@ -0,0 +1,3 @@
package common
type KeyModels map[string]interface{}

12
common/responses.go
View file

@ -80,13 +80,13 @@ type ResponseMsg struct {
Message string `json:"message"` Message string `json:"message"`
} }
type ResponseMsgUsers struct { //type ResponseMsgUsers struct {
Users []User `json:"users"` //Users []User `json:"users"`
} //}
type ResponseMsgUser struct { //type ResponseMsgUser struct {
User `json:"user"` //User `json:"user"`
} //}
type ResponseMsgScenarios struct { type ResponseMsgScenarios struct {
Scenarios []ScenarioResponse `json:"scenarios"` Scenarios []ScenarioResponse `json:"scenarios"`

13
routes/user/user_test.go
View file

@ -11,9 +11,6 @@ import (
func TestUserEndpoints(t *testing.T) { func TestUserEndpoints(t *testing.T) {
myUsers := []common.User{common.User0}
msgUsers := common.ResponseMsgUsers{Users: myUsers}
db := common.DummyInitDB() db := common.DummyInitDB()
defer db.Close() defer db.Close()
common.DummyOnlyAdminDB(db) common.DummyOnlyAdminDB(db)
@ -30,12 +27,14 @@ func TestUserEndpoints(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
// test GET user/ // test GET user/
err = common.NewTestEndpoint(router, token, "/api/users", "GET", err = common.NewTestEndpoint(router, token,
nil, 200, msgUsers) "/api/users", "GET", nil,
200, common.KeyModels{"users": []common.User{common.User0}})
assert.NoError(t, err) assert.NoError(t, err)
// test GET user/1 (the admin) // test GET user/1 (the admin)
err = common.NewTestEndpoint(router, token, "/api/users/1", "GET", err = common.NewTestEndpoint(router, token,
nil, 200, common.ResponseMsgUser{common.User0}) "/api/users/1", "GET", nil,
200, common.KeyModels{"user": common.User0})
assert.NoError(t, err) assert.NoError(t, err)
} }