[Dembo] Change event type signature to return type

gopaytech · Sep 18, 2019 · 74a39d6 · 74a39d6
1 parent 3f2b0d9
commit 74a39d6
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/pkg/notification/event/event.go b/pkg/notification/event/event.go
@@ -1,7 +1,7 @@
 package event
 
 type Event interface {
-	Type() string
+	Type() Type
 	User() UserData
 	Content() map[string]string
 }

diff --git a/pkg/notification/event/event_mock.go b/pkg/notification/event/event_mock.go
@@ -6,9 +6,9 @@ type EventMock struct {
 	mock.Mock
 }
 
-func (m *EventMock) Type() string {
+func (m *EventMock) Type() Type {
 	args := m.Called()
-	return args.Get(0).(string)
+	return args.Get(0).(Type)
 }
 
 func (m *EventMock) User() UserData {

diff --git a/pkg/notification/event/execution.go b/pkg/notification/event/execution.go
@@ -12,8 +12,8 @@ type executionEvent struct {
 	context   model.ExecutionContext
 }
 
-func (evt executionEvent) Type() string {
-	return string(ExecutionEventType)
+func (evt executionEvent) Type() Type {
+	return ExecutionEventType
 }
 
 func (evt executionEvent) User() UserData {

diff --git a/pkg/notification/event/execution_test.go b/pkg/notification/event/execution_test.go
@@ -75,7 +75,7 @@ func TestExecutionEvent(t *testing.T) {
 		"Status":      "CREATED",
 	}
 
-	assert.Equal(t, expectedEventType, actualEvent.Type())
+	assert.Equal(t, expectedEventType, string(actualEvent.Type()))
 	assert.Equal(t, expectedUserData, actualEvent.User())
 	assert.Equal(t, expectedContent, actualEvent.Content())
 }
diff --git a/plugins/slack-notification-plugin/slack/message/execution.go b/plugins/slack-notification-plugin/slack/message/execution.go
@@ -13,7 +13,7 @@ type executionMessage struct {
 
 func (messageObject *executionMessage) JSON() (string, error) {
 	evt := messageObject.evt
-	if evt.Type() != string(event.ExecutionEventType) {
+	if evt.Type() != event.ExecutionEventType {
 		return "", errors.New("event type mismatch")
 	}
 	userEmail := evt.User().Email

diff --git a/plugins/slack-notification-plugin/slack/message/execution_test.go b/plugins/slack-notification-plugin/slack/message/execution_test.go
@@ -18,7 +18,7 @@ func TestExecutionMessage_JSON(t *testing.T) {
 		"Status":      "CREATED",
 	}
 	evt := event.EventMock{}
-	evt.On("Type").Return(string(event.ExecutionEventType))
+	evt.On("Type").Return(event.ExecutionEventType)
 	evt.On("User").Return(userData)
 	evt.On("Content").Return(content)
 	defer evt.AssertExpectations(t)
@@ -31,7 +31,7 @@ func TestExecutionMessage_JSON(t *testing.T) {
 
 func TestExecutionMessage_JSONMismatch(t *testing.T) {
 	evt := event.EventMock{}
-	evt.On("Type").Return("not-execution-event")
+	evt.On("Type").Return(event.Type("not-execution-event"))
 	defer evt.AssertExpectations(t)
 
 	messageObject := NewExecutionMessage(&evt)

diff --git a/plugins/slack-notification-plugin/slack/message/standard.go b/plugins/slack-notification-plugin/slack/message/standard.go
@@ -16,7 +16,7 @@ func (messageObject *standardMessage) JSON() (string, error) {
 		return "", err
 	}
 	textMessage := "User: " + messageObject.evt.User().Email + "\n"
-	textMessage += "Emit event" + messageObject.evt.Type() + " with detail: "
+	textMessage += "Emit event" + string(messageObject.evt.Type()) + " with detail: "
 	textMessage += string(evtDataJSON)
 	messageObject.Text = textMessage
 	byteMessage, err := json.Marshal(messageObject)

diff --git a/plugins/slack-notification-plugin/slack/message/standard_test.go b/plugins/slack-notification-plugin/slack/message/standard_test.go
@@ -18,7 +18,7 @@ func TestStandardMessage_JSON(t *testing.T) {
 		"Status":      "CREATED",
 	}
 	evt := event.EventMock{}
-	evt.On("Type").Return("unsupported-event")
+	evt.On("Type").Return(event.Type("unsupported-event"))
 	evt.On("User").Return(userData)
 	evt.On("Content").Return(content)
 	defer evt.AssertExpectations(t)

diff --git a/plugins/slack-notification-plugin/slack_notification.go b/plugins/slack-notification-plugin/slack_notification.go
@@ -21,7 +21,7 @@ func (notification *slackNotification) OnNotify(evt event.Event) error {
 func (notification *slackNotification) generateMessage(evt event.Event) message.Message {
 	var messageObject message.Message
 	switch evt.Type() {
-	case string(event.ExecutionEventType):
+	case event.ExecutionEventType:
 		messageObject = message.NewExecutionMessage(evt)
 	default:
 		messageObject = message.NewStandardMessage(evt)

diff --git a/plugins/slack-notification-plugin/slack_notification_test.go b/plugins/slack-notification-plugin/slack_notification_test.go
@@ -57,7 +57,7 @@ func TestSlackNotification_OnNotifyExecution(t *testing.T) {
 		"Status":      "CREATED",
 	}
 	evt := ctx.instance().event
-	evt.On("Type").Return(string(event.ExecutionEventType))
+	evt.On("Type").Return(event.ExecutionEventType)
 	evt.On("User").Return(userData)
 	evt.On("Content").Return(content)
 
@@ -86,7 +86,7 @@ func TestSlackNotification_OnNotifyExecutionErrorPublish(t *testing.T) {
 		"Status":      "CREATED",
 	}
 	evt := ctx.instance().event
-	evt.On("Type").Return(string(event.ExecutionEventType))
+	evt.On("Type").Return(event.ExecutionEventType)
 	evt.On("User").Return(userData)
 	evt.On("Content").Return(content)
 
@@ -115,7 +115,7 @@ func TestSlackNotification_OnNotifyUnsupportedEvent(t *testing.T) {
 		"Status":      "CREATED",
 	}
 	evt := ctx.instance().event
-	evt.On("Type").Return("Unsupported event")
+	evt.On("Type").Return(event.Type("Unsupported event"))
 	evt.On("User").Return(userData)
 	evt.On("Content").Return(content)