uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-24 16:48:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

full supplier key

Browse Source
This commit is contained in:
Radu Ioan Fericean
2015-04-10 10:24:33 +03:00
parent e6d92e7d70
commit ed72e1a296
2 changed files with 41 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
engine/calldesc.go
View File

@@ -704,32 +704,26 @@ func (cd *CallDescriptor) GetLCR(stats StatsInterface) (*LCRCost, error) {
for _, supplier := range lcrCost.Entry.GetParams() {
lcrCD := cd.Clone()
lcrCD.Subject = supplier
var cc *CallCost
var err error
if cd.account, err = accountingStorage.GetAccount(cd.GetAccountKey()); err == nil {
if cc, err := lcrCD.debit(cd.account, true, true); err != nil || cc == nil {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Error: err,
})
} else {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Cost: cc.Cost,
Duration: cc.GetDuration(),
})
}
cc, err = lcrCD.debit(cd.account, true, true)
} else {
if cc, err := lcrCD.GetCost(); err != nil || cc == nil {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Error: err,
})
} else {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Cost: cc.Cost,
Duration: cc.GetDuration(),
})
}
cc, err = lcrCD.GetCost()
}
supplier = utils.ConcatenatedKey(cd.Direction, cd.Tenant, cd.Category, supplier)
if err != nil || cc == nil {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Error: err,
})
} else {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Cost: cc.Cost,
Duration: cc.GetDuration(),
})
}
}
} else {
@@ -797,42 +791,30 @@ func (cd *CallDescriptor) GetLCR(stats StatsInterface) (*LCRCost, error) {
}
}
}
var cc *CallCost
var err error
if cd.account, err = accountingStorage.GetAccount(cd.GetAccountKey()); err == nil {
if cc, err := lcrCD.debit(cd.account, true, true); err != nil || cc == nil {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Error: err,
})
} else {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Cost: cc.Cost,
Duration: cc.GetDuration(),
QOS: map[string]float64{
"ASR": asr,
"ACD": acd,
},
qosSortParams: qosSortParams,
})
}
cc, err = lcrCD.debit(cd.account, true, true)
} else {
if cc, err := lcrCD.GetCost(); err != nil || cc == nil {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Error: err,
})
} else {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Cost: cc.Cost,
Duration: cc.GetDuration(),
QOS: map[string]float64{
"ASR": asr,
"ACD": acd,
},
qosSortParams: qosSortParams,
})
}
cc, err = lcrCD.GetCost()
}
supplier = utils.ConcatenatedKey(cd.Direction, cd.Tenant, cd.Category, supplier)
if err != nil || cc == nil {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Error: err,
})
} else {
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, &LCRSupplierCost{
Supplier: supplier,
Cost: cc.Cost,
Duration: cc.GetDuration(),
QOS: map[string]float64{
"ASR": asr,
"ACD": acd,
},
qosSortParams: qosSortParams,
})
}
}
// sort according to strategy

2
engine/responder_test.go
View File

@@ -302,6 +302,6 @@ func TestGetLCRStatic(t *testing.T) {
if err := rsponder.GetLCR(cd, &lcr); err != nil {
t.Error(err)
} else if reflect.DeepEqual(eLcr, lcr) {
t.Errorf("Received: %+v", lcr)
t.Errorf("Received: %+v", lcr.SupplierCosts[1])
}
}