Compare commits

...

2 commits

Author SHA1 Message Date
Magnus Åhall
2be428b03e Removed dep 2026-08-23 10:20:17 +02:00
Magnus Åhall
24befcce36 Merged 2026-08-23 10:20:02 +02:00
3 changed files with 22 additions and 11 deletions

View file

@ -285,19 +285,13 @@ func DatapointRetrieve(id int, name string) (dp Datapoint, err error) { // {{{
rows, _ := db.Query(context.Background(), query, param)
dp, err = pgx.CollectExactlyOneRow(rows, pgx.RowToStructByNameLax[Datapoint])
if err != nil {
err = werr.Wrap(err)
return
}
if err == sql.ErrNoRows {
if errors.Is(err, pgx.ErrNoRows) {
dp = Datapoint{
Name: name,
}
err = nil
return
}
if err != nil {
err = werr.Wrap(err).WithData(name)
return
@ -315,7 +309,7 @@ func DatapointRetrieve(id int, name string) (dp Datapoint, err error) { // {{{
dp.ID,
)
dp.LastDatapointValue, err = pgx.CollectExactlyOneRow(rows, pgx.RowToStructByNameLax[DatapointValue])
if err == sql.ErrNoRows {
if errors.Is(err, pgx.ErrNoRows) {
err = nil
return
}

20
main.go
View file

@ -431,7 +431,25 @@ func pageIndex(w http.ResponseWriter, r *http.Request) { // {{{
page.Render(w, r)
} // }}}
func actionDashboardValues(w http.ResponseWriter, r *http.Request) { // {{{
values, err := DatapointsValue([]int{13, 15})
name := "start"
dashboard, err := DashboardGet(name)
if err != nil {
logger.Error("dashboard", "error", err)
httpError(w, err)
return
}
idMap := make(map[int]bool)
var ids []int
for _, w := range dashboard.Widgets {
idMap[w.DatapointID] = true
}
for id := range idMap {
ids = append(ids, id)
}
values, err := DatapointsValue(ids)
if err != nil {
logger.Error("dashboard", "error", err)
httpError(w, err)

View file

@ -7,7 +7,6 @@ import (
// Standard
"context"
"database/sql"
"encoding/json"
"errors"
"fmt"
@ -123,7 +122,7 @@ func ProblemStart(trigger Trigger) (problemID int, err error) { // {{{
)
var openProblems int
err = row.Scan(&openProblems)
if err != nil && err != sql.ErrNoRows {
if err != nil && errors.Is(err, pgx.ErrNoRows) {
err = werr.Wrap(err).WithData(trigger.ID)
return
}