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

Implement all filters for GetCDR for InternalDB

Browse Source
This commit is contained in:
TeoV
2019-10-15 18:35:14 +03:00
committed by Dan Christian Bogos
parent be9ba5df3b
commit 986da779e2
2 changed files with 111 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/storage_cdrs_it_test.go
View File

@@ -799,46 +799,46 @@ func testGetCDRs(cfg *config.CGRConfig) error {
break
}
if CDRs[i].OrderID < CDRs[i+1].OrderID {
return fmt.Errorf("%+v should be greater than %+v \n", CDRs[i].OrderID, CDRs[i+1].OrderID)
return fmt.Errorf("testGetCDRs #95 %+v should be greater than %+v \n", CDRs[i].OrderID, CDRs[i+1].OrderID)
}
}
}
//Filter by OrderID ascendent
if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderBy: "OrderID"}, false); err != nil {
return fmt.Errorf("testGetCDRs #95, err: %v", err)
return fmt.Errorf("testGetCDRs #96, err: %v", err)
} else {
for i := range CDRs {
if i+1 > len(CDRs)-1 {
break
}
if CDRs[i].OrderID > CDRs[i+1].OrderID {
return fmt.Errorf("%+v sould be smaller than %+v \n", CDRs[i].OrderID, CDRs[i+1].OrderID)
return fmt.Errorf("testGetCDRs #96 %+v sould be smaller than %+v \n", CDRs[i].OrderID, CDRs[i+1].OrderID)
}
}
}
//Filter by Cost descendent
if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderBy: "Cost;desc"}, false); err != nil {
return fmt.Errorf("testGetCDRs #95, err: %v", err)
return fmt.Errorf("testGetCDRs #97, err: %v", err)
} else {
for i := range CDRs {
if i+1 > len(CDRs)-1 {
break
}
if CDRs[i].Cost < CDRs[i+1].Cost {
return fmt.Errorf("%+v should be greater than %+v \n", CDRs[i].Cost, CDRs[i+1].Cost)
return fmt.Errorf("testGetCDRs #97 %+v should be greater than %+v \n", CDRs[i].Cost, CDRs[i+1].Cost)
}
}
}
//Filter by Cost ascendent
if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderBy: "Cost"}, false); err != nil {
return fmt.Errorf("testGetCDRs #95, err: %v", err)
return fmt.Errorf("testGetCDRs #98, err: %v", err)
} else {
for i := range CDRs {
if i+1 > len(CDRs)-1 {
break
}
if CDRs[i].Cost > CDRs[i+1].Cost {
return fmt.Errorf("%+v sould be smaller than %+v \n", CDRs[i].Cost, CDRs[i+1].Cost)
return fmt.Errorf("testGetCDRs #98 %+v sould be smaller than %+v \n", CDRs[i].Cost, CDRs[i+1].Cost)
}
}
}

152
engine/storage_internal_stordb.go
View File

