Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(BIDS-2414) remove datatable query param error #2536

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions handlers/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -648,14 +648,14 @@ func DashboardDataWithdrawals(w http.ResponseWriter, r *http.Request) {

draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
utils.LogError(err, fmt.Errorf("error converting datatables data parameter from string to int: %v", err), 0)
http.Error(w, "Internal server error", http.StatusInternalServerError)
logger.WithError(err).WithField("route", r.URL.String()).Warn("dashboard withdrawals data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
utils.LogError(err, fmt.Errorf("error converting datatables data parameter from string to int: %v", err), 0)
http.Error(w, "Internal server error", http.StatusInternalServerError)
logger.WithError(err).WithField("route", r.URL.String()).Warn("dashboard withdrawals data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}

Expand Down
12 changes: 6 additions & 6 deletions handlers/epochs.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ func EpochsData(w http.ResponseWriter, r *http.Request) {

draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("epochs data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("epochs data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}
length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("epochs data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}
if length > 100 {
Expand Down
12 changes: 6 additions & 6 deletions handlers/eth1Blocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ func Eth1BlocksData(w http.ResponseWriter, r *http.Request) {
}
draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int for route %v: %v", r.URL.String(), err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth1 blocks data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int for route %v: %v", r.URL.String(), err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth1 blocks data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}
length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int for route %v: %v", r.URL.String(), err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth1 blocks data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}
if length > 100 {
Expand Down
24 changes: 12 additions & 12 deletions handlers/eth1Deposits.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,20 @@ func Eth1DepositsData(w http.ResponseWriter, r *http.Request) {

draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth1 deposits data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth1 deposits data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}
length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth1 deposits data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}
if length > 100 {
Expand Down Expand Up @@ -171,20 +171,20 @@ func Eth1DepositsLeaderboardData(w http.ResponseWriter, r *http.Request) {

draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth1 deposits leaderboard data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth1 deposits leaderboard data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}
length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth1 deposits leaderboard data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}
if length > 100 {
Expand Down
12 changes: 6 additions & 6 deletions handlers/eth2Deposits.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@ func Eth2DepositsData(w http.ResponseWriter, r *http.Request) {

draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth2 deposits data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth2 deposits data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}
length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth2 deposits data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}
if length > 100 {
Expand Down
48 changes: 24 additions & 24 deletions handlers/pools_rocketpool.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ func PoolsRocketpoolDataMinipools(w http.ResponseWriter, r *http.Request) {
q := r.URL.Query()
draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool minipools data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool minipools data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}
length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool minipools data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}
if length > 100 {
Expand Down Expand Up @@ -188,20 +188,20 @@ func PoolsRocketpoolDataNodes(w http.ResponseWriter, r *http.Request) {
q := r.URL.Query()
draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool nodes data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool nodes data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}
length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool nodes data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}
if length > 100 {
Expand Down Expand Up @@ -332,20 +332,20 @@ func PoolsRocketpoolDataDAOProposals(w http.ResponseWriter, r *http.Request) {
q := r.URL.Query()
draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool dao proposals data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool dao proposals data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}
length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool dao proposals data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}
if length > 100 {
Expand Down Expand Up @@ -545,20 +545,20 @@ func PoolsRocketpoolDataDAOMembers(w http.ResponseWriter, r *http.Request) {
q := r.URL.Query()
draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool dao members data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool dao members data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}
length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("rocketpool dao members data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}
if length > 100 {
Expand Down
24 changes: 12 additions & 12 deletions handlers/slot.go
Original file line number Diff line number Diff line change
Expand Up @@ -452,21 +452,21 @@ func SlotDepositData(w http.ResponseWriter, r *http.Request) {

draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth2 deposits data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth2 deposits data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}

length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth2 deposits data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}

Expand Down Expand Up @@ -582,21 +582,21 @@ func SlotVoteData(w http.ResponseWriter, r *http.Request) {

draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth2 votes data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth2 votes data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}

length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
logger.WithError(err).WithField("route", r.URL.String()).Warn("eth2 votes data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}

Expand Down
12 changes: 6 additions & 6 deletions handlers/slots.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@ func SlotsData(w http.ResponseWriter, r *http.Request) {

draw, err := strconv.ParseUint(q.Get("draw"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables data parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("slots data: error converting draw parameter from string to int")
http.Error(w, "Error: Invalid draw parameter", http.StatusBadRequest)
return
}
start, err := strconv.ParseUint(q.Get("start"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables start parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("slots data: error converting start parameter from string to int")
http.Error(w, "Error: Invalid start parameter", http.StatusBadRequest)
return
}
length, err := strconv.ParseUint(q.Get("length"), 10, 64)
if err != nil {
logger.Errorf("error converting datatables length parameter from string to int: %v", err)
http.Error(w, "Internal server error", http.StatusServiceUnavailable)
logger.WithError(err).WithField("route", r.URL.String()).Warn("slots data: error converting length parameter from string to int")
http.Error(w, "Error: Invalid length parameter", http.StatusBadRequest)
return
}

Expand Down
Loading
Loading