From 420e5de5fa9b8467fbf52bae561486006c99e229 Mon Sep 17 00:00:00 2001
From: Or Novogroder <108669655+OrNovo@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:43:26 +0200
Subject: [PATCH] patch - tracing-alert-filter bug-fixing (#24)

---
 apis/coralogix/v1alpha1/alert_types.go          | 17 ++++++++++++-----
 .../alphacontrollers/alert_controller.go        |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apis/coralogix/v1alpha1/alert_types.go b/apis/coralogix/v1alpha1/alert_types.go
index c553dad..187f5f9 100644
--- a/apis/coralogix/v1alpha1/alert_types.go
+++ b/apis/coralogix/v1alpha1/alert_types.go
@@ -609,10 +609,17 @@ func expandTracingAlert(tracingFilters *TracingFilters) *alerts.TracingAlert {
 }
 
 func expandFiltersData(applications, subsystems, services []string) []*alerts.FilterData {
-	result := make([]*alerts.FilterData, 0, len(applications)+len(subsystems)+len(services))
-	result = append(result, expandSpecificFilter("applicationName", applications))
-	result = append(result, expandSpecificFilter("subsystemName", subsystems))
-	result = append(result, expandSpecificFilter("serviceName", services))
+	result := make([]*alerts.FilterData, 0)
+	if len(applications) != 0 {
+		result = append(result, expandSpecificFilter("applicationName", applications))
+	}
+	if len(subsystems) != 0 {
+		result = append(result, expandSpecificFilter("subsystemName", subsystems))
+	}
+	if len(services) != 0 {
+		result = append(result, expandSpecificFilter("serviceName", services))
+	}
+
 	return result
 }
 
@@ -648,7 +655,7 @@ func expandSpecificFilter(filterName string, values []string) *alerts.FilterData
 }
 
 func expandFilter(filterString string) (operator, filterValue string) {
-	operator, filterValue = "Equals", filterString
+	operator, filterValue = "equals", filterString
 	if strings.HasPrefix(filterValue, "filter:") {
 		arr := strings.SplitN(filterValue, ":", 3)
 		operator, filterValue = arr[1], arr[2]
diff --git a/controllers/alphacontrollers/alert_controller.go b/controllers/alphacontrollers/alert_controller.go
index 4765caf..b59d2d6 100644
--- a/controllers/alphacontrollers/alert_controller.go
+++ b/controllers/alphacontrollers/alert_controller.go
@@ -742,7 +742,7 @@ func flattenTracingFilter(filters []*alerts.Filters) []string {
 	for _, f := range filters {
 		values := f.GetValues()
 		switch operator := f.GetOperator(); operator {
-		case "contains", "startsWith", "endsWith":
+		case "notEquals", "contains", "startsWith", "endsWith":
 			for i, val := range values {
 				values[i] = fmt.Sprintf("filter:%s:%s", operator, val)
 			}