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

Update combimed function for CDR to use filterS

Browse Source
This commit is contained in:
TeoV
2020-05-19 18:18:48 +03:00
committed by Dan Christian Bogos
parent 4b7976f920
commit bb576a24ea
2 changed files with 97 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
engine/cdr.go
View File

@@ -288,25 +288,24 @@ func (cdr *CDR) String() string {
// combimedCdrFieldVal groups together CDRs with same CGRID and combines their values matching filter field ID
func (cdr *CDR) combimedCdrFieldVal(cfgCdrFld *config.FCTemplate, groupCDRs []*CDR, filterS *FilterS) (string, error) {
var combinedVal string // Will result as combination of the field values, filters must match
for _, filterRule := range cfgCdrFld.Value {
pairingVal, err := cdr.FieldAsString(filterRule)
if err != nil {
return "", err
var combimedVal string // Will result as combination of the field values, filters must match
for _, grpCDR := range groupCDRs {
if cdr.CGRID != grpCDR.CGRID {
continue // We only care about cdrs with same primary cdr behind
}
for _, grpCDR := range groupCDRs {
if cdr.CGRID != grpCDR.CGRID {
continue // We only care about cdrs with same primary cdr behind
}
if valStr, err := grpCDR.FieldAsString(filterRule); err != nil {
return "", err
} else if valStr != pairingVal { // First CDR with field equal with ours
continue
}
combinedVal += grpCDR.FieldsAsString(cfgCdrFld.Value)
if pass, err := filterS.Pass(grpCDR.Tenant, cfgCdrFld.Filters, utils.MapStorage{
utils.MetaReq: grpCDR.AsMapStringIface(),
utils.MetaEC: grpCDR.CostDetails,
}); err != nil {
return utils.EmptyString, err
} else if !pass {
continue
}
combimedVal += grpCDR.FieldsAsString(cfgCdrFld.Value)
}
return combinedVal, nil
return combimedVal, nil
}
// Extracts the value specified by cfgHdr out of cdr, used for export values