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

CDR filters min/max usage/pdd as string, various mongodb storage fixes for filters, large number of tests added for CDR filtering on all 3 storDBs

Browse Source
This commit is contained in:
DanB
2015-12-30 16:39:18 +01:00
parent fbe369833e
commit fdd3bf5f58
4 changed files with 624 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
engine/storage_sql.go
View File

@@ -864,17 +864,35 @@ func (self *SQLStorage) GetCDRs(qryFltr *utils.CDRsFilter) ([]*CDR, int64, error
if qryFltr.UpdatedAtEnd != nil && !qryFltr.UpdatedAtEnd.IsZero() {
q = q.Where("updated_at < ?", qryFltr.UpdatedAtEnd)
}
if qryFltr.MinUsage != nil {
q = q.Where("usage >= ?", qryFltr.MinUsage)
if len(qryFltr.MinUsage) != 0 {
if minUsage, err := utils.ParseDurationWithSecs(qryFltr.MinUsage); err != nil {
return nil, 0, err
} else {
q = q.Where("usage >= ?", minUsage.Seconds())
}
}
if qryFltr.MaxUsage != nil {
q = q.Where("usage < ?", qryFltr.MaxUsage)
if len(qryFltr.MaxUsage) != 0 {
if maxUsage, err := utils.ParseDurationWithSecs(qryFltr.MaxUsage); err != nil {
return nil, 0, err
} else {
q = q.Where("usage < ?", maxUsage.Seconds())
}
}
if qryFltr.MinPDD != nil {
q = q.Where("pdd >= ?", qryFltr.MinPDD)
if len(qryFltr.MinPDD) != 0 {
if minPDD, err := utils.ParseDurationWithSecs(qryFltr.MinPDD); err != nil {
return nil, 0, err
} else {
q = q.Where("pdd >= ?", minPDD.Seconds())
}
}
if qryFltr.MaxPDD != nil {
q = q.Where("pdd < ?", qryFltr.MaxPDD)
if len(qryFltr.MaxPDD) != 0 {
if maxPDD, err := utils.ParseDurationWithSecs(qryFltr.MaxPDD); err != nil {
return nil, 0, err
} else {
q = q.Where("pdd < ?", maxPDD.Seconds())
}
}
if qryFltr.MinCost != nil {