Merge pull request #441 from openinfradev/minor_fix

trivial. add default systemNotificationTemplate when organization cre…
openinfradev · Apr 29, 2024 · 3ce4f20 · 3ce4f20
2 parents e6a6f03 + 6b2e6ee
commit 3ce4f20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/internal/usecase/system-notification-rule.go b/internal/usecase/system-notification-rule.go
@@ -191,6 +191,11 @@ func (u *SystemNotificationRuleUsecase) MakeDefaultSystemNotificationRules(ctx c
 		return err
 	}
 
+	err = u.organizationRepo.AddSystemNotificationTemplates(ctx, organizationId, templates)
+	if err != nil {
+		return httpErrors.NewBadRequestError(err, "ST_FAILED_ADD_ORGANIZATION_SYSTEM_NOTIFICATION_TEMPLATE", "")
+	}
+
 	rules := make([]model.SystemNotificationRule, 0)
 	for _, template := range templates {
 		if template.Name == domain.SN_TYPE_NODE_CPU_HIGH_LOAD {

diff --git a/internal/usecase/system-notification-template.go b/internal/usecase/system-notification-template.go
@@ -188,7 +188,7 @@ func (u *SystemNotificationTemplateUsecase) UpdateOrganizations(ctx context.Cont
 func (u *SystemNotificationTemplateUsecase) AddOrganizationSystemNotificationTemplates(ctx context.Context, organizationId string, systemNotificationTemplateIds []string) error {
 	_, err := u.organizationRepo.Get(ctx, organizationId)
 	if err != nil {
-		return httpErrors.NewBadRequestError(err, "O_NOT_EXISTED_NAME", "")
+		return httpErrors.NewBadRequestError(err, "ST_NOT_EXISTED_NAME", "")
 	}
 
 	systemNotificationTemplates := make([]model.SystemNotificationTemplate, 0)