Added trigger deletion
This commit is contained in:
parent
9ceca8600f
commit
ef3f89cb2c
7 changed files with 191 additions and 48 deletions
27
trigger.go
27
trigger.go
|
|
@ -2,7 +2,7 @@ package main
|
|||
|
||||
import (
|
||||
// External
|
||||
we "git.gibonuddevalla.se/go/wrappederror"
|
||||
werr "git.gibonuddevalla.se/go/wrappederror"
|
||||
"github.com/expr-lang/expr"
|
||||
"github.com/lib/pq"
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ func TriggersRetrieve() (areas []Area, err error) { // {{{
|
|||
var jsonData []byte
|
||||
err = row.Scan(&jsonData)
|
||||
if err != nil {
|
||||
err = we.Wrap(err)
|
||||
err = werr.Wrap(err)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ func TriggersRetrieve() (areas []Area, err error) { // {{{
|
|||
|
||||
err = json.Unmarshal(jsonData, &areas)
|
||||
if err != nil {
|
||||
err = we.Wrap(err)
|
||||
err = werr.Wrap(err)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -97,13 +97,13 @@ func TriggersRetrieveByDatapoint(datapointName string) (triggers []Trigger, err
|
|||
var data []byte
|
||||
err = row.Scan(&data)
|
||||
if err != nil {
|
||||
err = we.Wrap(err).WithData(datapointName)
|
||||
err = werr.Wrap(err).WithData(datapointName)
|
||||
return
|
||||
}
|
||||
|
||||
err = json.Unmarshal(data, &triggers)
|
||||
if err != nil {
|
||||
err = we.Wrap(err).WithData(datapointName)
|
||||
err = werr.Wrap(err).WithData(datapointName)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ func TriggerRetrieve(id int) (trigger Trigger, err error) { // {{{
|
|||
var jsonData []byte
|
||||
err = row.Scan(&jsonData)
|
||||
if err != nil {
|
||||
err = we.Wrap(err)
|
||||
err = werr.Wrap(err)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -158,7 +158,7 @@ func (t *Trigger) Update() (err error) { // {{{
|
|||
)
|
||||
err = row.Scan(&t.ID)
|
||||
if err != nil {
|
||||
err = we.Wrap(err).WithData(
|
||||
err = werr.Wrap(err).WithData(
|
||||
struct {
|
||||
SectionID int
|
||||
Name string
|
||||
|
|
@ -191,7 +191,7 @@ func (t *Trigger) Update() (err error) { // {{{
|
|||
}
|
||||
|
||||
if pqErr, ok := err.(*pq.Error); ok {
|
||||
err = we.Wrap(err).WithData(
|
||||
err = werr.Wrap(err).WithData(
|
||||
struct {
|
||||
Trigger *Trigger
|
||||
PostgresCode pq.ErrorCode
|
||||
|
|
@ -202,7 +202,14 @@ func (t *Trigger) Update() (err error) { // {{{
|
|||
pqErr.Code.Name(),
|
||||
})
|
||||
} else if err != nil {
|
||||
err = we.Wrap(err).WithData(t)
|
||||
err = werr.Wrap(err).WithData(t)
|
||||
}
|
||||
return
|
||||
} // }}}
|
||||
func TriggerDelete(id int) (err error) { // {{{
|
||||
_, err = service.Db.Conn.Exec(`DELETE FROM public.trigger WHERE id=$1`, id)
|
||||
if err != nil {
|
||||
return werr.Wrap(err).WithData(id)
|
||||
}
|
||||
return
|
||||
} // }}}
|
||||
|
|
@ -213,7 +220,7 @@ func (t *Trigger) Run() (output any, err error) { // {{{
|
|||
var dp Datapoint
|
||||
dp, err = DatapointRetrieve(0, dpname)
|
||||
if err != nil {
|
||||
err = we.Wrap(err)
|
||||
err = werr.Wrap(err)
|
||||
return
|
||||
}
|
||||
datapoints[dpname] = dp
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue