3 Commits

Author SHA1 Message Date
jdl
3b23aeabbe wip 2024-11-18 17:01:17 +01:00
jdl
687206bb45 wip 2024-11-17 15:25:13 +01:00
jdl
5d442fa681 wip 2024-11-17 15:18:05 +01:00
7 changed files with 147 additions and 28 deletions

12
go.mod
View File

@@ -4,9 +4,19 @@ go 1.23.2
require (
github.com/lib/pq v1.10.9
github.com/mailgun/mailgun-go/v4 v4.18.5
github.com/mattn/go-sqlite3 v1.14.24
golang.org/x/crypto v0.29.0
golang.org/x/net v0.31.0
)
require golang.org/x/text v0.20.0 // indirect
require (
github.com/go-chi/chi/v5 v5.0.8 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/mailgun/errors v0.3.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
)

34
go.sum
View File

@@ -1,10 +1,44 @@
github.com/ahmetb/go-linq v3.0.0+incompatible h1:qQkjjOXKrKOTy83X8OpRmnKflXKQIL/mC/gMVVDMhOA=
github.com/ahmetb/go-linq v3.0.0+incompatible/go.mod h1:PFffvbdbtw+QTB0WKRP0cNht7vnCfnGlEpak/DVg5cY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/mailgun/errors v0.3.0 h1:g8R8lodkwqk5WIVMAClyUqt0PSd5JTVgobB+H7C2sLs=
github.com/mailgun/errors v0.3.0/go.mod h1:+ltknP+jhv3gZ1StKY6ugoQECcPxDCaSdmYesqTZcLQ=
github.com/mailgun/mailgun-go/v4 v4.18.5 h1:wZnTutW/fzxNyJVBMa6O4LLGW/hO+IGfKpuqBT4nbVs=
github.com/mailgun/mailgun-go/v4 v4.18.5/go.mod h1:+d4FCswFAukgYc1XtKK2IxOYaVxjVm8AN2z/5TBiT8M=
github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

43
mgmailer/mailer.go Normal file
View File

@@ -0,0 +1,43 @@
package mgmailer
import (
"context"
"fmt"
"sync/atomic"
"time"
"github.com/mailgun/mailgun-go/v4"
)
type Config struct {
MailgunDomain string
MailgunAPIKey string
SenderEmail string
SenderName string
}
type Mailer struct {
conf atomic.Pointer[Config]
mg atomic.Pointer[mailgun.MailgunImpl]
}
func (m *Mailer) Update(conf Config) {
m.conf.Store(&conf)
m.mg.Store(mailgun.NewMailgun(conf.MailgunDomain, conf.MailgunAPIKey))
}
func (m *Mailer) Send(subject, body, to string) error {
mg := m.mg.Load()
conf := m.conf.Load()
message := mailgun.NewMessage(
fmt.Sprintf("%s <%s>", conf.SenderName, conf.SenderEmail),
subject,
body,
to)
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel()
_, _, err := mg.Send(ctx, message)
return err
}

View File

