From a2396a093b5a0207fc2f024d6a68406f7fc90998 Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 2 Feb 2021 19:49:17 +0100 Subject: [PATCH] Rename event name --- magefile.go | 6 +++--- pkg/events/events.go | 4 ++-- pkg/events/testing.go | 4 ++-- pkg/initialize/events.go | 2 +- pkg/models/events.go | 36 ++++++++++++++++++------------------ pkg/models/listeners.go | 16 ++++++++-------- pkg/user/events.go | 2 +- pkg/user/listeners.go | 2 +- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/magefile.go b/magefile.go index 1a0ecb0c9..97d9662b9 100644 --- a/magefile.go +++ b/magefile.go @@ -801,8 +801,8 @@ func (Dev) MakeEvent(name, module string) error { type ` + name + ` struct { } -// TopicName defines the name for ` + name + ` -func (t *` + name + `) TopicName() string { +// Name defines the name for ` + name + ` +func (t *` + name + `) Name() string { return "` + eventName + `" } ` @@ -861,7 +861,7 @@ func (s *` + name + `) Handle(payload message.Payload) (err error) { } file.Close() - registerListenerCode := ` events.RegisterListener((&` + event + `{}).TopicName(), &` + name + `{}) + registerListenerCode := ` events.RegisterListener((&` + event + `{}).Name(), &` + name + `{}) ` f, err := os.OpenFile(filename, os.O_RDWR, 0600) diff --git a/pkg/events/events.go b/pkg/events/events.go index c554dfefb..98c126ee7 100644 --- a/pkg/events/events.go +++ b/pkg/events/events.go @@ -33,7 +33,7 @@ import ( var pubsub *gochannel.GoChannel type Event interface { - TopicName() string + Name() string } func InitEvents() (err error) { @@ -90,5 +90,5 @@ func Dispatch(event Event) error { } msg := message.NewMessage(watermill.NewUUID(), content) - return pubsub.Publish(event.TopicName(), msg) + return pubsub.Publish(event.Name(), msg) } diff --git a/pkg/events/testing.go b/pkg/events/testing.go index b91409450..4cf759f2c 100644 --- a/pkg/events/testing.go +++ b/pkg/events/testing.go @@ -38,11 +38,11 @@ func Fake() { func AssertDispatched(t *testing.T, event Event) { var found bool for _, testEvent := range dispatchedTestEvents { - if event.TopicName() == testEvent.TopicName() { + if event.Name() == testEvent.Name() { found = true break } } - assert.True(t, found, "Failed to assert "+event.TopicName()+" has been dispatched.") + assert.True(t, found, "Failed to assert "+event.Name()+" has been dispatched.") } diff --git a/pkg/initialize/events.go b/pkg/initialize/events.go index 305287aa9..c5c52a34c 100644 --- a/pkg/initialize/events.go +++ b/pkg/initialize/events.go @@ -24,6 +24,6 @@ type BootedEvent struct { } // TopicName defines the name for BootedEvent -func (t *BootedEvent) TopicName() string { +func (t *BootedEvent) Name() string { return "booted" } diff --git a/pkg/models/events.go b/pkg/models/events.go index a7fb7ba96..705c14f2b 100644 --- a/pkg/models/events.go +++ b/pkg/models/events.go @@ -30,7 +30,7 @@ type TaskCreatedEvent struct { Doer web.Auth } -func (t *TaskCreatedEvent) TopicName() string { +func (t *TaskCreatedEvent) Name() string { return "task.created" } @@ -39,7 +39,7 @@ type TaskUpdatedEvent struct { Doer web.Auth } -func (t *TaskUpdatedEvent) TopicName() string { +func (t *TaskUpdatedEvent) Name() string { return "task.updated" } @@ -50,7 +50,7 @@ type TaskDeletedEvent struct { } // TopicName defines the name for TaskDeletedEvent -func (t *TaskDeletedEvent) TopicName() string { +func (t *TaskDeletedEvent) Name() string { return "task.deleted" } @@ -60,7 +60,7 @@ type TaskAssigneeCreatedEvent struct { Doer web.Auth } -func (t *TaskAssigneeCreatedEvent) TopicName() string { +func (t *TaskAssigneeCreatedEvent) Name() string { return "task.assignee.created" } @@ -70,7 +70,7 @@ type TaskCommentCreatedEvent struct { Doer web.Auth } -func (t *TaskCommentCreatedEvent) TopicName() string { +func (t *TaskCommentCreatedEvent) Name() string { return "task.comment.created" } @@ -83,7 +83,7 @@ type NamespaceCreatedEvent struct { Doer web.Auth } -func (n *NamespaceCreatedEvent) TopicName() string { +func (n *NamespaceCreatedEvent) Name() string { return "namespace.created" } @@ -92,7 +92,7 @@ type NamespaceUpdatedEvent struct { Doer web.Auth } -func (n *NamespaceUpdatedEvent) TopicName() string { +func (n *NamespaceUpdatedEvent) Name() string { return "namespace.updated" } @@ -103,7 +103,7 @@ type NamespaceDeletedEvent struct { } // TopicName defines the name for NamespaceDeletedEvent -func (t *NamespaceDeletedEvent) TopicName() string { +func (t *NamespaceDeletedEvent) Name() string { return "namespace.deleted" } @@ -116,7 +116,7 @@ type ListCreatedEvent struct { Doer web.Auth } -func (l *ListCreatedEvent) TopicName() string { +func (l *ListCreatedEvent) Name() string { return "list.created" } @@ -125,7 +125,7 @@ type ListUpdatedEvent struct { Doer web.Auth } -func (l *ListUpdatedEvent) TopicName() string { +func (l *ListUpdatedEvent) Name() string { return "list.updated" } @@ -134,7 +134,7 @@ type ListDeletedEvent struct { Doer web.Auth } -func (t *ListDeletedEvent) TopicName() string { +func (t *ListDeletedEvent) Name() string { return "list.deleted" } @@ -148,7 +148,7 @@ type ListSharedWithUserEvent struct { Doer web.Auth } -func (l *ListSharedWithUserEvent) TopicName() string { +func (l *ListSharedWithUserEvent) Name() string { return "list.shared.user" } @@ -158,7 +158,7 @@ type ListSharedWithTeamEvent struct { Doer web.Auth } -func (l *ListSharedWithTeamEvent) TopicName() string { +func (l *ListSharedWithTeamEvent) Name() string { return "list.shared.team" } @@ -168,7 +168,7 @@ type NamespaceSharedWithUserEvent struct { Doer web.Auth } -func (n *NamespaceSharedWithUserEvent) TopicName() string { +func (n *NamespaceSharedWithUserEvent) Name() string { return "namespace.shared.user" } @@ -178,7 +178,7 @@ type NamespaceSharedWithTeamEvent struct { Doer web.Auth } -func (n *NamespaceSharedWithTeamEvent) TopicName() string { +func (n *NamespaceSharedWithTeamEvent) Name() string { return "namespace.shared.team" } @@ -192,7 +192,7 @@ type TeamMemberAddedEvent struct { Doer web.Auth } -func (t *TeamMemberAddedEvent) TopicName() string { +func (t *TeamMemberAddedEvent) Name() string { return "team.member.added" } @@ -203,7 +203,7 @@ type TeamCreatedEvent struct { } // TopicName defines the name for TeamCreatedEvent -func (t *TeamCreatedEvent) TopicName() string { +func (t *TeamCreatedEvent) Name() string { return "team.created" } @@ -214,6 +214,6 @@ type TeamDeletedEvent struct { } // TopicName defines the name for TeamDeletedEvent -func (t *TeamDeletedEvent) TopicName() string { +func (t *TeamDeletedEvent) Name() string { return "team.deleted" } diff --git a/pkg/models/listeners.go b/pkg/models/listeners.go index 665894125..2a6849e19 100644 --- a/pkg/models/listeners.go +++ b/pkg/models/listeners.go @@ -24,14 +24,14 @@ import ( ) func RegisterListeners() { - events.RegisterListener((&ListCreatedEvent{}).TopicName(), &IncreaseListCounter{}) - events.RegisterListener((&ListDeletedEvent{}).TopicName(), &DecreaseListCounter{}) - events.RegisterListener((&NamespaceCreatedEvent{}).TopicName(), &IncreaseNamespaceCounter{}) - events.RegisterListener((&NamespaceDeletedEvent{}).TopicName(), &DecreaseNamespaceCounter{}) - events.RegisterListener((&TaskCreatedEvent{}).TopicName(), &IncreaseTaskCounter{}) - events.RegisterListener((&TaskDeletedEvent{}).TopicName(), &DecreaseTaskCounter{}) - events.RegisterListener((&TeamDeletedEvent{}).TopicName(), &DecreaseTeamCounter{}) - events.RegisterListener((&TeamCreatedEvent{}).TopicName(), &IncreaseTeamCounter{}) + events.RegisterListener((&ListCreatedEvent{}).Name(), &IncreaseListCounter{}) + events.RegisterListener((&ListDeletedEvent{}).Name(), &DecreaseListCounter{}) + events.RegisterListener((&NamespaceCreatedEvent{}).Name(), &IncreaseNamespaceCounter{}) + events.RegisterListener((&NamespaceDeletedEvent{}).Name(), &DecreaseNamespaceCounter{}) + events.RegisterListener((&TaskCreatedEvent{}).Name(), &IncreaseTaskCounter{}) + events.RegisterListener((&TaskDeletedEvent{}).Name(), &DecreaseTaskCounter{}) + events.RegisterListener((&TeamDeletedEvent{}).Name(), &DecreaseTeamCounter{}) + events.RegisterListener((&TeamCreatedEvent{}).Name(), &IncreaseTeamCounter{}) } ////// diff --git a/pkg/user/events.go b/pkg/user/events.go index cc9401086..10d2104dd 100644 --- a/pkg/user/events.go +++ b/pkg/user/events.go @@ -22,6 +22,6 @@ type UserCreatedEvent struct { } // TopicName defines the name for UserCreatedEvent -func (t *UserCreatedEvent) TopicName() string { +func (t *UserCreatedEvent) Name() string { return "user.created" } diff --git a/pkg/user/listeners.go b/pkg/user/listeners.go index 36592385e..37a74f4a5 100644 --- a/pkg/user/listeners.go +++ b/pkg/user/listeners.go @@ -24,7 +24,7 @@ import ( ) func RegisterListeners() { - events.RegisterListener((&UserCreatedEvent{}).TopicName(), &IncreaseUserCounter{}) + events.RegisterListener((&UserCreatedEvent{}).Name(), &IncreaseUserCounter{}) } ///////