From d8d22cf5575ff24edc49c34d60d325225e55cbc8 Mon Sep 17 00:00:00 2001 From: Peter Sanchez Date: Tue, 18 Apr 2023 16:13:44 -0600 Subject: [PATCH] Adding EmailNotification model and mailchecker. --- email_notifications.go | 88 +++++++++++++++++++++++++ go.mod | 21 +++--- go.sum | 43 +++++++----- mailchecker.go | 145 +++++++++++++++++++++++++++++++++++++++++ schema.sql | 27 ++++++++ 5 files changed, 298 insertions(+), 26 deletions(-) create mode 100644 email_notifications.go create mode 100644 mailchecker.go create mode 100644 schema.sql diff --git a/email_notifications.go b/email_notifications.go new file mode 100644 index 0000000..f0b0a58 --- /dev/null +++ b/email_notifications.go @@ -0,0 +1,88 @@ +package sesfeedback + +import ( + "context" + "database/sql" + "time" + + sq "github.com/Masterminds/squirrel" + "hg.code.netlandish.com/~netlandish/gobwebs/database" +) + +// EmailNotification is the struct/model for storing email notifications from +// AWS SES +type EmailNotification struct { + ID int `db:"id"` + Email string `db:"email"` + Count int `db:"count"` + Notifications string `db:"notifications"` + CreatedOn time.Time `db:"created_on"` + UpdatedOn time.Time `db:"updated_on"` +} + +// GetEmailNotifications retuns notifications using the given filters +func GetEmailNotifications(ctx context.Context, opts *database.FilterOptions) ([]*EmailNotification, error) { + if opts == nil { + opts = &database.FilterOptions{} + } + emailNotifications := make([]*EmailNotification, 0) + if err := database.WithTx(ctx, database.TxOptionsRO, func(tx *sql.Tx) error { + q := opts.GetBuilder(nil) + rows, err := q. + Columns("id", "email", "count", "notifications", "created_on", "updated_on"). + From("email_notifications"). + PlaceholderFormat(sq.Dollar). + RunWith(tx). + QueryContext(ctx) + if err != nil { + if err == sql.ErrNoRows { + return nil + } + return err + } + defer rows.Close() + + for rows.Next() { + var n EmailNotification + if err = rows.Scan(&n.ID, &n.Email, &n.Count, &n.Notifications, + &n.CreatedOn, &n.UpdatedOn); err != nil { + return err + } + emailNotifications = append(emailNotifications, &n) + } + return nil + }); err != nil { + return nil, err + } + return emailNotifications, nil +} + +// Store will save a notification +func (n *EmailNotification) Store(ctx context.Context) error { + err := database.WithTx(ctx, nil, func(tx *sql.Tx) error { + var err error + if n.ID == 0 { + err = sq. + Insert("email_notifications"). + Columns("email", "count", "notifications", "created_on", "updated_on"). + Values(n.Email, n.Count, n.Notifications, n.CreatedOn, n.UpdatedOn). + Suffix(`RETURNING id, created_on, updated_on`). + PlaceholderFormat(sq.Dollar). + RunWith(tx). + ScanContext(ctx, &n.ID, &n.CreatedOn, &n.UpdatedOn) + } else { + err = sq. + Update("email_notifications"). + Set("email", n.Email). + Set("count", n.Count). + Set("notifications", n.Notifications). + Where("id = ?", n.ID). + Suffix(`RETURNING (updated_on)`). + PlaceholderFormat(sq.Dollar). + RunWith(tx). + ScanContext(ctx, &n.UpdatedOn) + } + return err + }) + return err +} diff --git a/go.mod b/go.mod index 641994f..dbc6164 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,9 @@ module hg.code.netlandish.com/~netlandish/gobwebs-ses-feedback go 1.18 require ( - github.com/labstack/echo/v4 v4.9.1 - hg.code.netlandish.com/~netlandish/gobwebs v0.0.0-20221207194640-4f915da6854d + github.com/Masterminds/squirrel v1.5.4 + github.com/labstack/echo/v4 v4.10.2 + hg.code.netlandish.com/~netlandish/gobwebs v0.0.0-20230418221230-11a51edbd650 ) require ( @@ -28,10 +29,12 @@ require ( github.com/klauspost/compress v1.13.5 // indirect github.com/klauspost/cpuid v1.3.1 // indirect github.com/labstack/gommon v0.4.0 // indirect + github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect + github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/lib/pq v1.10.4 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect github.com/minio/md5-simd v1.1.0 // indirect github.com/minio/minio-go/v7 v7.0.22 // indirect @@ -48,13 +51,13 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/spazzymoto/echo-scs-session v1.0.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasttemplate v1.2.1 // indirect + github.com/valyala/fasttemplate v1.2.2 // indirect github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec // indirect - golang.org/x/crypto v0.0.0-20221012134737-56aed061732a // indirect - golang.org/x/net v0.0.0-20221017152216-f25eb7ecb193 // indirect - golang.org/x/sys v0.1.0 // indirect - golang.org/x/text v0.4.0 // indirect - golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect + golang.org/x/crypto v0.6.0 // indirect + golang.org/x/net v0.7.0 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect + golang.org/x/time v0.3.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/ini.v1 v1.57.0 // indirect petersanchez.com/carrier v0.1.1 // indirect diff --git a/go.sum b/go.sum index 154c0d4..7210fa4 100644 --- a/go.sum +++ b/go.sum @@ -35,6 +35,8 @@ git.sr.ht/~sircmpwn/dowork v0.0.0-20221010085743-46c4299d76a1 h1:EvPKkneKkF/f7zE git.sr.ht/~sircmpwn/dowork v0.0.0-20221010085743-46c4299d76a1/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM= +github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= github.com/ProtonMail/go-crypto v0.0.0-20211112122917-428f8eabeeb3/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f h1:J2FzIrXN82q5uyUraeJpLIm7U6PffRwje2ORho5yIik= github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= @@ -187,11 +189,15 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/labstack/echo/v4 v4.3.0/go.mod h1:PvmtTvhVqKDzDQy4d3bWzPjZLzom4iQbAZy2sgZ/qI8= -github.com/labstack/echo/v4 v4.9.1 h1:GliPYSpzGKlyOhqIbG8nmHBo3i1saKWFOgh41AN3b+Y= -github.com/labstack/echo/v4 v4.9.1/go.mod h1:Pop5HLc+xoc4qhTZ1ip6C0RtP7Z+4VzRLWZZFKqbbjo= +github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M= +github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8= github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= +github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= +github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= +github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= +github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/lib/pq v1.4.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -206,8 +212,9 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= @@ -281,13 +288,14 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= +github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec h1:DGmKwyZwEB8dI7tbLt/I/gQuP559o/0FrAkHKlQM/Ks= github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec/go.mod h1:owBmyHYMLkxyrugmfwE/DLJyW8Ro9mkphwuVErQ0iUw= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -307,8 +315,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20221012134737-56aed061732a h1:NmSIgad6KjE6VvHciPZuNRTKxGhlPfD6OA87W/PLkqg= -golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -373,8 +381,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20221017152216-f25eb7ecb193 h1:3Moaxt4TfzNcQH6DWvlYKraN1ozhBXQHcgvXjRGeim0= -golang.org/x/net v0.0.0-20221017152216-f25eb7ecb193/go.mod h1:RpDiru2p0u2F0lLpEoqnP2+7xs0ifAuOcJ442g6GU2s= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -440,8 +448,8 @@ golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -451,13 +459,14 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -594,10 +603,10 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -hg.code.netlandish.com/~netlandish/gobwebs v0.0.0-20221207194640-4f915da6854d h1:5L96lsWvEmwy/uF70Bn2t9xdMMTKrXrCGtJRWVLQ7EU= -hg.code.netlandish.com/~netlandish/gobwebs v0.0.0-20221207194640-4f915da6854d/go.mod h1:CIslxia4nTV8zBdXdo9lAiSW3j4pMb482v3uTjcirE4= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +hg.code.netlandish.com/~netlandish/gobwebs v0.0.0-20230418221230-11a51edbd650 h1:7h1zQPqA/oJiaD5vp/F0+9SYEl01t+OS39+46Vkbz4E= +hg.code.netlandish.com/~netlandish/gobwebs v0.0.0-20230418221230-11a51edbd650/go.mod h1:oRFChW93YEeH7+mSYMJkXgd8cp72YGewJg+ZGZI24qk= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/mailchecker.go b/mailchecker.go new file mode 100644 index 0000000..3bc67cc --- /dev/null +++ b/mailchecker.go @@ -0,0 +1,145 @@ +package sesfeedback + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "strings" + + sq "github.com/Masterminds/squirrel" + "hg.code.netlandish.com/~netlandish/gobwebs/database" +) + +var maxNotificiation int = 2 + +// MailChecker implements the gobwebs.MailChecker interface +type MailChecker struct { + DB *sql.DB +} + +// Check verifies if we're able to send an email to an email address +func (m *MailChecker) Check(email string, limit int) error { + email = strings.Trim(email, " ") + if email == "" { + return nil + } + email = strings.ToLower(email) + // Need to query for this email address + opts := &database.FilterOptions{ + Filter: sq.And{ + sq.Expr("email ILIKE ?", email), + sq.Expr("count >= ?", maxNotificiation), + }, + Limit: 1, + } + ctx := database.Context(context.Background(), m.DB) + notifications, err := GetEmailNotifications(ctx, opts) + if err != nil { + return err + } + + if len(notifications) >= limit { + return errors.New("The email has been include in the black list") + } + return nil +} + +// Bounce implementation +func (m *MailChecker) Bounce(data map[string]any) error { + return processNotification(m.DB, data, "bounce", "bouncedRecipients") +} + +// Complaint ... +func (m *MailChecker) Complaint(data map[string]any) error { + return processNotification(m.DB, data, "complaint", "complainedRecipients") +} + +// Delivery ... +func (m *MailChecker) Delivery(data map[string]any) error { + return nil +} + +// Open ... +func (m *MailChecker) Open(data map[string]any) error { + return nil +} + +// Reject ... +func (m *MailChecker) Reject(data map[string]any) error { + return nil +} + +// Send ... +func (m *MailChecker) Send(data map[string]any) error { + return nil +} + +// Subscribe ... +func (m *MailChecker) Subscribe(data string) error { + return nil +} + +// Unsubscribe ... +func (m *MailChecker) Unsubscribe(data string) error { + return nil +} + +// Click ... +func (m *MailChecker) Click(data map[string]any) error { + return nil +} + +func processNotification(db *sql.DB, data map[string]any, nType, nRecipients string) error { + responseData := data[nType].(map[string]any) + for _, notificationType := range responseData[nRecipients].([]any) { + email := notificationType.(map[string]any)["emailAddress"].(string) + email = strings.ToLower(strings.Trim(email, " ")) + opts := &database.FilterOptions{ + Filter: sq.Expr("email ILIKE ?", email), + Limit: 1, + } + ctx := database.Context(context.Background(), db) + notifications, err := GetEmailNotifications(ctx, opts) + if err != nil { + return err + } + + var notification *EmailNotification + if len(notifications) == 0 { + notificationMap := map[string][]any{nType: {responseData}} + notificationJSON, err := json.Marshal(notificationMap) + if err != nil { + return err + } + notification = &EmailNotification{ + Email: email, + Notifications: string(notificationJSON), + Count: 1, + } + } else { + notification = notifications[0] + notification.Count++ + var notificationMap map[string]any + err := json.Unmarshal([]byte(notification.Notifications), ¬ificationMap) + if err != nil { + return err + } + if _, ok := notificationMap[nType]; !ok { + notificationMap[nType] = []any{} + } + notificationMap[nType] = append(notificationMap[nType].([]any), responseData) + notificationJSON, err := json.Marshal(notificationMap) + if err != nil { + return err + } + notification.Notifications = string(notificationJSON) + + } + err = notification.Store(ctx) + if err != nil { + return err + } + } + return nil +} diff --git a/schema.sql b/schema.sql new file mode 100644 index 0000000..f288eed --- /dev/null +++ b/schema.sql @@ -0,0 +1,27 @@ +-- Optional Function helper to set `updated_on` column +-- CREATE OR REPLACE FUNCTION update_updated_on_column() +-- RETURNS TRIGGER AS $$ +-- BEGIN +-- IF row(NEW.*) IS DISTINCT FROM row(OLD.*) THEN +-- NEW.updated_on = NOW() AT TIME ZONE 'UTC'; +-- RETURN NEW; +-- ELSE +-- RETURN OLD; +-- END IF; +-- END; +-- $$ language 'plpgsql'; + + +CREATE TABLE email_notifications ( + id SERIAL PRIMARY KEY, + email VARCHAR ( 255 ) UNIQUE NOT NULL, + count INT NOT NULL DEFAULT 0, + notifications JSON NOT NULL, + created_on TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_on TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP +); +CREATE INDEX email_notifications_id_idx on email_notifications (id); + +-- If you created the function above you can create a trigger like so: +-- CREATE TRIGGER update_email_notifications_modtime BEFORE UPDATE ON email_notifications FOR EACH ROW EXECUTE PROCEDURE update_updated_on_column(); + -- 2.45.2