From b6be99c280d84d77d114256ba580fd5c20710de2 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Fri, 14 Feb 2025 11:55:04 +0100 Subject: [PATCH 1/5] feat(emarsys): change events --- pkg/provider/emarsys/event/emarsysaddtocart.go | 15 +++++++++++++++ pkg/provider/emarsys/event/emarsyscart.go | 15 --------------- pkg/provider/emarsys/event/emarsyscategory.go | 14 -------------- pkg/provider/emarsys/event/emarsyspageview.go | 15 +++++++++++++++ .../emarsys/event/emarsysremovefromcart.go | 15 +++++++++++++++ pkg/provider/emarsys/event/emarsysview.go | 15 --------------- pkg/provider/emarsys/event/emarsysviewitem.go | 15 +++++++++++++++ pkg/provider/emarsys/event/emarsyviewitemlist.go | 14 ++++++++++++++ .../emarsys/event/params/emarsyaddtocart.go | 6 ++++++ .../emarsys/event/params/emarsyremovefromcart.go | 6 ++++++ pkg/provider/emarsys/event/params/emarsyscart.go | 6 ------ .../emarsys/event/params/emarsyscategory.go | 6 ------ .../emarsys/event/params/emarsyspageview.go | 6 ++++++ .../emarsys/event/params/emarsyspurchase.go | 4 ++-- pkg/provider/emarsys/event/params/emarsysview.go | 6 ------ .../emarsys/event/params/emarsysviewitem.go | 6 ++++++ .../emarsys/event/params/emarsysviewitemlist.go | 6 ++++++ 17 files changed, 106 insertions(+), 64 deletions(-) create mode 100644 pkg/provider/emarsys/event/emarsysaddtocart.go delete mode 100644 pkg/provider/emarsys/event/emarsyscart.go delete mode 100644 pkg/provider/emarsys/event/emarsyscategory.go create mode 100644 pkg/provider/emarsys/event/emarsyspageview.go create mode 100644 pkg/provider/emarsys/event/emarsysremovefromcart.go delete mode 100644 pkg/provider/emarsys/event/emarsysview.go create mode 100644 pkg/provider/emarsys/event/emarsysviewitem.go create mode 100644 pkg/provider/emarsys/event/emarsyviewitemlist.go create mode 100644 pkg/provider/emarsys/event/params/emarsyaddtocart.go create mode 100644 pkg/provider/emarsys/event/params/emarsyremovefromcart.go delete mode 100644 pkg/provider/emarsys/event/params/emarsyscart.go delete mode 100644 pkg/provider/emarsys/event/params/emarsyscategory.go create mode 100644 pkg/provider/emarsys/event/params/emarsyspageview.go delete mode 100644 pkg/provider/emarsys/event/params/emarsysview.go create mode 100644 pkg/provider/emarsys/event/params/emarsysviewitem.go create mode 100644 pkg/provider/emarsys/event/params/emarsysviewitemlist.go diff --git a/pkg/provider/emarsys/event/emarsysaddtocart.go b/pkg/provider/emarsys/event/emarsysaddtocart.go new file mode 100644 index 0000000..aa66d26 --- /dev/null +++ b/pkg/provider/emarsys/event/emarsysaddtocart.go @@ -0,0 +1,15 @@ +package event + +import ( + sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" + "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" + "github.com/foomo/sesamy-go/pkg/sesamy" +) + +const EventNameEmarsysAddToCart sesamy.EventName = "emarsys_add_to_cart" + +type EmarsysAddToCart sesamy.Event[params.EmarsysAddToCart[sesamyparams.Item]] + +func NewEmarsysAddToCart(p params.EmarsysAddToCart[sesamyparams.Item]) sesamy.Event[params.EmarsysAddToCart[sesamyparams.Item]] { + return sesamy.NewEvent(EventNameEmarsysAddToCart, p) +} diff --git a/pkg/provider/emarsys/event/emarsyscart.go b/pkg/provider/emarsys/event/emarsyscart.go deleted file mode 100644 index 0ce4342..0000000 --- a/pkg/provider/emarsys/event/emarsyscart.go +++ /dev/null @@ -1,15 +0,0 @@ -package event - -import ( - sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" - "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" - "github.com/foomo/sesamy-go/pkg/sesamy" -) - -const EventNameEmarsysCart sesamy.EventName = "emarsys_cart" - -type EmarsysCart sesamy.Event[params.EmarsysCart[sesamyparams.Item]] - -func NewEmarsysCart(p params.EmarsysCart[sesamyparams.Item]) sesamy.Event[params.EmarsysCart[sesamyparams.Item]] { - return sesamy.NewEvent(EventNameEmarsysCart, p) -} diff --git a/pkg/provider/emarsys/event/emarsyscategory.go b/pkg/provider/emarsys/event/emarsyscategory.go deleted file mode 100644 index 8d5076f..0000000 --- a/pkg/provider/emarsys/event/emarsyscategory.go +++ /dev/null @@ -1,14 +0,0 @@ -package event - -import ( - "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" - "github.com/foomo/sesamy-go/pkg/sesamy" -) - -const EventNameEmarsysCategory sesamy.EventName = "emarsys_category" - -type EmarsysCategory sesamy.Event[params.EmarsysCategory] - -func NewEmarsysCategory(p params.EmarsysCategory) sesamy.Event[params.EmarsysCategory] { - return sesamy.NewEvent(EventNameEmarsysCategory, p) -} diff --git a/pkg/provider/emarsys/event/emarsyspageview.go b/pkg/provider/emarsys/event/emarsyspageview.go new file mode 100644 index 0000000..30bc0c4 --- /dev/null +++ b/pkg/provider/emarsys/event/emarsyspageview.go @@ -0,0 +1,15 @@ +package event + +import ( + sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" + "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" + "github.com/foomo/sesamy-go/pkg/sesamy" +) + +const EventNameEmarsysPageView sesamy.EventName = "emarsys_page_view" + +type EmarsysPageView sesamy.Event[params.EmarsysPageView[sesamyparams.Item]] + +func NewEmarsysPageView(p params.EmarsysPageView[sesamyparams.Item]) sesamy.Event[params.EmarsysPageView[sesamyparams.Item]] { + return sesamy.NewEvent(EventNameEmarsysPageView, p) +} diff --git a/pkg/provider/emarsys/event/emarsysremovefromcart.go b/pkg/provider/emarsys/event/emarsysremovefromcart.go new file mode 100644 index 0000000..1002e89 --- /dev/null +++ b/pkg/provider/emarsys/event/emarsysremovefromcart.go @@ -0,0 +1,15 @@ +package event + +import ( + sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" + "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" + "github.com/foomo/sesamy-go/pkg/sesamy" +) + +const EventNameEmarsysRemoveFromCart sesamy.EventName = "emarsys_remove_from_cart" + +type EmarsysRemoveFromCart sesamy.Event[params.EmarsysRemoveFromCart[sesamyparams.Item]] + +func NewEmarsysRemoveFromCart(p params.EmarsysRemoveFromCart[sesamyparams.Item]) sesamy.Event[params.EmarsysRemoveFromCart[sesamyparams.Item]] { + return sesamy.NewEvent(EventNameEmarsysRemoveFromCart, p) +} diff --git a/pkg/provider/emarsys/event/emarsysview.go b/pkg/provider/emarsys/event/emarsysview.go deleted file mode 100644 index f8c14ca..0000000 --- a/pkg/provider/emarsys/event/emarsysview.go +++ /dev/null @@ -1,15 +0,0 @@ -package event - -import ( - sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" - "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" - "github.com/foomo/sesamy-go/pkg/sesamy" -) - -const EventNameEmarsysView sesamy.EventName = "emarsys_view" - -type EmarsysView sesamy.Event[params.EmarsysView[sesamyparams.Item]] - -func NewEmarsysView(p params.EmarsysView[sesamyparams.Item]) sesamy.Event[params.EmarsysView[sesamyparams.Item]] { - return sesamy.NewEvent(EventNameEmarsysView, p) -} diff --git a/pkg/provider/emarsys/event/emarsysviewitem.go b/pkg/provider/emarsys/event/emarsysviewitem.go new file mode 100644 index 0000000..a515bf4 --- /dev/null +++ b/pkg/provider/emarsys/event/emarsysviewitem.go @@ -0,0 +1,15 @@ +package event + +import ( + sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" + "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" + "github.com/foomo/sesamy-go/pkg/sesamy" +) + +const EventNameEmarsysViewItem sesamy.EventName = "emarsys_view_item" + +type EmarsysViewItem sesamy.Event[params.EmarsysViewItem[sesamyparams.Item]] + +func NewEmarsysViewItem(p params.EmarsysViewItem[sesamyparams.Item]) sesamy.Event[params.EmarsysViewItem[sesamyparams.Item]] { + return sesamy.NewEvent(EventNameEmarsysViewItem, p) +} diff --git a/pkg/provider/emarsys/event/emarsyviewitemlist.go b/pkg/provider/emarsys/event/emarsyviewitemlist.go new file mode 100644 index 0000000..000fb8a --- /dev/null +++ b/pkg/provider/emarsys/event/emarsyviewitemlist.go @@ -0,0 +1,14 @@ +package event + +import ( + "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" + "github.com/foomo/sesamy-go/pkg/sesamy" +) + +const EventNameEmarsysViewItemList sesamy.EventName = "emarsys_view_item_list" + +type EmarsysViewItemList sesamy.Event[params.EmarsysViewItemList] + +func NewEmarsysViewItemList(p params.EmarsysViewItemList) sesamy.Event[params.EmarsysViewItemList] { + return sesamy.NewEvent(EventNameEmarsysViewItemList, p) +} diff --git a/pkg/provider/emarsys/event/params/emarsyaddtocart.go b/pkg/provider/emarsys/event/params/emarsyaddtocart.go new file mode 100644 index 0000000..6fe8c61 --- /dev/null +++ b/pkg/provider/emarsys/event/params/emarsyaddtocart.go @@ -0,0 +1,6 @@ +package params + +type EmarsysAddToCart[I any] struct { + Items []I `json:"items,omitempty" dlv:"dataModel.items"` + PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` +} diff --git a/pkg/provider/emarsys/event/params/emarsyremovefromcart.go b/pkg/provider/emarsys/event/params/emarsyremovefromcart.go new file mode 100644 index 0000000..8ae41f6 --- /dev/null +++ b/pkg/provider/emarsys/event/params/emarsyremovefromcart.go @@ -0,0 +1,6 @@ +package params + +type EmarsysRemoveFromCart[I any] struct { + Items []I `json:"items,omitempty" dlv:"dataModel.items"` + PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` +} diff --git a/pkg/provider/emarsys/event/params/emarsyscart.go b/pkg/provider/emarsys/event/params/emarsyscart.go deleted file mode 100644 index 61745df..0000000 --- a/pkg/provider/emarsys/event/params/emarsyscart.go +++ /dev/null @@ -1,6 +0,0 @@ -package params - -type EmarsysCart[I any] struct { - Items []I `json:"items,omitempty"` - PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` -} diff --git a/pkg/provider/emarsys/event/params/emarsyscategory.go b/pkg/provider/emarsys/event/params/emarsyscategory.go deleted file mode 100644 index ea2740e..0000000 --- a/pkg/provider/emarsys/event/params/emarsyscategory.go +++ /dev/null @@ -1,6 +0,0 @@ -package params - -type EmarsysCategory struct { - ItemListName string `json:"item_list_name,omitempty"` - PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` -} diff --git a/pkg/provider/emarsys/event/params/emarsyspageview.go b/pkg/provider/emarsys/event/params/emarsyspageview.go new file mode 100644 index 0000000..0f6bafe --- /dev/null +++ b/pkg/provider/emarsys/event/params/emarsyspageview.go @@ -0,0 +1,6 @@ +package params + +type EmarsysPageView[I any] struct { + Items []I `json:"items,omitempty" dlv:"dataModel.items"` + PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` +} diff --git a/pkg/provider/emarsys/event/params/emarsyspurchase.go b/pkg/provider/emarsys/event/params/emarsyspurchase.go index e1486ba..79ee6c1 100644 --- a/pkg/provider/emarsys/event/params/emarsyspurchase.go +++ b/pkg/provider/emarsys/event/params/emarsyspurchase.go @@ -1,7 +1,7 @@ package params type EmarsysPurchase[I any] struct { - TransactionID string `json:"transaction_id,omitempty"` - Items []I `json:"items,omitempty"` + TransactionID string `json:"transaction_id,omitempty" dlv:"dataModel.transaction_id"` + Items []I `json:"items,omitempty" dlv:"dataModel.items"` PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` } diff --git a/pkg/provider/emarsys/event/params/emarsysview.go b/pkg/provider/emarsys/event/params/emarsysview.go deleted file mode 100644 index d3402b1..0000000 --- a/pkg/provider/emarsys/event/params/emarsysview.go +++ /dev/null @@ -1,6 +0,0 @@ -package params - -type EmarsysView[I any] struct { - Items []I `json:"items,omitempty"` - PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` -} diff --git a/pkg/provider/emarsys/event/params/emarsysviewitem.go b/pkg/provider/emarsys/event/params/emarsysviewitem.go new file mode 100644 index 0000000..98ca217 --- /dev/null +++ b/pkg/provider/emarsys/event/params/emarsysviewitem.go @@ -0,0 +1,6 @@ +package params + +type EmarsysViewItem[I any] struct { + Items []I `json:"items,omitempty" dlv:"dataModel.items"` + PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` +} diff --git a/pkg/provider/emarsys/event/params/emarsysviewitemlist.go b/pkg/provider/emarsys/event/params/emarsysviewitemlist.go new file mode 100644 index 0000000..e9650ef --- /dev/null +++ b/pkg/provider/emarsys/event/params/emarsysviewitemlist.go @@ -0,0 +1,6 @@ +package params + +type EmarsysViewItemList struct { + ItemListName string `json:"item_list_name,omitempty" dlv:"eventModel.item_list_name"` + PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` +} From 28805c1eb3bb7b2c3973b9bb9d3a5ca29bf70909 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Mon, 17 Feb 2025 09:35:34 +0100 Subject: [PATCH 2/5] chore: update lint settings --- .golangci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index e64ec42..25409c6 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -106,6 +106,7 @@ linters: - asciicheck # checks that all code identifiers does not have non-ASCII symbols in the name [fast: true, auto-fix: false] - bidichk # Checks for dangerous unicode character sequences [fast: true, auto-fix: false] - bodyclose # checks whether HTTP response body is closed successfully [fast: false, auto-fix: false] + - canonicalheader # Checks whether net/http.Header uses canonical header [fast: false, auto-fix: false] - containedctx # containedctx is a linter that detects struct contained context.Context field [fast: false, auto-fix: false] - contextcheck # check whether the function uses a non-inherited context [fast: false, auto-fix: false] #- copyloopvar # (go >= 1.22) copyloopvar is a linter detects places where loop variables are copied [fast: true, auto-fix: false] @@ -115,6 +116,8 @@ linters: - errname # Checks that sentinel errors are prefixed with the `Err` and error types are suffixed with the `Error`. [fast: false, auto-fix: false] - errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13. [fast: false, auto-fix: false] - exhaustive # check exhaustiveness of enum switch statements [fast: false, auto-fix: false] + - exptostd # Detects functions from golang.org/x/exp/ that can be replaced by std functions. [auto-fix] + - fatcontext #Detects nested contexts in loops [fast: false, auto-fix: false] #- forbidigo # Forbids identifiers [fast: false, auto-fix: false] - forcetypeassert # finds forced type assertions [fast: true, auto-fix: false] - gocheckcompilerdirectives # Checks that go compiler directive comments (//go:) are valid. [fast: true, auto-fix: false] @@ -135,11 +138,12 @@ linters: #- intrange # (go >= 1.22) intrange is a linter to find places where for loops could make use of an integer range. [fast: true, auto-fix: false] - loggercheck # (logrlint) Checks key value pairs for common logger libraries (kitlog,klog,logr,zap). [fast: false, auto-fix: false] - makezero # Finds slice declarations with non-zero initial length [fast: false, auto-fix: false] - - misspell # Finds commonly misspelled English words [fast: true, auto-fix: true] - mirror # reports wrong mirror patterns of bytes/strings usage [fast: false, auto-fix: true] + - misspell # Finds commonly misspelled English words [fast: true, auto-fix: true] - musttag # enforce field tags in (un)marshaled structs [fast: false, auto-fix: false] - nakedret # Checks that functions with naked returns are not longer than a maximum size (can be zero). [fast: true, auto-fix: false] - nilerr # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false] + - nilnesserr # Reports constructs that checks for err != nil, but returns a different nil value error. - nilnil # Checks that there is no simultaneous return of `nil` error and an invalid value. [fast: false, auto-fix: false] - noctx # Finds sending http request without context.Context [fast: false, auto-fix: false] - nolintlint # Reports ill-formed or insufficient nolint directives [fast: true, auto-fix: true] @@ -154,7 +158,6 @@ linters: - spancheck # Checks for mistakes with OpenTelemetry/Census spans. [fast: false, auto-fix: false] - sqlclosecheck # Checks that sql.Rows, sql.Stmt, sqlx.NamedStmt, pgx.Query are closed. [fast: false, auto-fix: false] - stylecheck # Stylecheck is a replacement for golint [fast: false, auto-fix: false] - - tenv # tenv is analyzer that detects using os.Setenv instead of t.Setenv since Go1.17 [fast: false, auto-fix: false] - testableexamples # linter checks if examples are testable (have an expected output) [fast: true, auto-fix: false] - testifylint # Checks usage of github.com/stretchr/testify. [fast: false, auto-fix: false] - testpackage # linter that makes you use a separate _test package [fast: true, auto-fix: false] @@ -173,6 +176,7 @@ linters: #- dogsled # Checks assignments with too many blank identifiers (e.g. x, _, _, _, := f()) [fast: true, auto-fix: false] #- err113 # Go linter to check the errors handling expressions [fast: false, auto-fix: false] #- exhaustruct # Checks if all structure fields are initialized [fast: false, auto-fix: false] + #- exptostd # Detects functions from golang.org/x/exp/ that can be replaced by std functions. [auto-fix] #- gci # Gci controls Go package import order and makes it always deterministic. [fast: true, auto-fix: true] #- gochecknoglobals # Check that no global variables exist. [fast: false, auto-fix: false] #- gochecknoinits # Checks that no init functions are present in Go code [fast: true, auto-fix: false] From 54545c6e06564e0b9950b04ea0554602b7072b86 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Mon, 17 Feb 2025 09:44:46 +0100 Subject: [PATCH 3/5] revert(emarsys): use event names --- pkg/provider/emarsys/event/emarsycategory.go | 14 ++++++++++++++ pkg/provider/emarsys/event/emarsysaddtocart.go | 15 --------------- pkg/provider/emarsys/event/emarsyscart.go | 15 +++++++++++++++ pkg/provider/emarsys/event/emarsyspageview.go | 15 --------------- .../emarsys/event/emarsysremovefromcart.go | 15 --------------- pkg/provider/emarsys/event/emarsysview.go | 15 +++++++++++++++ pkg/provider/emarsys/event/emarsysviewitem.go | 15 --------------- pkg/provider/emarsys/event/emarsyviewitemlist.go | 14 -------------- .../emarsys/event/params/emarsyaddtocart.go | 6 ------ .../emarsys/event/params/emarsyremovefromcart.go | 6 ------ .../params/{emarsyspageview.go => emarsyscart.go} | 2 +- ...{emarsysviewitemlist.go => emarsyscategory.go} | 2 +- .../params/{emarsysviewitem.go => emarsysview.go} | 2 +- 13 files changed, 47 insertions(+), 89 deletions(-) create mode 100644 pkg/provider/emarsys/event/emarsycategory.go delete mode 100644 pkg/provider/emarsys/event/emarsysaddtocart.go create mode 100644 pkg/provider/emarsys/event/emarsyscart.go delete mode 100644 pkg/provider/emarsys/event/emarsyspageview.go delete mode 100644 pkg/provider/emarsys/event/emarsysremovefromcart.go create mode 100644 pkg/provider/emarsys/event/emarsysview.go delete mode 100644 pkg/provider/emarsys/event/emarsysviewitem.go delete mode 100644 pkg/provider/emarsys/event/emarsyviewitemlist.go delete mode 100644 pkg/provider/emarsys/event/params/emarsyaddtocart.go delete mode 100644 pkg/provider/emarsys/event/params/emarsyremovefromcart.go rename pkg/provider/emarsys/event/params/{emarsyspageview.go => emarsyscart.go} (81%) rename pkg/provider/emarsys/event/params/{emarsysviewitemlist.go => emarsyscategory.go} (84%) rename pkg/provider/emarsys/event/params/{emarsysviewitem.go => emarsysview.go} (81%) diff --git a/pkg/provider/emarsys/event/emarsycategory.go b/pkg/provider/emarsys/event/emarsycategory.go new file mode 100644 index 0000000..8d5076f --- /dev/null +++ b/pkg/provider/emarsys/event/emarsycategory.go @@ -0,0 +1,14 @@ +package event + +import ( + "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" + "github.com/foomo/sesamy-go/pkg/sesamy" +) + +const EventNameEmarsysCategory sesamy.EventName = "emarsys_category" + +type EmarsysCategory sesamy.Event[params.EmarsysCategory] + +func NewEmarsysCategory(p params.EmarsysCategory) sesamy.Event[params.EmarsysCategory] { + return sesamy.NewEvent(EventNameEmarsysCategory, p) +} diff --git a/pkg/provider/emarsys/event/emarsysaddtocart.go b/pkg/provider/emarsys/event/emarsysaddtocart.go deleted file mode 100644 index aa66d26..0000000 --- a/pkg/provider/emarsys/event/emarsysaddtocart.go +++ /dev/null @@ -1,15 +0,0 @@ -package event - -import ( - sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" - "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" - "github.com/foomo/sesamy-go/pkg/sesamy" -) - -const EventNameEmarsysAddToCart sesamy.EventName = "emarsys_add_to_cart" - -type EmarsysAddToCart sesamy.Event[params.EmarsysAddToCart[sesamyparams.Item]] - -func NewEmarsysAddToCart(p params.EmarsysAddToCart[sesamyparams.Item]) sesamy.Event[params.EmarsysAddToCart[sesamyparams.Item]] { - return sesamy.NewEvent(EventNameEmarsysAddToCart, p) -} diff --git a/pkg/provider/emarsys/event/emarsyscart.go b/pkg/provider/emarsys/event/emarsyscart.go new file mode 100644 index 0000000..0ce4342 --- /dev/null +++ b/pkg/provider/emarsys/event/emarsyscart.go @@ -0,0 +1,15 @@ +package event + +import ( + sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" + "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" + "github.com/foomo/sesamy-go/pkg/sesamy" +) + +const EventNameEmarsysCart sesamy.EventName = "emarsys_cart" + +type EmarsysCart sesamy.Event[params.EmarsysCart[sesamyparams.Item]] + +func NewEmarsysCart(p params.EmarsysCart[sesamyparams.Item]) sesamy.Event[params.EmarsysCart[sesamyparams.Item]] { + return sesamy.NewEvent(EventNameEmarsysCart, p) +} diff --git a/pkg/provider/emarsys/event/emarsyspageview.go b/pkg/provider/emarsys/event/emarsyspageview.go deleted file mode 100644 index 30bc0c4..0000000 --- a/pkg/provider/emarsys/event/emarsyspageview.go +++ /dev/null @@ -1,15 +0,0 @@ -package event - -import ( - sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" - "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" - "github.com/foomo/sesamy-go/pkg/sesamy" -) - -const EventNameEmarsysPageView sesamy.EventName = "emarsys_page_view" - -type EmarsysPageView sesamy.Event[params.EmarsysPageView[sesamyparams.Item]] - -func NewEmarsysPageView(p params.EmarsysPageView[sesamyparams.Item]) sesamy.Event[params.EmarsysPageView[sesamyparams.Item]] { - return sesamy.NewEvent(EventNameEmarsysPageView, p) -} diff --git a/pkg/provider/emarsys/event/emarsysremovefromcart.go b/pkg/provider/emarsys/event/emarsysremovefromcart.go deleted file mode 100644 index 1002e89..0000000 --- a/pkg/provider/emarsys/event/emarsysremovefromcart.go +++ /dev/null @@ -1,15 +0,0 @@ -package event - -import ( - sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" - "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" - "github.com/foomo/sesamy-go/pkg/sesamy" -) - -const EventNameEmarsysRemoveFromCart sesamy.EventName = "emarsys_remove_from_cart" - -type EmarsysRemoveFromCart sesamy.Event[params.EmarsysRemoveFromCart[sesamyparams.Item]] - -func NewEmarsysRemoveFromCart(p params.EmarsysRemoveFromCart[sesamyparams.Item]) sesamy.Event[params.EmarsysRemoveFromCart[sesamyparams.Item]] { - return sesamy.NewEvent(EventNameEmarsysRemoveFromCart, p) -} diff --git a/pkg/provider/emarsys/event/emarsysview.go b/pkg/provider/emarsys/event/emarsysview.go new file mode 100644 index 0000000..f8c14ca --- /dev/null +++ b/pkg/provider/emarsys/event/emarsysview.go @@ -0,0 +1,15 @@ +package event + +import ( + sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" + "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" + "github.com/foomo/sesamy-go/pkg/sesamy" +) + +const EventNameEmarsysView sesamy.EventName = "emarsys_view" + +type EmarsysView sesamy.Event[params.EmarsysView[sesamyparams.Item]] + +func NewEmarsysView(p params.EmarsysView[sesamyparams.Item]) sesamy.Event[params.EmarsysView[sesamyparams.Item]] { + return sesamy.NewEvent(EventNameEmarsysView, p) +} diff --git a/pkg/provider/emarsys/event/emarsysviewitem.go b/pkg/provider/emarsys/event/emarsysviewitem.go deleted file mode 100644 index a515bf4..0000000 --- a/pkg/provider/emarsys/event/emarsysviewitem.go +++ /dev/null @@ -1,15 +0,0 @@ -package event - -import ( - sesamyparams "github.com/foomo/sesamy-go/pkg/event/params" - "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" - "github.com/foomo/sesamy-go/pkg/sesamy" -) - -const EventNameEmarsysViewItem sesamy.EventName = "emarsys_view_item" - -type EmarsysViewItem sesamy.Event[params.EmarsysViewItem[sesamyparams.Item]] - -func NewEmarsysViewItem(p params.EmarsysViewItem[sesamyparams.Item]) sesamy.Event[params.EmarsysViewItem[sesamyparams.Item]] { - return sesamy.NewEvent(EventNameEmarsysViewItem, p) -} diff --git a/pkg/provider/emarsys/event/emarsyviewitemlist.go b/pkg/provider/emarsys/event/emarsyviewitemlist.go deleted file mode 100644 index 000fb8a..0000000 --- a/pkg/provider/emarsys/event/emarsyviewitemlist.go +++ /dev/null @@ -1,14 +0,0 @@ -package event - -import ( - "github.com/foomo/sesamy-go/pkg/provider/emarsys/event/params" - "github.com/foomo/sesamy-go/pkg/sesamy" -) - -const EventNameEmarsysViewItemList sesamy.EventName = "emarsys_view_item_list" - -type EmarsysViewItemList sesamy.Event[params.EmarsysViewItemList] - -func NewEmarsysViewItemList(p params.EmarsysViewItemList) sesamy.Event[params.EmarsysViewItemList] { - return sesamy.NewEvent(EventNameEmarsysViewItemList, p) -} diff --git a/pkg/provider/emarsys/event/params/emarsyaddtocart.go b/pkg/provider/emarsys/event/params/emarsyaddtocart.go deleted file mode 100644 index 6fe8c61..0000000 --- a/pkg/provider/emarsys/event/params/emarsyaddtocart.go +++ /dev/null @@ -1,6 +0,0 @@ -package params - -type EmarsysAddToCart[I any] struct { - Items []I `json:"items,omitempty" dlv:"dataModel.items"` - PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` -} diff --git a/pkg/provider/emarsys/event/params/emarsyremovefromcart.go b/pkg/provider/emarsys/event/params/emarsyremovefromcart.go deleted file mode 100644 index 8ae41f6..0000000 --- a/pkg/provider/emarsys/event/params/emarsyremovefromcart.go +++ /dev/null @@ -1,6 +0,0 @@ -package params - -type EmarsysRemoveFromCart[I any] struct { - Items []I `json:"items,omitempty" dlv:"dataModel.items"` - PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` -} diff --git a/pkg/provider/emarsys/event/params/emarsyspageview.go b/pkg/provider/emarsys/event/params/emarsyscart.go similarity index 81% rename from pkg/provider/emarsys/event/params/emarsyspageview.go rename to pkg/provider/emarsys/event/params/emarsyscart.go index 0f6bafe..67e66ba 100644 --- a/pkg/provider/emarsys/event/params/emarsyspageview.go +++ b/pkg/provider/emarsys/event/params/emarsyscart.go @@ -1,6 +1,6 @@ package params -type EmarsysPageView[I any] struct { +type EmarsysCart[I any] struct { Items []I `json:"items,omitempty" dlv:"dataModel.items"` PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` } diff --git a/pkg/provider/emarsys/event/params/emarsysviewitemlist.go b/pkg/provider/emarsys/event/params/emarsyscategory.go similarity index 84% rename from pkg/provider/emarsys/event/params/emarsysviewitemlist.go rename to pkg/provider/emarsys/event/params/emarsyscategory.go index e9650ef..9ea20b1 100644 --- a/pkg/provider/emarsys/event/params/emarsysviewitemlist.go +++ b/pkg/provider/emarsys/event/params/emarsyscategory.go @@ -1,6 +1,6 @@ package params -type EmarsysViewItemList struct { +type EmarsysCategory struct { ItemListName string `json:"item_list_name,omitempty" dlv:"eventModel.item_list_name"` PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` } diff --git a/pkg/provider/emarsys/event/params/emarsysviewitem.go b/pkg/provider/emarsys/event/params/emarsysview.go similarity index 81% rename from pkg/provider/emarsys/event/params/emarsysviewitem.go rename to pkg/provider/emarsys/event/params/emarsysview.go index 98ca217..8c53638 100644 --- a/pkg/provider/emarsys/event/params/emarsysviewitem.go +++ b/pkg/provider/emarsys/event/params/emarsysview.go @@ -1,6 +1,6 @@ package params -type EmarsysViewItem[I any] struct { +type EmarsysView[I any] struct { Items []I `json:"items,omitempty" dlv:"dataModel.items"` PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` } From 6f300d90d5144405895fabe494336002d845dad1 Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Mon, 17 Feb 2025 09:45:54 +0100 Subject: [PATCH 4/5] revert(emarsys): remove dlv --- pkg/provider/emarsys/event/params/emarsyscart.go | 2 +- pkg/provider/emarsys/event/params/emarsyscategory.go | 2 +- pkg/provider/emarsys/event/params/emarsyspurchase.go | 4 ++-- pkg/provider/emarsys/event/params/emarsysview.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/provider/emarsys/event/params/emarsyscart.go b/pkg/provider/emarsys/event/params/emarsyscart.go index 67e66ba..61745df 100644 --- a/pkg/provider/emarsys/event/params/emarsyscart.go +++ b/pkg/provider/emarsys/event/params/emarsyscart.go @@ -1,6 +1,6 @@ package params type EmarsysCart[I any] struct { - Items []I `json:"items,omitempty" dlv:"dataModel.items"` + Items []I `json:"items,omitempty"` PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` } diff --git a/pkg/provider/emarsys/event/params/emarsyscategory.go b/pkg/provider/emarsys/event/params/emarsyscategory.go index 9ea20b1..ea2740e 100644 --- a/pkg/provider/emarsys/event/params/emarsyscategory.go +++ b/pkg/provider/emarsys/event/params/emarsyscategory.go @@ -1,6 +1,6 @@ package params type EmarsysCategory struct { - ItemListName string `json:"item_list_name,omitempty" dlv:"eventModel.item_list_name"` + ItemListName string `json:"item_list_name,omitempty"` PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` } diff --git a/pkg/provider/emarsys/event/params/emarsyspurchase.go b/pkg/provider/emarsys/event/params/emarsyspurchase.go index 79ee6c1..e1486ba 100644 --- a/pkg/provider/emarsys/event/params/emarsyspurchase.go +++ b/pkg/provider/emarsys/event/params/emarsyspurchase.go @@ -1,7 +1,7 @@ package params type EmarsysPurchase[I any] struct { - TransactionID string `json:"transaction_id,omitempty" dlv:"dataModel.transaction_id"` - Items []I `json:"items,omitempty" dlv:"dataModel.items"` + TransactionID string `json:"transaction_id,omitempty"` + Items []I `json:"items,omitempty"` PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` } diff --git a/pkg/provider/emarsys/event/params/emarsysview.go b/pkg/provider/emarsys/event/params/emarsysview.go index 8c53638..d3402b1 100644 --- a/pkg/provider/emarsys/event/params/emarsysview.go +++ b/pkg/provider/emarsys/event/params/emarsysview.go @@ -1,6 +1,6 @@ package params type EmarsysView[I any] struct { - Items []I `json:"items,omitempty" dlv:"dataModel.items"` + Items []I `json:"items,omitempty"` PageViewID string `json:"page_view_id,omitempty" dlv:"emarsys.page_view_id"` } From af1b60c7c5e491009027844180a6787d0927f10f Mon Sep 17 00:00:00 2001 From: Kevin Franklin Kim Date: Mon, 17 Feb 2025 09:46:25 +0100 Subject: [PATCH 5/5] revert(emarsys): filename --- .../emarsys/event/{emarsycategory.go => emarsyscategory.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkg/provider/emarsys/event/{emarsycategory.go => emarsyscategory.go} (100%) diff --git a/pkg/provider/emarsys/event/emarsycategory.go b/pkg/provider/emarsys/event/emarsyscategory.go similarity index 100% rename from pkg/provider/emarsys/event/emarsycategory.go rename to pkg/provider/emarsys/event/emarsyscategory.go