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

Added tilde for dynamic filter value

Browse Source
This commit is contained in:
Trial97
2019-03-04 17:10:21 +02:00
committed by Dan Christian Bogos
parent f115cf77ef
commit 29ad0f480f
3 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
config/dataprovider.go
View File

@@ -18,7 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package config
import "net"
import (
"net"
"strings"
"github.com/cgrates/cgrates/utils"
)
// DataProvider is a data source from multiple formats
type DataProvider interface {
@@ -28,3 +33,19 @@ type DataProvider interface {
AsNavigableMap([]*FCTemplate) (*NavigableMap, error)
RemoteHost() net.Addr
}
func GetDynamicInterface(dnVal string, dP DataProvider) (interface{}, error) {
if strings.HasPrefix(dnVal, utils.DynamicDataPrefix) {
dnVal = strings.TrimPrefix(dnVal, utils.DynamicDataPrefix)
return dP.FieldAsInterface(strings.Split(dnVal, utils.NestingSep))
}
return utils.StringToInterface(dnVal), nil
}
func GetDynamicString(dnVal string, dP DataProvider) (string, error) {
if strings.HasPrefix(dnVal, utils.DynamicDataPrefix) {
dnVal = strings.TrimPrefix(dnVal, utils.DynamicDataPrefix)
return dP.FieldAsString(strings.Split(dnVal, utils.NestingSep))
}
return dnVal, nil
}

3
engine/filterhelpers.go
View File

@@ -83,6 +83,9 @@ func MatchingItemIDsForEvent(ev map[string]interface{}, stringFldIDs, prefixFldI
if filterIndexTypes[i] == MetaPrefix {
fldVals = utils.SplitPrefix(fldVal, 1) // all prefixes till last digit
}
if fldName != utils.META_ANY {
fldName = utils.DynamicDataPrefix + fldName
}
var dbItemIDs utils.StringMap // list of items matched in DB
for _, val := range fldVals {
dbItemIDs, err = dm.MatchFilterIndex(cacheID, itemIDPrefix, filterIndexTypes[i], fldName, val)

50
engine/filters.go
View File

@@ -332,7 +332,7 @@ func (fltr *FilterRule) Pass(dP config.DataProvider,
}
func (fltr *FilterRule) passString(dP config.DataProvider) (bool, error) {
strVal, err := dP.FieldAsString(strings.Split(fltr.FieldName, utils.NestingSep))
strVal, err := config.GetDynamicString(fltr.FieldName, dP)
if err != nil {
if err == utils.ErrNotFound {
return false, nil
@@ -340,7 +340,11 @@ func (fltr *FilterRule) passString(dP config.DataProvider) (bool, error) {
return false, err
}
for _, val := range fltr.Values {
if strVal == val {
sval, err := config.GetDynamicString(val, dP)
if err != nil {
continue
}
if strVal == sval {
return true, nil
}
}
@@ -348,7 +352,7 @@ func (fltr *FilterRule) passString(dP config.DataProvider) (bool, error) {
}
func (fltr *FilterRule) passExists(dP config.DataProvider) (bool, error) {
_, err := dP.FieldAsInterface(strings.Split(fltr.FieldName, utils.NestingSep))
_, err := config.GetDynamicInterface(fltr.FieldName, dP)
if err != nil {
if err == utils.ErrNotFound {
return false, nil
@@ -359,7 +363,7 @@ func (fltr *FilterRule) passExists(dP config.DataProvider) (bool, error) {
}
func (fltr *FilterRule) passEmpty(dP config.DataProvider) (bool, error) {
val, err := dP.FieldAsInterface(strings.Split(fltr.FieldName, utils.NestingSep))
val, err := config.GetDynamicInterface(fltr.FieldName, dP)
if err != nil {
if err == utils.ErrNotFound {
return true, nil
@@ -389,7 +393,7 @@ func (fltr *FilterRule) passEmpty(dP config.DataProvider) (bool, error) {
}
func (fltr *FilterRule) passStringPrefix(dP config.DataProvider) (bool, error) {
strVal, err := dP.FieldAsString(strings.Split(fltr.FieldName, utils.NestingSep))
strVal, err := config.GetDynamicString(fltr.FieldName, dP)
if err != nil {
if err == utils.ErrNotFound {
return false, nil
@@ -397,6 +401,10 @@ func (fltr *FilterRule) passStringPrefix(dP config.DataProvider) (bool, error) {
return false, err
}
for _, prfx := range fltr.Values {
prfx, err := config.GetDynamicString(prfx, dP)
if err != nil {
continue
}
if strings.HasPrefix(strVal, prfx) {
return true, nil
}
@@ -405,7 +413,7 @@ func (fltr *FilterRule) passStringPrefix(dP config.DataProvider) (bool, error) {
}
func (fltr *FilterRule) passStringSuffix(dP config.DataProvider) (bool, error) {
strVal, err := dP.FieldAsString(strings.Split(fltr.FieldName, utils.NestingSep))
strVal, err := config.GetDynamicString(fltr.FieldName, dP)
if err != nil {
if err == utils.ErrNotFound {
return false, nil
@@ -413,6 +421,10 @@ func (fltr *FilterRule) passStringSuffix(dP config.DataProvider) (bool, error) {
return false, err
}
for _, prfx := range fltr.Values {
prfx, err := config.GetDynamicString(prfx, dP)
if err != nil {
continue
}
if strings.HasSuffix(strVal, prfx) {
return true, nil
}
@@ -426,7 +438,7 @@ func (fltr *FilterRule) passTimings(dP config.DataProvider) (bool, error) {
}
func (fltr *FilterRule) passDestinations(dP config.DataProvider) (bool, error) {
dst, err := dP.FieldAsString(strings.Split(fltr.FieldName, utils.NestingSep))
dst, err := config.GetDynamicString(fltr.FieldName, dP)
if err != nil {
if err == utils.ErrNotFound {
return false, nil
@@ -437,6 +449,10 @@ func (fltr *FilterRule) passDestinations(dP config.DataProvider) (bool, error) {
if destIDs, err := dm.DataDB().GetReverseDestination(p, false, utils.NonTransactional); err == nil {
for _, dID := range destIDs {
for _, valDstID := range fltr.Values {
valDstID, err := config.GetDynamicString(valDstID, dP)
if err != nil {
continue
}
if valDstID == dID {
return true, nil
}
@@ -484,7 +500,7 @@ func (fltr *FilterRule) passStatS(dP config.DataProvider,
}
//compose the newFilter
fltr, err := NewFilterRule(fltrType[0],
utils.Meta+fltrType[1], []string{statItem.FilterValue})
utils.DynamicDataPrefix+utils.Meta+fltrType[1], []string{statItem.FilterValue})
if err != nil {
return false, err
}
@@ -499,7 +515,7 @@ func (fltr *FilterRule) passStatS(dP config.DataProvider,
}
func (fltr *FilterRule) passGreaterThan(dP config.DataProvider) (bool, error) {
fldIf, err := dP.FieldAsInterface(strings.Split(fltr.FieldName, utils.NestingSep))
fldIf, err := config.GetDynamicInterface(fltr.FieldName, dP)
if err != nil {
if err == utils.ErrNotFound {
return false, nil
@@ -509,13 +525,17 @@ func (fltr *FilterRule) passGreaterThan(dP config.DataProvider) (bool, error) {
if fldStr, castStr := fldIf.(string); castStr { // attempt converting string since deserialization fails here (ie: time.Time fields)
fldIf = utils.StringToInterface(fldStr)
}
orEqual := false
if fltr.Type == MetaGreaterOrEqual ||
fltr.Type == MetaLessThan {
orEqual = true
}
for _, val := range fltr.Values {
orEqual := false
if fltr.Type == MetaGreaterOrEqual ||
fltr.Type == MetaLessThan {
orEqual = true
sval, err := config.GetDynamicInterface(val, dP)
if err != nil {
continue
}
if gte, err := utils.GreaterThan(fldIf, utils.StringToInterface(val), orEqual); err != nil {
if gte, err := utils.GreaterThan(fldIf, sval, orEqual); err != nil {
return false, err
} else if utils.IsSliceMember([]string{MetaGreaterThan, MetaGreaterOrEqual}, fltr.Type) && gte {
return true, nil
@@ -545,7 +565,7 @@ func (fltr *FilterRule) passResourceS(dP config.DataProvider,
nM := config.NewNavigableMap(data)
//compose the newFilter
fltr, err := NewFilterRule(resItem.FilterType,
utils.Usage, []string{resItem.FilterValue})
utils.DynamicDataPrefix+utils.Usage, []string{resItem.FilterValue})
if err != nil {
return false, err
}