@@ -19,6 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package engine
import (
"fmt"
"sort"
"strings"
"github.com/cgrates/cgrates/utils"
@@ -937,36 +939,6 @@ func (iDB *InternalDB) GetCDRs(filter *utils.CDRsFilter, remove bool) (cdrs []*C
}
}
}
//check if we have ExtraFields
if len(filter.ExtraFields) != 0 {
for extFldID, extrFldVal := range filter.ExtraFields {
// need to discuss about this case
if extrFldVal == utils.MetaExists {
}
grpMpIDs := make(utils.StringMap)
grpIDs := iDB.db.GetGroupItemIDs(utils.CDRsTBL, utils.ConcatenatedKey(extFldID, extrFldVal))
for _, id := range grpIDs {
grpMpIDs[id] = true
}
if len(grpMpIDs) == 0 {
return nil, 0, utils.ErrNotFound
}
if cdrMpIDs == nil {
cdrMpIDs = grpMpIDs
} else {
for id := range cdrMpIDs {
if !grpMpIDs.HasKey(id) {
delete(cdrMpIDs, id)
if len(cdrMpIDs) == 0 {
return nil, 0, utils.ErrNotFound
}
}
}
}
}
}
if cdrMpIDs == nil {
cdrMpIDs = utils.StringMapFromSlice(iDB.db.GetItemIDs(utils.CDRsTBL, utils.EmptyString))
@@ -1005,24 +977,6 @@ func (iDB *InternalDB) GetCDRs(filter *utils.CDRsFilter, remove bool) (cdrs []*C
}
}
}
//check if we have ExtraFields
if len(filter.NotExtraFields) != 0 {
for notExtFldID, notExtFlddVal := range filter.NotExtraFields {
// need to discuss about this case
if notExtFlddVal == utils.MetaExists {
}
grpIDs := iDB.db.GetGroupItemIDs(utils.CDRsTBL, utils.ConcatenatedKey(notExtFldID, notExtFlddVal))
for _, id := range grpIDs {
if cdrMpIDs.HasKey(id) {
delete(cdrMpIDs, id)
if len(cdrMpIDs) == 0 {
return nil, 0, utils.ErrNotFound
}
}
}
}
}
if len(cdrMpIDs) == 0 {
return nil, 0, utils.ErrNotFound
@@ -1136,6 +1090,41 @@ func (iDB *InternalDB) GetCDRs(filter *utils.CDRsFilter, remove bool) (cdrs []*C
}
}
}
if len(filter.ExtraFields) != 0 {
passFilter := true
for extFldID, extFldVal := range filter.ExtraFields {
if extFldVal == utils.MetaExists {
if _, has := cdr.ExtraFields[extFldID]; !has {
passFilter = false
break
}
} else if cdr.ExtraFields[extFldID] != extFldVal {
passFilter = false
break
}
}
if !passFilter {
continue
}
}
if len(filter.NotExtraFields) != 0 {
passFilter := true
for notExtFldID, notExtFldVal := range filter.NotExtraFields {
if notExtFldVal == utils.MetaExists {
if _, has := cdr.ExtraFields[notExtFldID]; has {
passFilter = false
break
}
} else if cdr.ExtraFields[notExtFldID] == notExtFldVal {
passFilter = false
break
}
}
if !passFilter {
continue
}
}
if filter.Paginator.Offset != nil {
if paginatorOffsetCounter <= *filter.Paginator.Offset {
@@ -1161,6 +1150,73 @@ func (iDB *InternalDB) GetCDRs(filter *utils.CDRsFilter, remove bool) (cdrs []*C
}
return nil, 0, nil
}
if filter.OrderBy != "" {
separateVals := strings.Split(filter.OrderBy, utils.INFIELD_SEP)
ascendent := true
if len(separateVals) == 2 && separateVals[1] == "desc" {
ascendent = false
}
switch separateVals[0] {
case utils.OrderID:
if ascendent {
sort.Slice(cdrs, func(i, j int) bool {
return cdrs[i].OrderID < cdrs[j].OrderID
})
} else {
sort.Slice(cdrs, func(i, j int) bool {
return cdrs[i].OrderID > cdrs[j].OrderID
})
}
case utils.AnswerTime:
if ascendent {
sort.Slice(cdrs, func(i, j int) bool {
return cdrs[i].AnswerTime.Before(cdrs[j].AnswerTime)
})
} else {
sort.Slice(cdrs, func(i, j int) bool {
return cdrs[i].AnswerTime.After(cdrs[j].AnswerTime)
})
}
case utils.SetupTime:
if ascendent {
sort.Slice(cdrs, func(i, j int) bool {
return cdrs[i].SetupTime.Before(cdrs[j].SetupTime)
})
} else {
sort.Slice(cdrs, func(i, j int) bool {
return cdrs[i].SetupTime.After(cdrs[j].SetupTime)
})
}
case utils.Usage:
if ascendent {
sort.Slice(cdrs, func(i, j int) bool {
return cdrs[i].Usage < cdrs[j].Usage
})
} else {
sort.Slice(cdrs, func(i, j int) bool {
return cdrs[i].Usage > cdrs[j].Usage
})
}
case utils.Cost:
if ascendent {
sort.Slice(cdrs, func(i, j int) bool {
return cdrs[i].Cost < cdrs[j].Cost
})
} else {
sort.Slice(cdrs, func(i, j int) bool {
return cdrs[i].Cost > cdrs[j].Cost
})
}
default:
return nil, 0, fmt.Errorf("Invalid value : %s", separateVals[0])
}
}
return
}