Updated and added tests for *remove_session_costs action

2026-02-24 16:48:45 +05:00 · 2019-03-21 15:41:36 +02:00
parent fa591c50a7
commit db1ddeaa43
6 changed files with 243 additions and 34 deletions
--- a/utils/apitpdata.go
+++ b/utils/apitpdata.go
@@ -1203,9 +1203,19 @@ type TPDispatcherProfile struct {
 	Conns              []*TPDispatcherConns
 }

+type UsageInterval struct {
+	Min *time.Duration
+	Max *time.Duration
+}
+
+type TimeInterval struct {
+	Begin *time.Time
+	End   *time.Time
+}
+
 type SMCostFilter struct { //id cu litere mare
-	CgrIDs         []string
-	NotCgrIDs      []string
+	CGRIDs         []string
+	NotCGRIDs      []string
 	RunIDs         []string
 	NotRunIDs      []string
 	OriginHosts    []string
@@ -1214,9 +1224,8 @@ type SMCostFilter struct { //id cu litere mare
 	NotOriginIDs   []string
 	CostSources    []string
 	NotCostSources []string
-	Usage          []*time.Duration // slice min=Usage[0]&max=Usage[1]
-	CreatedAtStart *time.Time       // Start of interval, bigger or equal than configured
-	CreatedAtEnd   *time.Time       // End interval, smaller than
+	Usage          UsageInterval
+	CreatedAt      TimeInterval
 }

 func AppendToSMCostFilter(smcFilter *SMCostFilter, fieldType, fieldName string, values []string, timezone string) (smcf *SMCostFilter, err error) {
@@ -1230,9 +1239,9 @@ func AppendToSMCostFilter(smcFilter *SMCostFilter, fieldType, fieldName string,
 	case DynamicDataPrefix + CGRID:
 		switch fieldType {
 		case MetaString:
-			smcFilter.CgrIDs = append(smcFilter.CgrIDs, values...)
+			smcFilter.CGRIDs = append(smcFilter.CGRIDs, values...)
 		case MetaNotString:
-			smcFilter.NotCgrIDs = append(smcFilter.NotCgrIDs, values...)
+			smcFilter.NotCGRIDs = append(smcFilter.NotCGRIDs, values...)
 		default:
 			err = fmt.Errorf("FilterType: %q not supported for FieldName: %q", fieldType, fieldName)
 		}
@@ -1268,7 +1277,7 @@ func AppendToSMCostFilter(smcFilter *SMCostFilter, fieldType, fieldName string,
 		case MetaString:
 			smcFilter.CostSources = append(smcFilter.CostSources, values...)
 		case MetaNotString:
-			smcFilter.CostSources = append(smcFilter.NotCostSources, values...)
+			smcFilter.NotCostSources = append(smcFilter.NotCostSources, values...)
 		default:
 			err = fmt.Errorf("FilterType: %q not supported for FieldName: %q", fieldType, fieldName)
 		}
@@ -1278,18 +1287,18 @@ func AppendToSMCostFilter(smcFilter *SMCostFilter, fieldType, fieldName string,
 			var minUsage time.Duration
 			minUsage, err = ParseDurationWithNanosecs(values[0])
 			if err != nil {
-				err = fmt.Errorf("Error when converting field: %q  value: %q in float ", fieldType, fieldName)
+				err = fmt.Errorf("Error when converting field: %q  value: %q in time.Duration ", fieldType, fieldName)
 				break
 			}
-			smcFilter.Usage[0] = &minUsage
+			smcFilter.Usage.Min = &minUsage
 		case MetaLessThan:
 			var maxUsage time.Duration
 			maxUsage, err = ParseDurationWithNanosecs(values[0])
 			if err != nil {
-				err = fmt.Errorf("Error when converting field: %q  value: %q in float ", fieldType, fieldName)
+				err = fmt.Errorf("Error when converting field: %q  value: %q in time.Duration ", fieldType, fieldName)
 				break
 			}
-			smcFilter.Usage[1] = &maxUsage
+			smcFilter.Usage.Max = &maxUsage
 		default:
 			err = fmt.Errorf("FilterType: %q not supported for FieldName: %q", fieldType, fieldName)
 		}
@@ -1303,7 +1312,7 @@ func AppendToSMCostFilter(smcFilter *SMCostFilter, fieldType, fieldName string,
 				break
 			}
 			if !start.IsZero() {
-				smcFilter.CreatedAtStart = &start
+				smcFilter.CreatedAt.Begin = &start
 			}
 		case MetaLessThan:
 			var end time.Time
@@ -1313,7 +1322,7 @@ func AppendToSMCostFilter(smcFilter *SMCostFilter, fieldType, fieldName string,
 				break
 			}
 			if !end.IsZero() {
-				smcFilter.CreatedAtEnd = &end
+				smcFilter.CreatedAt.End = &end
 			}
 		default:
 			err = fmt.Errorf("FilterType: %q not supported for FieldName: %q", fieldType, fieldName)
--- a/utils/apitpdata_test.go
+++ b/utils/apitpdata_test.go
@@ -20,6 +20,7 @@ package utils
 import (
 	"reflect"
 	"testing"
+	"time"
 )

 func TestNewDTCSFromRPKey(t *testing.T) {
@@ -59,3 +60,137 @@ func TestPaginatorPaginateStringSlice(t *testing.T) {
 		t.Errorf("Expecting: %+v, received: %+v", eOut, rcv)
 	}
 }
+
+func TestAppendToSMCostFilter(t *testing.T) {
+	var err error
+	smfltr := new(SMCostFilter)
+	expected := &SMCostFilter{
+		CGRIDs: []string{"CGRID1", "CGRID2"},
+	}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*string", DynamicDataPrefix+CGRID, []string{"CGRID1", "CGRID2"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+	expected.NotCGRIDs = []string{"CGRID3", "CGRID4"}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*notstring", DynamicDataPrefix+CGRID, []string{"CGRID3", "CGRID4"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+
+	expected.RunIDs = []string{"RunID1", "RunID2"}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*string", DynamicDataPrefix+RunID, []string{"RunID1", "RunID2"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+	expected.NotRunIDs = []string{"RunID3", "RunID4"}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*notstring", DynamicDataPrefix+RunID, []string{"RunID3", "RunID4"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+
+	expected.OriginHosts = []string{"OriginHost1", "OriginHost2"}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*string", DynamicDataPrefix+OriginHost, []string{"OriginHost1", "OriginHost2"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+	expected.NotOriginHosts = []string{"OriginHost3", "OriginHost4"}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*notstring", DynamicDataPrefix+OriginHost, []string{"OriginHost3", "OriginHost4"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+
+	expected.OriginIDs = []string{"OriginID1", "OriginID2"}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*string", DynamicDataPrefix+OriginID, []string{"OriginID1", "OriginID2"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+	expected.NotOriginIDs = []string{"OriginID3", "OriginID4"}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*notstring", DynamicDataPrefix+OriginID, []string{"OriginID3", "OriginID4"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+
+	expected.CostSources = []string{"CostSource1", "CostSource2"}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*string", DynamicDataPrefix+CostSource, []string{"CostSource1", "CostSource2"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+	expected.NotCostSources = []string{"CostSource3", "CostSource4"}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*notstring", DynamicDataPrefix+CostSource, []string{"CostSource3", "CostSource4"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*prefix", DynamicDataPrefix+CGRID, []string{"CGRID1", "CGRID2"}, ""); err == nil || err.Error() != "FilterType: \"*prefix\" not supported for FieldName: \"~CGRID\"" {
+		t.Errorf("Expected error: FilterType: \"*prefix\" not supported for FieldName: \"~CGRID\" ,received %v", err)
+	}
+	if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*string", CGRID, []string{"CGRID1", "CGRID2"}, ""); err == nil || err.Error() != "FieldName: \"CGRID\" not supported" {
+		t.Errorf("Expected error: FieldName: \"CGRID\" not supported ,received %v", err)
+	}
+	if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*prefix", CGRID, []string{"CGRID1", "CGRID2"}, ""); err == nil || err.Error() != "FieldName: \"CGRID\" not supported" {
+		t.Errorf("Expected error: FieldName: \"CGRID\" not supported ,received %v", err)
+	}
+	if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+
+	}
+	expected.Usage.Min = DurationPointer(time.Second)
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*gte", DynamicDataPrefix+Usage, []string{"1s", "2s"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+	expected.Usage.Max = DurationPointer(3 * time.Second)
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*lt", DynamicDataPrefix+Usage, []string{"3s", "4s"}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*gte", DynamicDataPrefix+Usage, []string{"one second"}, ""); err == nil || err.Error() != "Error when converting field: \"*gte\"  value: \"~Usage\" in time.Duration " {
+		t.Errorf("Expected error: Error when converting field: \"*gte\"  value: \"~Usage\" in time.Duration ,received %v", err)
+	}
+	if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+
+	now := time.Now().UTC().Round(time.Second)
+	strNow := now.Format("2006-01-02T15:04:05")
+
+	expected.CreatedAt.Begin = &now
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*gte", DynamicDataPrefix+CreatedAt, []string{strNow}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+
+	expected.CreatedAt.End = &now
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*lt", DynamicDataPrefix+CreatedAt, []string{strNow}, ""); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+
+	if smfltr, err = AppendToSMCostFilter(smfltr, "*gte", DynamicDataPrefix+CreatedAt, []string{time.Now().String()}, ""); err == nil || err.Error() != "Error when converting field: \"*gte\"  value: \"~CreatedAt\" in time.Time " {
+		t.Errorf("Expected error: Error when converting field: \"*gte\"  value: \"~CreatedAt\" in time.Time ,received %v", err)
+	}
+	if !reflect.DeepEqual(smfltr, expected) {
+		t.Errorf("Expected: %s ,received: %s ", ToJSON(expected), ToJSON(smfltr))
+	}
+}