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

Simplify GetCDRs implementation

Browse Source 
Remove redundant checks and use a single CDR instance for both filtering and
results.
This commit is contained in:
ionutboangiu
2025-05-08 20:55:45 +03:00
committed by Dan Christian Bogos
parent 2a85e371a2
commit 3acb9deac5
1 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
engine/storage_sql.go
View File

@@ -181,7 +181,7 @@ func (sqls *SQLStorage) SetCDR(_ *context.Context, cdr *utils.CGREvent, allowUpd
// GetCDRs has ability to get the filtered CDRs, count them or simply return them
// qryFltr.Unscoped will ignore soft deletes or delete records permanently
func (sqls *SQLStorage) GetCDRs(ctx *context.Context, qryFltr []*Filter, opts map[string]any) (cdrs []*utils.CDR, err error) {
func (sqls *SQLStorage) GetCDRs(ctx *context.Context, qryFltr []*Filter, opts map[string]any) ([]*utils.CDR, error) {
q := sqls.db.Table(utils.CDRsTBL)
var excludedCdrQueryFilterTypes []*FilterRule
for _, fltr := range qryFltr {
@@ -228,23 +228,24 @@ func (sqls *SQLStorage) GetCDRs(ctx *context.Context, qryFltr []*Filter, opts ma
// Execute query
results := make([]*utils.CDRSQLTable, 0)
if err = q.Find(&results).Error; err != nil {
return
}
if len(results) == 0 {
return nil, utils.ErrNotFound
return nil, err
}
//convert into CDR
resultCdr := make([]*utils.CDR, 0, len(results))
cdrs := make([]*utils.CDR, 0, len(results))
for _, val := range results {
cdr := &utils.CDR{
Tenant: val.Tenant,
Opts: val.Opts,
Event: val.Event,
CreatedAt: val.CreatedAt,
UpdatedAt: val.UpdatedAt,
DeletedAt: val.DeletedAt,
}
// here we wil do our filtration, meaning that we will filter those cdrs who cannot be filtered in the databes eg: *ai, *rsr..
if len(excludedCdrQueryFilterTypes) != 0 {
newCdr := &utils.CDR{
Tenant: val.Tenant,
Opts: val.Opts,
Event: val.Event,
}
var pass bool
dP := newCdr.CGREvent().AsDataProvider()
dP := cdr.CGREvent().AsDataProvider()
for _, fltr := range excludedCdrQueryFilterTypes {
if pass, err = fltr.Pass(ctx, dP); err != nil {
return nil, err
@@ -257,23 +258,12 @@ func (sqls *SQLStorage) GetCDRs(ctx *context.Context, qryFltr []*Filter, opts ma
continue
}
}
resultCdr = append(resultCdr, &utils.CDR{
Tenant: val.Tenant,
Opts: val.Opts,
Event: val.Event,
CreatedAt: val.CreatedAt,
UpdatedAt: val.UpdatedAt,
DeletedAt: val.DeletedAt,
})
cdrs = append(cdrs, cdr)
}
if len(resultCdr) == 0 {
if len(cdrs) == 0 {
return nil, utils.ErrNotFound
}
if maxItems != 0 && len(resultCdr) > maxItems {
return nil, fmt.Errorf("maximum number of items exceeded")
}
cdrs, err = utils.Paginate(resultCdr, 0, 0, maxItems)
return
return cdrs, nil
}
func (sqls *SQLStorage) RemoveCDRs(ctx *context.Context, qryFltr []*Filter) (err error) {