feat(alert): add create alert with namespace API (#164)

* feat(alert): add create alert with namespace api

* feat(subscription): filter by namespace_id

* feat: update proto

* fix(test): fix e2e test

* fix(alert): write now() to created_at and updated_at in DB

Makefile

@@ -2,7 +2,7 @@ NAME="github.com/odpf/siren"
 LAST_COMMIT := $(shell git rev-parse --short HEAD)
 LAST_TAG := "$(shell git rev-list --tags --max-count=1)"
 APP_VERSION := "$(shell git describe --tags ${LAST_TAG})-next"
-PROTON_COMMIT := "f21015688d165bec2d859c6fca284754dd81755f"
+PROTON_COMMIT := "daa6a69e9351cbe3cc0413fb31263e7be60593c1"
 
 .PHONY: all build test clean dist vet proto install
 
@@ -17,7 +17,7 @@ test: ## Run the tests
 	go test -race $(shell go list ./... | grep -v /test/) -covermode=atomic -coverprofile=coverage.out
 
 e2e-test: ## Run all e2e tests
-	go test -v -race ./test/e2e_test/... -coverprofile=coverage.out --timeout 180s
+	go test -v -race ./test/e2e_test/... -coverprofile=coverage.out --timeout 300s
 
 coverage: ## Print code coverage
 	go test -race -coverprofile coverage.out -covermode=atomic ./... && go tool cover -html=coverage.out

core/alert/alert.go

@@ -14,6 +14,7 @@ type Repository interface {
 type Alert struct {
 	ID           uint64    `json:"id"`
 	ProviderID   uint64    `json:"provider_id"`
+	NamespaceID  uint64    `json:"namespace_id"`
 	ResourceName string    `json:"resource_name"`
 	MetricName   string    `json:"metric_name"`
 	MetricValue  string    `json:"metric_value"`

core/alert/filter.go

@@ -3,6 +3,7 @@ package alert
 type Filter struct {
 	ResourceName string
 	ProviderID   uint64
+	NamespaceID  uint64
 	StartTime    int64
 	EndTime      int64
 }

core/alert/provider_plugin.go

@@ -6,5 +6,5 @@ import (
 
 //go:generate mockery --name=AlertTransformer -r --case underscore --with-expecter --structname AlertTransformer --filename alert_transformer.go --output=./mocks
 type AlertTransformer interface {
-	TransformToAlerts(ctx context.Context, providerID uint64, body map[string]interface{}) ([]*Alert, int, error)
+	TransformToAlerts(ctx context.Context, providerID uint64, namespaceID uint64, body map[string]interface{}) ([]*Alert, int, error)
 }

core/alert/service.go

@@ -18,13 +18,13 @@ func NewService(repository Repository, registry map[string]AlertTransformer) *Se
 	return &Service{repository, registry}
 }
 
-func (s *Service) CreateAlerts(ctx context.Context, providerType string, providerID uint64, body map[string]interface{}) ([]*Alert, int, error) {
+func (s *Service) CreateAlerts(ctx context.Context, providerType string, providerID uint64, namespaceID uint64, body map[string]interface{}) ([]*Alert, int, error) {
 	pluginService, err := s.getProviderPluginService(providerType)
 	if err != nil {
 		return nil, 0, err
 	}
 
-	alerts, firingLen, err := pluginService.TransformToAlerts(ctx, providerID, body)
+	alerts, firingLen, err := pluginService.TransformToAlerts(ctx, providerID, namespaceID, body)
 	if err != nil {
 		return nil, 0, err
 	}

core/alert/service_test.go

@@ -116,15 +116,15 @@ func TestService_Create(t *testing.T) {
 		{
 			name: "should return error if TransformToAlerts return error",
 			setup: func(ar *mocks.AlertRepository, at *mocks.AlertTransformer) {
-				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return(nil, 0, errors.New("some error"))
+				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return(nil, 0, errors.New("some error"))
 			},
 			alertsToBeCreated: alertsToBeCreated,
 			wantErr:           true,
 		},
 		{
 			name: "should call repository Create method with proper arguments",
 			setup: func(ar *mocks.AlertRepository, at *mocks.AlertTransformer) {
-				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]*alert.Alert{
+				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]*alert.Alert{
 					{ID: 1, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "lag", MetricValue: "20",
 						Rule: "lagHigh", TriggeredAt: timenow},
 				}, 1, nil)
@@ -140,7 +140,7 @@ func TestService_Create(t *testing.T) {
 		{
 			name: "should return error not found if repository return err relation",
 			setup: func(ar *mocks.AlertRepository, at *mocks.AlertTransformer) {
-				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]*alert.Alert{
+				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]*alert.Alert{
 					{ID: 1, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "lag", MetricValue: "20",
 						Rule: "lagHigh", TriggeredAt: timenow},
 				}, 1, nil)
@@ -152,7 +152,7 @@ func TestService_Create(t *testing.T) {
 		{
 			name: "should handle errors from repository",
 			setup: func(ar *mocks.AlertRepository, at *mocks.AlertTransformer) {
-				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]*alert.Alert{
+				at.EXPECT().TransformToAlerts(mock.AnythingOfType("*context.emptyCtx"), mock.AnythingOfType("uint64"), mock.AnythingOfType("uint64"), mock.AnythingOfType("map[string]interface {}")).Return([]*alert.Alert{
 					{ID: 1, ProviderID: 1, ResourceName: "foo", Severity: "CRITICAL", MetricName: "lag", MetricValue: "20",
 						Rule: "lagHigh", TriggeredAt: timenow},
 				}, 1, nil)
@@ -177,7 +177,7 @@ func TestService_Create(t *testing.T) {
 			svc := alert.NewService(repositoryMock, map[string]alert.AlertTransformer{
 				testType: alertTransformerMock,
 			})
-			actualAlerts, firingLen, err := svc.CreateAlerts(ctx, testType, 1, tc.alertsToBeCreated)
+			actualAlerts, firingLen, err := svc.CreateAlerts(ctx, testType, 1, 1, tc.alertsToBeCreated)
 			if tc.wantErr {
 				if err == nil {
 					t.Error("error should not be nil")