@@ -14,7 +14,7 @@ func ErrIsForeignKey(err error) bool {
return ErrHasCode(err, "23503")
}
func ErrIsSerializationFaiilure(err error) bool {
func ErrIsSerializationFailure(err error) bool {
return ErrHasCode(err, "40001")
}

View File

@@ -60,7 +60,7 @@ func (r SerialTxRunner) WithTx(db *sql.DB, fn func(*sql.Tx) error) error {
if err == nil {
return nil
}
if timeout > r.MaxTimeout || !ErrIsSerializationFaiilure(err) {
if timeout > r.MaxTimeout || !ErrIsSerializationFailure(err) {
return err
}
sleepTimeout := timeout + time.Duration(rand.Int63n(int64(timeout/10)))

View File

@@ -5,6 +5,24 @@ import (
"iter"
)
var (
ErrConstraint = errors.New("constraint violation")
ErrNotFound = errors.New("not found")
)
func translateError(err error) error {
if err == nil {
return nil
}
if e, ok := err.(sqlite3.Error); ok && e.Code == 19 {
return ErrConstraint
}
if errors.Is(err, sql.ErrNoRows) {
return ErrNotFound
}
return err
}
type TX interface {
Exec(query string, args ...any) (sql.Result, error)
Query(query string, args ...any) (*sql.Rows, error)
@@ -36,7 +54,7 @@ func {{.Type}}_Insert(
}
_, err = tx.Exec("{{.InsertQuery}}", {{.InsertArgs}})
return err
return translateError(err)
}
{{- end}} {{/* if not .NoInsert */}}
@@ -48,27 +66,29 @@ func {{.Type}}_Insert(
func {{.Type}}_Update(
tx TX,
row *{{.Type}},
) (found bool, err error) {
) (err error) {
{{.Type}}_Sanitize(row)
if err = {{.Type}}_Validate(row); err != nil {
return false, err
return err
}
result, err := tx.Exec("{{.UpdateQuery}}", {{.UpdateArgs}})
if err != nil {
return false, err
return translateError(err)
}
n, err := result.RowsAffected()
if err != nil {
panic(err)
}
if n > 1 {
switch n {
case 0:
return ErrNotFound
case 1:
return nil
default:
panic("multiple rows updated")
}
return n != 0, nil
}
{{- end}}
@@ -77,27 +97,29 @@ func {{.Type}}_Update(
func {{.Type}}_UpdateFull(
tx TX,
row *{{.Type}},
) (found bool, err error) {
) (err error) {
{{.Type}}_Sanitize(row)
if err = {{.Type}}_Validate(row); err != nil {
return false, err
return err
}
result, err := tx.Exec("{{.UpdateFullQuery}}", {{.UpdateFullArgs}})
if err != nil {
return false, err
return translateError(err)
}
n, err := result.RowsAffected()
if err != nil {
panic(err)
}
if n > 1 {
switch n {
case 0:
return ErrNotFound
case 1:
return nil
default:
panic("multiple rows updated")
}
return n != 0, nil
}
{{- end}}
@@ -109,22 +131,24 @@ func {{.Type}}_UpdateFull(
func {{.Type}}_Delete(
tx TX,
{{.PKFunctionArgs -}}
) (found bool, err error) {
) (err error) {
result, err := tx.Exec("{{.DeleteQuery}}", {{.DeleteArgs}})
if err != nil {
return false, err
if err != nil {
return translateError(err)
}
n, err := result.RowsAffected()
if err != nil {
panic(err)
}
if n > 1 {
switch n {
case 0:
return ErrNotFound
case 1:
return nil
default:
panic("multiple rows deleted")
}
return n != 0, nil
}
{{- end}}
@@ -138,7 +162,7 @@ func {{.Type}}_Get(
) {
row = &{{.Type}}{}
r := tx.QueryRow("{{.GetQuery}}", {{.DeleteArgs}})
err = r.Scan({{.ScanArgs}})
err = translateError(r.Scan({{.ScanArgs}}))
return
}
@@ -153,7 +177,7 @@ func {{.Type}}_GetWhere(
) {
row = &{{.Type}}{}
r := tx.QueryRow(query, args...)
err = r.Scan({{.ScanArgs}})
err = translateError(r.Scan({{.ScanArgs}}))
return
}
@@ -177,7 +201,7 @@ func {{.Type}}_Iterate(
defer rows.Close()
for rows.Next() {
row := &{{.Type}}{}
err := rows.Scan({{.ScanArgs}})
err := translateError(rows.Scan({{.ScanArgs}}))
if !yield(row, err) {
return
}

8
sqliteutil/errors.go Normal file
View File

@@ -0,0 +1,8 @@
package sqliteutil
import "github.com/mattn/go-sqlite3"
func ErrIsConstraint(err error) bool {
e, ok := err.(sqlite3.Error)
return ok && e.Code == 19
}