From abf558a740d7a11d6496772f29cc34bc21591b12 Mon Sep 17 00:00:00 2001 From: Daniel Oluojomu Date: Wed, 22 Jun 2022 10:09:15 +0100 Subject: [PATCH] fix: add default config for subscription --- datastore/models.go | 11 +++++++++++ services/subscription_service.go | 20 ++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/datastore/models.go b/datastore/models.go index 1fb50002ee..22c5047eab 100644 --- a/datastore/models.go +++ b/datastore/models.go @@ -117,6 +117,17 @@ var ( Count: 1000, Duration: "1m", } + + DefaultRetryConfig = RetryConfiguration{ + Type: LinearStrategyProvider, + Duration: "10s", + RetryCount: 3, + } + + DefaultAlertConfig = AlertConfiguration{ + Count: 4, + Threshold: "1h", + } ) const ( diff --git a/services/subscription_service.go b/services/subscription_service.go index 5222f4b35b..70bf3d9eb8 100644 --- a/services/subscription_service.go +++ b/services/subscription_service.go @@ -64,12 +64,6 @@ func (s *SubcriptionService) CreateSubscription(ctx context.Context, group *data } } - if newSubscription.FilterConfig == nil || - newSubscription.FilterConfig.EventTypes == nil || - len(newSubscription.FilterConfig.EventTypes) == 0 { - newSubscription.FilterConfig = &datastore.FilterConfiguration{EventTypes: []string{"*"}} - } - subscription := &datastore.Subscription{ GroupID: group.UID, UID: uuid.New().String(), @@ -90,6 +84,20 @@ func (s *SubcriptionService) CreateSubscription(ctx context.Context, group *data DocumentStatus: datastore.ActiveDocumentStatus, } + if subscription.FilterConfig == nil || + subscription.FilterConfig.EventTypes == nil || + len(subscription.FilterConfig.EventTypes) == 0 { + subscription.FilterConfig = &datastore.FilterConfiguration{EventTypes: []string{"*"}} + } + + if subscription.AlertConfig == nil { + subscription.AlertConfig = &datastore.DefaultAlertConfig + } + + if subscription.RetryConfig == nil { + subscription.RetryConfig = &datastore.DefaultRetryConfig + } + err = s.subRepo.CreateSubscription(ctx, group.UID, subscription) if err != nil { log.WithError(err).Error(ErrCreateSubscriptionError.Error())