Skip to content
Snippets Groups Projects
Commit bdc8acf0 authored by Mikhail Karnevskiy's avatar Mikhail Karnevskiy
Browse files

switch back to detailed default true

parent 6222a480
No related branches found
No related tags found
1 merge request!222Clean Cpp mart of MongoDB communication.
Pipeline #117701 failed
...@@ -53,7 +53,7 @@ var testsGetCommand = []struct { ...@@ -53,7 +53,7 @@ var testsGetCommand = []struct {
expectedGroupID + "/next", "&resend_nacks=true&delay_ms=10000&resend_attempts=3", "{\"id_key\":\"_id\",\"resend\":true,\"delay_ms\":10000,\"resend_attempts\":3}"}, expectedGroupID + "/next", "&resend_nacks=true&delay_ms=10000&resend_attempts=3", "{\"id_key\":\"_id\",\"resend\":true,\"delay_ms\":10000,\"resend_attempts\":3}"},
{"size", expectedSource, expectedStream, "", expectedStream + "/size", "", ""}, {"size", expectedSource, expectedStream, "", expectedStream + "/size", "", ""},
{"size", expectedSource, expectedStream, "", expectedStream + "/size", "&incomplete=true", "true"}, {"size", expectedSource, expectedStream, "", expectedStream + "/size", "&incomplete=true", "true"},
{"streams", expectedSource, "0", "", "0/streams", "", "{\"from\":\"\",\"filter\":\"all\",\"detailed\":false,\"last\":false,\"single\":false}"}, {"streams", expectedSource, "0", "", "0/streams", "", "{\"from\":\"\",\"filter\":\"all\",\"detailed\":true,\"last\":false,\"single\":false}"},
{"lastack", expectedSource, expectedStream, expectedGroupID, expectedStream + "/" + expectedGroupID + "/lastack", "", ""}, {"lastack", expectedSource, expectedStream, expectedGroupID, expectedStream + "/" + expectedGroupID + "/lastack", "", ""},
{"datasources", expectedSource, "0", "", "0/sources", "", ""}, {"datasources", expectedSource, "0", "", "0/sources", "", ""},
} }
......
...@@ -10,12 +10,14 @@ import ( ...@@ -10,12 +10,14 @@ import (
type GetStreamsParams = database.GetStreamsParams type GetStreamsParams = database.GetStreamsParams
func getBoolKey(vals url.Values, key string) (bool, bool) { func getBoolKey(vals url.Values, key string, defaultVal bool) (bool, bool) {
val_str := vals.Get(key) val_str := vals.Get(key)
if val_str == "true" { if val_str == "true" {
return true, true return true, true
} else if val_str == "false" || val_str == "" { } else if val_str == "false" {
return false, true return false, true
} else if val_str == "" {
return defaultVal, true
} else { } else {
return false, false return false, false
} }
...@@ -37,17 +39,17 @@ func getFilterKey(vals url.Values) (string, bool) { ...@@ -37,17 +39,17 @@ func getFilterKey(vals url.Values) (string, bool) {
func routeGetStreams(w http.ResponseWriter, r *http.Request) { func routeGetStreams(w http.ResponseWriter, r *http.Request) {
keys := r.URL.Query() keys := r.URL.Query()
detailed, ok := getBoolKey(keys, "detailed") detailed, ok := getBoolKey(keys, "detailed", true)
if !ok { if !ok {
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
last, ok := getBoolKey(keys, "last") last, ok := getBoolKey(keys, "last", false)
if !ok { if !ok {
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
} }
single, ok := getBoolKey(keys, "single") single, ok := getBoolKey(keys, "single", false)
if !ok { if !ok {
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)
return return
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment