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

Add *dynamic_filter action type and remove *dynamic_account_action

Browse Source
This commit is contained in:
arberkatellari
2025-05-28 16:40:06 +02:00
committed by Dan Christian Bogos
parent 7fa43788e1
commit ea5ed9eaad
6 changed files with 259 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/consts.go
View File

@@ -1210,9 +1210,9 @@ const (
MetaDynamicStats = "*dynamic_stats"
MetaDynamicAttribute = "*dynamic_attribute"
MetaDynamicActionPlan = "*dynamic_action_plan"
MetaDynamicAccountAction = "*dynamic_account_action"
MetaDynamicAction = "*dynamic_action"
MetaDynamicDestination = "*dynamic_destination"
MetaDynamicFilter = "*dynamic_filter"
ActionID = "ActionID"
ActionType = "ActionType"
ActionValue = "ActionValue"

16
utils/dynamicfieldpath.go
View File

@@ -57,14 +57,14 @@ func ProcessFieldPath(fldPath, sep string, dP DataProvider) (newPath string, err
}
// ParseParamForDataProvider will parse a param string with prefix "~*req.", "~*otps.", "*tenant" or "*now"; or strings containing dynamic paths between "<" ">" signs. If none match, it returns the original string
func ParseParamForDataProvider(param string, dP DataProvider) (string, error) {
func ParseParamForDataProvider(param string, dP DataProvider, onlyEncapsulatead bool) (string, error) {
// Check if the string contains any "&" characters
if strings.Contains(param, ANDSep) {
parts := strings.Split(param, ANDSep)
var results []string
// Process each part individually
for _, part := range parts {
result, err := ParseParamForDataProvider(part, dP)
result, err := ParseParamForDataProvider(part, dP, onlyEncapsulatead)
if err != nil {
return EmptyString, err
}
@@ -73,11 +73,13 @@ func ParseParamForDataProvider(param string, dP DataProvider) (string, error) {
// Join all processed parts with &
return strings.Join(results, ANDSep), nil
}
switch {
case strings.HasPrefix(param, MetaDynReq) || strings.HasPrefix(param, DynamicDataPrefix+MetaOpts):
return DPDynamicString(param, dP)
case strings.HasPrefix(param, MetaNow) || strings.HasPrefix(param, MetaTenant):
return dP.FieldAsString(SplitPath(param, NestingSep[0], -1))
if !onlyEncapsulatead {
switch {
case strings.HasPrefix(param, MetaDynReq) || strings.HasPrefix(param, DynamicDataPrefix+MetaOpts):
return DPDynamicString(param, dP)
case strings.HasPrefix(param, MetaNow) || strings.HasPrefix(param, MetaTenant):
return dP.FieldAsString(SplitPath(param, NestingSep[0], -1))
}
}
// look for dynamic paths in the param string, and parse it