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

added passing events from thresholds to ees

Browse Source
This commit is contained in:
gezimbll
2025-05-26 08:49:42 +02:00
committed by Dan Christian Bogos
parent 90de059801
commit ccdf3ef1f1
24 changed files with 288 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
engine/model_helpers.go
View File

@@ -1813,13 +1813,14 @@ type ThresholdMdls []*ThresholdMdl
func (tps ThresholdMdls) CSVHeader() (result []string) {
return []string{"#" + utils.Tenant, utils.ID, utils.FilterIDs, utils.ActivationIntervalString,
utils.MaxHits, utils.MinHits, utils.MinSleep,
utils.Blocker, utils.Weight, utils.ActionIDs, utils.Async}
utils.Blocker, utils.Weight, utils.ActionIDs, utils.Async, utils.EeIDs}
}
func (tps ThresholdMdls) AsTPThreshold() (result []*utils.TPThresholdProfile) {
mst := make(map[string]*utils.TPThresholdProfile)
filterMap := make(map[string]utils.StringSet)
actionMap := make(map[string]utils.StringSet)
eeIDsMap := make(map[string]utils.StringSet)
for _, tp := range tps {
tenID := (&utils.TenantID{Tenant: tp.Tenant, ID: tp.ID}).TenantID()
th, found := mst[tenID]
@@ -1841,6 +1842,12 @@ func (tps ThresholdMdls) AsTPThreshold() (result []*utils.TPThresholdProfile) {
}
actionMap[tenID].AddSlice(strings.Split(tp.ActionIDs, utils.InfieldSep))
}
if tp.EeIDs != utils.EmptyString {
if _, has := eeIDsMap[tenID]; !has {
eeIDsMap[tenID] = make(utils.StringSet)
}
eeIDsMap[tenID].AddSlice(strings.Split(tp.EeIDs, utils.InfieldSep))
}
if tp.Weight != 0 {
th.Weight = tp.Weight
}
@@ -1869,6 +1876,7 @@ func (tps ThresholdMdls) AsTPThreshold() (result []*utils.TPThresholdProfile) {
result[i] = th
result[i].FilterIDs = filterMap[tntID].AsSlice()
result[i].ActionIDs = actionMap[tntID].AsSlice()
result[i].EeIDs = eeIDsMap[tntID].AsSlice()
i++
}
return
@@ -1883,7 +1891,10 @@ func APItoModelTPThreshold(th *utils.TPThresholdProfile) (mdls ThresholdMdls) {
if min > len(th.ActionIDs) {
min = len(th.ActionIDs)
}
for i := 0; i < min; i++ {
if min > len(th.EeIDs) {
min = len(th.EeIDs)
}
for i := range min {
mdl := &ThresholdMdl{
Tpid: th.TPid,
Tenant: th.Tenant,
@@ -1907,6 +1918,7 @@ func APItoModelTPThreshold(th *utils.TPThresholdProfile) (mdls ThresholdMdls) {
}
mdl.FilterIDs = th.FilterIDs[i]
mdl.ActionIDs = th.ActionIDs[i]
mdl.EeIDs = th.EeIDs[i]
mdls = append(mdls, mdl)
}
@@ -1921,6 +1933,17 @@ func APItoModelTPThreshold(th *utils.TPThresholdProfile) (mdls ThresholdMdls) {
mdls = append(mdls, mdl)
}
}
if len(th.EeIDs)-min > 0 {
for i := min; i < len(th.EeIDs); i++ {
mdl := &ThresholdMdl{
Tpid: th.TPid,
Tenant: th.Tenant,
ID: th.ID,
}
mdl.EeIDs = th.EeIDs[i]
mdls = append(mdls, mdl)
}
}
if len(th.ActionIDs)-min > 0 {
for i := min; i < len(th.ActionIDs); i++ {
mdl := &ThresholdMdl{
@@ -1963,6 +1986,7 @@ func APItoThresholdProfile(tpTH *utils.TPThresholdProfile, timezone string) (th
Async: tpTH.Async,
ActionIDs: make([]string, len(tpTH.ActionIDs)),
FilterIDs: make([]string, len(tpTH.FilterIDs)),
EeIDs: make([]string, len(tpTH.EeIDs)),
}
if tpTH.MinSleep != utils.EmptyString {
if th.MinSleep, err = utils.ParseDurationWithNanosecs(tpTH.MinSleep); err != nil {
@@ -1972,6 +1996,7 @@ func APItoThresholdProfile(tpTH *utils.TPThresholdProfile, timezone string) (th
copy(th.ActionIDs, tpTH.ActionIDs)
copy(th.FilterIDs, tpTH.FilterIDs)
copy(th.EeIDs, tpTH.EeIDs)
if tpTH.ActivationInterval != nil {
if th.ActivationInterval, err = tpTH.ActivationInterval.AsActivationInterval(timezone); err != nil {
@@ -1992,6 +2017,7 @@ func ThresholdProfileToAPI(th *ThresholdProfile) (tpTH *utils.TPThresholdProfile
Blocker: th.Blocker,
Weight: th.Weight,
ActionIDs: make([]string, len(th.ActionIDs)),
EeIDs: make([]string, len(th.EeIDs)),
Async: th.Async,
}
if th.MinSleep != time.Duration(0) {
@@ -2000,6 +2026,7 @@ func ThresholdProfileToAPI(th *ThresholdProfile) (tpTH *utils.TPThresholdProfile
copy(tpTH.FilterIDs, th.FilterIDs)
copy(tpTH.ActionIDs, th.ActionIDs)
copy(tpTH.EeIDs, th.EeIDs)
if th.ActivationInterval != nil {
if !th.ActivationInterval.ActivationTime.IsZero() {