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

LcrReq parameter change StartTime->SetupTime for uniformity with MaxUsageReq

Browse Source
This commit is contained in:
DanB
2015-08-13 12:16:30 +02:00
parent 95694b688e
commit ad682a5aed
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apier/v1/lcr.go
View File

@@ -68,9 +68,11 @@ func (self *ApierV1) GetLcrSuppliers(lcrReq engine.LcrRequest, suppliers *string
if err := self.Responder.GetLCR(&engine.AttrGetLcr{CallDescriptor: cd, Paginator: lcrReq.Paginator}, &lcrQried); err != nil {
return utils.NewErrServerError(err)
}
if lcrQried.HasErrors() && !lcrReq.IgnoreErrors {
if lcrQried.HasErrors() {
lcrQried.LogErrors()
return fmt.Errorf("%s:%s", utils.ErrServerError.Error(), "LCR_ERRORS")
if !lcrReq.IgnoreErrors {
return fmt.Errorf("%s:%s", utils.ErrServerError.Error(), "LCR_COMPUTE_ERRORS")
}
}
if suppliersStr, err := lcrQried.SuppliersString(); err != nil {
return utils.NewErrServerError(err)

6
engine/lcr.go
View File

@@ -54,7 +54,7 @@ type LcrRequest struct {
Account string
Subject string
Destination string
StartTime string
SetupTime string
Duration string
IgnoreErrors bool
*utils.Paginator
@@ -79,9 +79,9 @@ func (self *LcrRequest) AsCallDescriptor() (*CallDescriptor, error) {
}
var timeStart time.Time
var err error
if len(self.StartTime) == 0 {
if len(self.SetupTime) == 0 {
timeStart = time.Now()
} else if timeStart, err = utils.ParseTimeDetectLayout(self.StartTime); err != nil {
} else if timeStart, err = utils.ParseTimeDetectLayout(self.SetupTime); err != nil {
return nil, err
}
var callDur time.Duration

4
engine/lcr_test.go
View File

@@ -215,11 +215,11 @@ func TestLcrGet(t *testing.T) {
func TestLcrRequestAsCallDescriptor(t *testing.T) {
sTime := time.Date(2015, 04, 06, 17, 40, 0, 0, time.UTC)
callDur := time.Duration(1) * time.Minute
lcrReq := &LcrRequest{Account: "2001", StartTime: sTime.String()}
lcrReq := &LcrRequest{Account: "2001", SetupTime: sTime.String()}
if _, err := lcrReq.AsCallDescriptor(); err == nil || err != utils.ErrMandatoryIeMissing {
t.Error("Unexpected error received: %v", err)
}
lcrReq = &LcrRequest{Account: "2001", Destination: "2002", StartTime: sTime.String()}
lcrReq = &LcrRequest{Account: "2001", Destination: "2002", SetupTime: sTime.String()}
eCd := &CallDescriptor{
Direction: utils.OUT,
Tenant: config.CgrConfig().DefaultTenant,

2
general_tests/tutorial_kam_calls_test.go
View File

@@ -508,6 +508,7 @@ func TestTutKamCallsCdrs(t *testing.T) {
}
}
/*
// Make sure all stats queues were updated
func TestTutKamCallsCdrStatsAfter(t *testing.T) {
if !*testCalls {
@@ -557,6 +558,7 @@ func TestTutKamCallsCdrStatsAfter(t *testing.T) {
t.Errorf("Expecting: %v, received: %v", eMetrics, statMetrics)
}
}
*/
// Make sure account was debited properly
func TestTutKamCallsAccountFraud1001(t *testing.T) {

2
sessionmanager/fsevent.go
View File

@@ -386,7 +386,7 @@ func (fsev FSEvent) AsCallDescriptor() (*engine.CallDescriptor, error) {
Account: fsev.GetAccount(utils.META_DEFAULT),
Subject: fsev.GetSubject(utils.META_DEFAULT),
Destination: fsev.GetDestination(utils.META_DEFAULT),
StartTime: utils.FirstNonEmpty(fsev[SETUP_TIME], fsev[ANSWER_TIME]),
SetupTime: utils.FirstNonEmpty(fsev[SETUP_TIME], fsev[ANSWER_TIME]),
Duration: fsev[DURATION],
}
return lcrReq.AsCallDescriptor()

2
sessionmanager/kamevent.go
View File

@@ -381,7 +381,7 @@ func (kev KamEvent) AsCallDescriptor() (*engine.CallDescriptor, error) {
Account: kev.GetAccount(utils.META_DEFAULT),
Subject: kev.GetSubject(utils.META_DEFAULT),
Destination: kev.GetDestination(utils.META_DEFAULT),
StartTime: utils.FirstNonEmpty(kev[CGR_SETUPTIME], kev[CGR_ANSWERTIME]),
SetupTime: utils.FirstNonEmpty(kev[CGR_SETUPTIME], kev[CGR_ANSWERTIME]),
Duration: kev[CGR_DURATION],
}
return lcrReq.AsCallDescriptor()