Merge pull request #314 from openinfradev/minor_fix

trivial. add attribute metricParameters to system-notification-templates
openinfradev · Apr 1, 2024 · db558bd · db558bd
2 parents f176ba0 + 6249029
commit db558bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/internal/delivery/http/system-notification-rule.go b/internal/delivery/http/system-notification-rule.go
@@ -130,7 +130,6 @@ func (h *SystemNotificationRuleHandler) GetSystemNotificationRules(w http.Respon
 			if err := serializer.Map(r.Context(), condition, &out.SystemNotificationRules[i].SystemNotificationConditions[j]); err != nil {
 				log.Info(r.Context(), err)
 			}
-			log.Info(r.Context(), condition.Parameter)
 			err = json.Unmarshal(condition.Parameter, &out.SystemNotificationRules[i].SystemNotificationConditions[j].Parameters)
 			if err != nil {
 				log.Error(r.Context(), err)

diff --git a/internal/delivery/http/system-notification-template.go b/internal/delivery/http/system-notification-template.go
@@ -306,6 +306,13 @@ func (h *SystemNotificationTemplateHandler) GetOrganizationSystemNotificationTem
 				log.Info(r.Context(), err)
 			}
 		}
+
+		out.SystemNotificationTemplates[i].MetricParameters = make([]domain.SystemNotificationMetricParameterResponse, len(systemNotificationTemplate.MetricParameters))
+		for k, metricParameters := range systemNotificationTemplate.MetricParameters {
+			if err := serializer.Map(r.Context(), metricParameters, &out.SystemNotificationTemplates[i].MetricParameters[k]); err != nil {
+				log.Info(r.Context(), err)
+			}
+		}
 	}
 
 	if out.Pagination, err = pg.Response(r.Context()); err != nil {