From b8f90ee94fb2fa64d4c71d19661dacbf574483ff Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 28 Dec 2015 12:12:13 +0100 Subject: [PATCH] CDRS does not longer log debits, fix integration tests --- apier/v1/apier_local_test.go | 4 ++-- data/tariffplans/tutorial/Users.csv | 4 ++-- engine/cdrs.go | 4 +--- general_tests/tutorial_local_test.go | 1 + 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apier/v1/apier_local_test.go b/apier/v1/apier_local_test.go index 2fb206686..36f1add3c 100644 --- a/apier/v1/apier_local_test.go +++ b/apier/v1/apier_local_test.go @@ -1411,7 +1411,7 @@ func TestApierLocalGetCdrs(t *testing.T) { return } var reply []*engine.ExternalCDR - req := utils.AttrGetCdrs{} + req := utils.AttrGetCdrs{MediationRunIds: []string{utils.MetaRaw}} if err := rater.Call("ApierV1.GetCdrs", req, &reply); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(reply) != 2 { @@ -1436,7 +1436,7 @@ func TestApierLocalProcessCdr(t *testing.T) { t.Error("Unexpected reply received: ", reply) } var cdrs []*engine.ExternalCDR - req := utils.AttrGetCdrs{} + req := utils.AttrGetCdrs{MediationRunIds: []string{utils.MetaRaw}} if err := rater.Call("ApierV1.GetCdrs", req, &cdrs); err != nil { t.Error("Unexpected error: ", err.Error()) } else if len(cdrs) != 3 { diff --git a/data/tariffplans/tutorial/Users.csv b/data/tariffplans/tutorial/Users.csv index 699dec1e2..63b36ff9f 100644 --- a/data/tariffplans/tutorial/Users.csv +++ b/data/tariffplans/tutorial/Users.csv @@ -6,7 +6,7 @@ cgrates.org,1001,,Account,1001,10 cgrates.org,1001,,Subject,1001,10 cgrates.org,1001,,Uuid,388539dfd4f5cefee8f488b78c6c244b9e19138e,10 cgrates.org,1001,,SubscriberId,1001,10 -cgrates.org,1001,,ReqType,*prepaid,10 +cgrates.org,1001,,RequestType,*prepaid,10 cgrates.org,1002,,SysUserName,rif,10 cgrates.org,1002,,RifAttr,RifVal,10 cgrates.org,1002,,Account,1002,10 @@ -18,5 +18,5 @@ cgrates.org,1004,,SysPassword,hisPass321,10 cgrates.org,1004,,Cli,+4986517174964,10 cgrates.org,1004,,Account,1004,10 cgrates.org,1004,,Subject,1004,10 -cgrates.org,1004,,ReqType,*rated,10 +cgrates.org,1004,,RequestType,*rated,10 cgrates.org,1004,,SubscriberId,1004,10 diff --git a/engine/cdrs.go b/engine/cdrs.go index 2a197e654..b1db25c4d 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -367,9 +367,7 @@ func (self *CdrServer) getCostFromRater(cdr *CDR) (*CallCost, error) { DurationIndex: cdr.Usage, } if utils.IsSliceMember([]string{utils.META_PSEUDOPREPAID, utils.META_POSTPAID, utils.META_PREPAID, utils.PSEUDOPREPAID, utils.POSTPAID, utils.PREPAID}, cdr.RequestType) { // Prepaid - Cost can be recalculated in case of missing records from SM - if err = self.rater.Debit(cd, cc); err == nil { // Debit has occured, we are forced to write the log, even if CDR store is disabled - self.cdrDb.LogCallCost(cdr.CGRID, cdr.RunID, utils.CDRS_SOURCE, cc) - } + err = self.rater.Debit(cd, cc) } else { err = self.rater.GetCost(cd, cc) } diff --git a/general_tests/tutorial_local_test.go b/general_tests/tutorial_local_test.go index 91e40442b..d5c389c2f 100644 --- a/general_tests/tutorial_local_test.go +++ b/general_tests/tutorial_local_test.go @@ -522,6 +522,7 @@ func TestTutLocalProcessExternalCdrUP(t *testing.T) { } else if reply != utils.OK { t.Error("Unexpected reply received: ", reply) } + time.Sleep(time.Duration(*waitRater) * time.Millisecond) eCdr := &engine.ExternalCDR{CGRID: "63a8d2bfeca2cfb790826c3ec461696d6574cfde", OrderID: 2, TOR: utils.VOICE, OriginID: "testextcdr2", OriginHost: "192.168.1.1", Source: utils.UNIT_TEST, RequestType: utils.META_RATED, Direction: utils.OUT,