uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-25 00:58:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Balance DestinationId now take multiple destinations

Browse Source
This commit is contained in:
Radu Ioan Fericean
2015-05-16 00:01:30 +03:00
parent 1e5e025cc3
commit d2b4df69ca
26 changed files with 387 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
engine/action_trigger.go
View File

@@ -23,6 +23,7 @@ import (
"fmt"
"regexp"
"sort"
"strings"
"time"
"github.com/cgrates/cgrates/utils"
@@ -38,7 +39,7 @@ type ActionTrigger struct {
BalanceId string
BalanceType string
BalanceDirection string
BalanceDestinationId string // filter for balance
BalanceDestinationIds string // filter for balance
BalanceWeight float64 // filter for balance
BalanceExpirationDate time.Time // filter for balance
BalanceTimingTags string // filter for balance
@@ -124,7 +125,7 @@ func (at *ActionTrigger) Match(a *Action) bool {
json.Unmarshal([]byte(a.ExtraParameters), &t)
thresholdType = t.ThresholdType == "" || at.ThresholdType == t.ThresholdType
thresholdValue = t.ThresholdValue == 0 || at.ThresholdValue == t.ThresholdValue
destinationId = t.DestinationId == "" || at.BalanceDestinationId == t.DestinationId
destinationId = t.DestinationId == "" || strings.Contains(at.BalanceDestinationIds, t.DestinationId)
weight = t.BalanceWeight == 0 || at.BalanceWeight == t.BalanceWeight
ratingSubject = t.BalanceRatingSubject == "" || at.BalanceRatingSubject == t.BalanceRatingSubject
category = t.BalanceCategory == "" || at.BalanceCategory == t.BalanceCategory
@@ -133,6 +134,12 @@ func (at *ActionTrigger) Match(a *Action) bool {
return id && direction && thresholdType && thresholdValue && destinationId && weight && ratingSubject && category && sharedGroup
}
func (at *ActionTrigger) sortDestinationIds() string {
destIds := strings.Split(at.BalanceDestinationIds, utils.INFIELD_SEP)
sort.StringSlice(destIds).Sort()
return strings.Join(destIds, utils.INFIELD_SEP)
}
// Structure to store actions according to weight
type ActionTriggerPriotityList []*ActionTrigger