uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-17 14:19:54 +05:00
Code Issues Packages Projects Releases Wiki Activity

OrderID implementation and tests for all 3 storDBs

Browse Source
This commit is contained in:
DanB
2015-12-30 18:15:58 +01:00
parent fdd3bf5f58
commit dfdf8321af
6 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/cdrs.go
View File

@@ -125,7 +125,7 @@ func (self *CdrServer) LogCallCost(ccl *CallCostLog) error {
// Called by rate/re-rate API
func (self *CdrServer) RateCDRs(cgrIds, runIds, tors, cdrHosts, cdrSources, RequestTypes, directions, tenants, categories, accounts, subjects, destPrefixes, ratedAccounts, ratedSubjects []string,
orderIdStart, orderIdEnd int64, timeStart, timeEnd time.Time, rerateErrors, rerateRated, sendToStats bool) error {
orderIdStart, orderIdEnd *int64, timeStart, timeEnd time.Time, rerateErrors, rerateRated, sendToStats bool) error {
var costStart, costEnd *float64
if rerateErrors {
costStart = utils.Float64Pointer(-1.0)

50
engine/storage_cdrs_it_test.go
View File

@@ -43,12 +43,14 @@ func TestITCDRsMySQL(t *testing.T) {
if err := testGetCDRs(cfg); err != nil {
t.Error(err)
}
if err := testSetCDR(cfg); err != nil {
t.Error(err)
}
if err := testSMCosts(cfg); err != nil {
t.Error(err)
}
/*
if err := testSetCDR(cfg); err != nil {
t.Error(err)
}
if err := testSMCosts(cfg); err != nil {
t.Error(err)
}
*/
}
func TestITCDRsPSQL(t *testing.T) {
@@ -104,6 +106,7 @@ func testSetCDR(cfg *config.CGRConfig) error {
rawCDR := &CDR{
CGRID: utils.Sha1("testevent1", time.Date(2015, 12, 12, 14, 52, 0, 0, time.UTC).String()),
RunID: utils.MetaRaw,
OrderID: time.Now().UnixNano(),
OriginHost: "127.0.0.1",
Source: "testSetCDRs",
OriginID: "testevent1",
@@ -502,7 +505,7 @@ func testGetCDRs(cfg *config.CGRConfig) error {
if CDRs, _, err := cdrStorage.GetCDRs(new(utils.CDRsFilter)); err != nil {
return err
} else if len(CDRs) != 10 {
return fmt.Errorf("GetCDRs, unexpected number of CDRs returned: ", CDRs)
return fmt.Errorf("GetCDRs, unexpected number of CDRs returned: %d", len(CDRs))
}
// Count ALL
if CDRs, count, err := cdrStorage.GetCDRs(&utils.CDRsFilter{Count: true}); err != nil {
@@ -708,42 +711,43 @@ func testGetCDRs(cfg *config.CGRConfig) error {
}
// Filter on MaxCost
//var orderIdStart, orderIdEnd int64 // Capture also orderIds for the next test
var orderIdStart, orderIdEnd int64 // Capture also orderIds for the next test
if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{MaxCost: utils.Float64Pointer(0.0)}); err != nil {
return err
} else if len(CDRs) != 5 {
return fmt.Errorf("Filter on MaxCost, unexpected number of CDRs returned: ", CDRs)
}
/*else {
for _, cdr := range CDRs {
if cdr.OrderId < orderIdStart {
orderIdStart = cdr.OrderId
} else {
for i, cdr := range CDRs {
if i == 0 {
orderIdStart = cdr.OrderID
}
if cdr.OrderId > orderIdEnd {
orderIdEnd = cdr.OrderId
if cdr.OrderID < orderIdStart {
orderIdStart = cdr.OrderID
}
if cdr.OrderID > orderIdEnd {
orderIdEnd = cdr.OrderID
}
}
}
// Filter on orderIdStart
if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderIdStart: orderIdStart}); err != nil {
if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderIDStart: &orderIdStart}); err != nil {
return err
} else if len(CDRs) != 8 {
t.Error("Unexpected number of CDRs returned: ", CDRs)
} else if len(CDRs) != 10 {
return fmt.Errorf("Filter on OrderIDStart, unexpected number of CDRs returned: %d", len(CDRs))
}
// Filter on orderIdStart and orderIdEnd
if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderIdStart: orderIdStart, OrderIdEnd: orderIdEnd}); err != nil {
if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{OrderIDStart: &orderIdStart, OrderIDEnd: &orderIdEnd}); err != nil {
return err
} else if len(CDRs) != 4 {
t.Error("Unexpected number of CDRs returned: ", CDRs)
} else if len(CDRs) != 8 {
return fmt.Errorf("Filter on OrderIDStart OrderIDEnd, unexpected number of CDRs returned: %d", len(CDRs))
}
*/
var timeStart, timeEnd time.Time
// Filter on timeStart
timeStart = time.Date(2015, 12, 28, 0, 0, 0, 0, time.UTC)
if CDRs, _, err := cdrStorage.GetCDRs(&utils.CDRsFilter{AnswerTimeStart: &timeStart}); err != nil {
return err
} else if len(CDRs) != 3 {
return fmt.Errorf("Filter on AnswerTimeStart, unexpected number of CDRs returned: %+v", CDRs)
return fmt.Errorf("Filter on AnswerTimeStart, unexpected number of CDRs returned: %d", len(CDRs))
}
// Filter on timeStart and timeEnd
timeEnd = time.Date(2015, 12, 29, 0, 0, 0, 0, time.UTC)

1
engine/storage_mongo_datadb.go
View File

@@ -58,6 +58,7 @@ const (
var (
CGRIDLow = strings.ToLower(utils.CGRID)
RunIDLow = strings.ToLower(utils.MEDI_RUNID)
OrderIDLow = strings.ToLower(utils.ORDERID)
ToRLow = strings.ToLower(utils.TOR)
CDRHostLow = strings.ToLower(utils.CDRHOST)
CDRSourceLow = strings.ToLower(utils.CDRSOURCE)

19
engine/storage_mongo_stordb.go
View File

@@ -711,6 +711,9 @@ func (ms *MongoStorage) GetCallCostLog(cgrid, runid string) (cc *CallCost, err e
}
func (ms *MongoStorage) SetCDR(cdr *CDR, allowUpdate bool) (err error) {
if cdr.OrderID == 0 {
cdr.OrderID = time.Now().UnixNano()
}
if allowUpdate {
_, err = ms.db.C(utils.TBL_CDRS).Upsert(bson.M{CGRIDLow: cdr.CGRID, RunIDLow: cdr.RunID}, cdr)
} else {
@@ -731,6 +734,10 @@ func (ms *MongoStorage) RemCDRs(cgrIds []string) error {
func (ms *MongoStorage) cleanEmptyFilters(filters bson.M) {
for k, v := range filters {
switch value := v.(type) {
case *int64:
if value == nil {
delete(filters, k)
}
case *float64:
if value == nil {
delete(filters, k)
@@ -789,6 +796,7 @@ func (ms *MongoStorage) GetCDRs(qryFltr *utils.CDRsFilter) ([]*CDR, int64, error
filters := bson.M{
CGRIDLow: bson.M{"$in": qryFltr.CGRIDs, "$nin": qryFltr.NotCGRIDs},
RunIDLow: bson.M{"$in": qryFltr.RunIDs, "$nin": qryFltr.NotRunIDs},
OrderIDLow: bson.M{"$gte": qryFltr.OrderIDStart, "$lt": qryFltr.OrderIDEnd},
ToRLow: bson.M{"$in": qryFltr.ToRs, "$nin": qryFltr.NotToRs},
CDRHostLow: bson.M{"$in": qryFltr.OriginHosts, "$nin": qryFltr.NotOriginHosts},
CDRSourceLow: bson.M{"$in": qryFltr.Sources, "$nin": qryFltr.NotSources},
@@ -813,17 +821,6 @@ func (ms *MongoStorage) GetCDRs(qryFltr *utils.CDRsFilter) ([]*CDR, int64, error
//file.WriteString(fmt.Sprintf("FILTER: %v\n", utils.ToIJSON(qryFltr)))
//file.WriteString(fmt.Sprintf("BEFORE: %v\n", utils.ToIJSON(filters)))
ms.cleanEmptyFilters(filters)
/*if qryFltr.OrderIdStart != 0 {
filters["id"] = bson.M{"$gte": qryFltr.OrderIdStart}
}
if qryFltr.OrderIdEnd != 0 {
if m, ok := filters["id"]; ok {
m.(bson.M)["$gte"] = qryFltr.OrderIdStart
} else {
filters["id"] = bson.M{"$gte": qryFltr.OrderIdStart}
}
}*/
if len(qryFltr.DestinationPrefixes) != 0 {
var regexpRule string
for _, prefix := range qryFltr.DestinationPrefixes {

10
engine/storage_sql.go
View File

@@ -785,7 +785,7 @@ func (self *SQLStorage) GetCDRs(qryFltr *utils.CDRsFilter) ([]*CDR, int64, error
if idx != 0 {
qIds.WriteString(" AND")
}
qIds.WriteString(fmt.Sprintf(" destination not LIKE '%%%s%%'", destPrefix))
qIds.WriteString(fmt.Sprintf(" destination not LIKE '%s%%'", destPrefix))
}
qIds.WriteString(" )")
q = q.Where(qIds.String())
@@ -834,11 +834,11 @@ func (self *SQLStorage) GetCDRs(qryFltr *utils.CDRsFilter) ([]*CDR, int64, error
qIds.WriteString(" )")
q = q.Where(qIds.String())
}
if qryFltr.OrderIDStart != 0 { // Keep backwards compatible by testing 0 value
q = q.Where(utils.TBL_CDRS+".id >= ?", qryFltr.OrderIDStart)
if qryFltr.OrderIDStart != nil { // Keep backwards compatible by testing 0 value
q = q.Where(utils.TBL_CDRS+".id >= ?", *qryFltr.OrderIDStart)
}
if qryFltr.OrderIDEnd != 0 {
q = q.Where(utils.TBL_CDRS+".id < ?", qryFltr.OrderIDEnd)
if qryFltr.OrderIDEnd != nil {
q = q.Where(utils.TBL_CDRS+".id < ?", *qryFltr.OrderIDEnd)
}
if qryFltr.SetupTimeStart != nil {
q = q.Where("setup_time >= ?", qryFltr.SetupTimeStart)

20
utils/apitpdata.go
View File

@@ -612,8 +612,8 @@ type AttrExpFileCdrs struct {
Accounts []string // If provided, it will filter account
Subjects []string // If provided, it will filter the rating subject
DestinationPrefixes []string // If provided, it will filter on destination prefix
OrderIdStart int64 // Export from this order identifier
OrderIdEnd int64 // Export smaller than this order identifier
OrderIdStart *int64 // Export from this order identifier
OrderIdEnd *int64 // Export smaller than this order identifier
TimeStart string // If provided, it will represent the starting of the CDRs interval (>=)
TimeEnd string // If provided, it will represent the end of the CDRs interval (<)
SkipErrors bool // Do not export errored CDRs
@@ -687,8 +687,8 @@ type AttrGetCdrs struct {
DestinationPrefixes []string // If provided, it will filter on destination prefix
RatedAccounts []string // If provided, it will filter ratedaccount
RatedSubjects []string // If provided, it will filter the ratedsubject
OrderIdStart int64 // Export from this order identifier
OrderIdEnd int64 // Export smaller than this order identifier
OrderIdStart *int64 // Export from this order identifier
OrderIdEnd *int64 // Export smaller than this order identifier
TimeStart string // If provided, it will represent the starting of the CDRs interval (>=)
TimeEnd string // If provided, it will represent the end of the CDRs interval (<)
SkipErrors bool // Do not export errored CDRs
@@ -756,8 +756,8 @@ type AttrRateCdrs struct {
DestinationPrefixes []string // If provided, it will filter on destination prefix
RatedAccounts []string // If provided, it will filter ratedaccount
RatedSubjects []string // If provided, it will filter the ratedsubject
OrderIdStart int64 // Export from this order identifier
OrderIdEnd int64 // Export smaller than this order identifier
OrderIdStart *int64 // Export from this order identifier
OrderIdEnd *int64 // Export smaller than this order identifier
TimeStart string // If provided, it will represent the starting of the CDRs interval (>=)
TimeEnd string // If provided, it will represent the end of the CDRs interval (<)
RerateErrors bool // Rerate previous CDRs with errors (makes sense for reqtype rated and pseudoprepaid
@@ -863,8 +863,8 @@ type CDRsFilter struct {
NotCosts []float64 // Filter out specific costs out from result
ExtraFields map[string]string // Query based on extra fields content
NotExtraFields map[string]string // Filter out based on extra fields content
OrderIDStart int64 // Export from this order identifier
OrderIDEnd int64 // Export smaller than this order identifier
OrderIDStart *int64 // Export from this order identifier
OrderIDEnd *int64 // Export smaller than this order identifier
SetupTimeStart *time.Time // Start of interval, bigger or equal than configured
SetupTimeEnd *time.Time // End interval, smaller than setupTime
AnswerTimeStart *time.Time // Start of interval, bigger or equal than configured
@@ -920,8 +920,8 @@ type RPCCDRsFilter struct {
NotCosts []float64 // Filter out specific costs out from result
ExtraFields map[string]string // Query based on extra fields content
NotExtraFields map[string]string // Filter out based on extra fields content
OrderIDStart int64 // Export from this order identifier
OrderIDEnd int64 // Export smaller than this order identifier
OrderIDStart *int64 // Export from this order identifier
OrderIDEnd *int64 // Export smaller than this order identifier
SetupTimeStart string // Start of interval, bigger or equal than configured
SetupTimeEnd string // End interval, smaller than setupTime
AnswerTimeStart string // Start of interval, bigger or equal than configured