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

Ignore factors equal to 1 when creating EventCost

Browse Source
This commit is contained in:
ionutboangiu
2024-04-01 11:59:40 +03:00
committed by Dan Christian Bogos
parent 6db11e87bc
commit 9c004b069d
4 changed files with 79 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/balances.go
View File

@@ -865,7 +865,7 @@ func (b *Balance) debit(cd *CallDescriptor, ub *Account, moneyBalances Balances,
// Compute the balance factor ahead of time. If the map is nil, or
// the factor is not found, it will default to 1.
bFactor := b.Factor.GetValue(cd.ExtraFields[utils.BalanceFactorID])
bFactor := b.Factors.GetValue(cd.ExtraFields[utils.BalanceFactorID])
if duration, err_ := utils.ParseZeroRatingSubject(tor, b.RatingSubject,
config.CgrConfig().RalsCfg().BalanceRatingSubject, isUnitBal); err_ == nil {

39
engine/eventcost.go
View File

@@ -99,11 +99,10 @@ func (ec *EventCost) newChargingIncrement(incr *Increment, rf RatingMatchedFilte
rateID = ec.ratingIDForRateInterval(incr.BalanceInfo.Monetary.RateInterval, rf, isPause)
}
bc := &BalanceCharge{
AccountID: incr.BalanceInfo.AccountID,
BalanceUUID: incr.BalanceInfo.Monetary.UUID,
Units: incr.Cost,
BalanceFactor: 1,
RatingID: rateID,
AccountID: incr.BalanceInfo.AccountID,
BalanceUUID: incr.BalanceInfo.Monetary.UUID,
Units: incr.Cost,
RatingID: rateID,
}
if isPause {
ecUUID = utils.MetaPause
@@ -119,10 +118,15 @@ func (ec *EventCost) newChargingIncrement(incr *Increment, rf RatingMatchedFilte
AccountID: incr.BalanceInfo.AccountID,
BalanceUUID: incr.BalanceInfo.Unit.UUID,
Units: incr.BalanceInfo.Unit.Consumed,
BalanceFactor: incr.BalanceInfo.Unit.Factor,
RatingID: rateID,
ExtraChargeID: ecUUID,
}
// Don't assign BalanceFactor unless it's different from 1.
if incr.BalanceInfo.Unit.Factor != 1 {
bc.BalanceFactor = incr.BalanceInfo.Unit.Factor
}
if isPause {
cIt.AccountingID = utils.MetaPause
ec.Accounting[utils.MetaPause] = bc
@@ -134,11 +138,10 @@ func (ec *EventCost) newChargingIncrement(incr *Increment, rf RatingMatchedFilte
rateID = ec.ratingIDForRateInterval(incr.BalanceInfo.Monetary.RateInterval, rf, isPause)
}
bc := &BalanceCharge{
AccountID: incr.BalanceInfo.AccountID,
BalanceUUID: incr.BalanceInfo.Monetary.UUID,
Units: incr.Cost,
BalanceFactor: 1,
RatingID: rateID,
AccountID: incr.BalanceInfo.AccountID,
BalanceUUID: incr.BalanceInfo.Monetary.UUID,
Units: incr.Cost,
RatingID: rateID,
}
if isPause {
cIt.AccountingID = utils.MetaPause
@@ -389,6 +392,9 @@ func (ec *EventCost) AsRefundIncrements(tor string) (cd *CallDescriptor) {
UUID: blncSmry.UUID,
Factor: blncCharge.BalanceFactor,
}
if blncCharge.BalanceFactor == 0 {
blncInfo.Unit.Factor = 1
}
}
if blncCharge.ExtraChargeID == utils.MetaNone ||
blncCharge.ExtraChargeID == utils.EmptyString {
@@ -405,6 +411,9 @@ func (ec *EventCost) AsRefundIncrements(tor string) (cd *CallDescriptor) {
UUID: extraSmry.UUID,
Factor: blncCharge.BalanceFactor,
}
if blncCharge.BalanceFactor == 0 {
blncInfo.Unit.Factor = 1
}
}
}
iIdx++
@@ -500,6 +509,14 @@ func (ec *EventCost) newIntervalFromCharge(cInc *ChargingIncrement) (incr *Incre
Consumed: cBC.Units,
Factor: cBC.BalanceFactor,
}
// EventCost's BalanceFactor is changed to 0 when it's 1
// to be omitted from the json object. Ensure that the
// real value is assigned to the Factor inside UnitInfo.
if cBC.BalanceFactor == 0 {
incr.BalanceInfo.Unit.Factor = 1
}
incr.BalanceInfo.Unit.RateInterval = ec.rateIntervalForRatingID(cBC.RatingID)
if cBC.ExtraChargeID != utils.MetaNone {
cBC = ec.Accounting[cBC.ExtraChargeID] // overwrite original balance so we can process it in one place

105
engine/eventcost_test.go
View File

@@ -168,36 +168,31 @@ var testEC = &EventCost{
},
Accounting: Accounting{
"a012888": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.01,
BalanceFactor: 1,
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.01,
},
"188bfa6": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.005,
BalanceFactor: 1,
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.005,
},
"9bdad10": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.1,
BalanceFactor: 1,
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.1,
},
"44d6c02": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "4b8b53d7-c1a1-4159-b845-4623a00a0165",
RatingID: "3cd6425",
Units: 1,
BalanceFactor: 1,
ExtraChargeID: "188bfa6",
},
"3455b83": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "4b8b53d7-c1a1-4159-b845-4623a00a0165",
Units: 1,
BalanceFactor: 1,
ExtraChargeID: "*none",
},
},
@@ -586,36 +581,31 @@ func TestNewEventCostFromCallCost(t *testing.T) {
},
Accounting: Accounting{
"c890a899-df43-497a-9979-38492713f57b": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.01,
BalanceFactor: 1,
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.01,
},
"a894f8f1-206a-4457-99ce-df21a0c7fedc": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.005,
BalanceFactor: 1,
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.005,
},
"44e97dec-8a7e-43d0-8b0a-736d46b5613e": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.1,
BalanceFactor: 1,
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.1,
},
"906bfd0f-035c-40a3-93a8-46f71627983e": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "7a54a9e9-d610-4c82-bcb5-a315b9a65010",
RatingID: "4607d907-02c3-4f2b-bc08-95a0dcc7222c",
Units: 1,
BalanceFactor: 1,
ExtraChargeID: "a894f8f1-206a-4457-99ce-df21a0c7fedc",
},
"a555cde8-4bd0-408a-afbc-c3ba64888927": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "9d54a9e9-d610-4c82-bcb5-a315b9a65089",
Units: 1,
BalanceFactor: 1,
ExtraChargeID: "*none",
},
"44e97dec-8a7e-43d0-8b0a-e34a152": &BalanceCharge{
@@ -623,7 +613,6 @@ func TestNewEventCostFromCallCost(t *testing.T) {
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
RatingID: "*rounding",
Units: -0.1,
BalanceFactor: 1,
ExtraChargeID: "",
},
},
@@ -1242,7 +1231,8 @@ func TestECAsCallCost(t *testing.T) {
BalanceInfo: &DebitInfo{
Unit: &UnitInfo{
UUID: "9d54a9e9-d610-4c82-bcb5-a315b9a65089",
Consumed: 1.0,
Consumed: 1,
Factor: 1,
},
AccountID: "cgrates.org:dan",
},
@@ -1254,7 +1244,8 @@ func TestECAsCallCost(t *testing.T) {
BalanceInfo: &DebitInfo{
Unit: &UnitInfo{ // Minutes with special price
UUID: "7a54a9e9-d610-4c82-bcb5-a315b9a65010",
Consumed: 1.0,
Consumed: 1,
Factor: 1,
RateInterval: &RateInterval{
Timing: &RITiming{
ID: "27f1e5f8-05bb-4f1c-a596-bf1010ad296c",
@@ -2469,24 +2460,21 @@ func TestECSyncKeys(t *testing.T) {
},
Accounting: Accounting{
"2012888": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.01,
BalanceFactor: 1,
RatingID: "21a5ab9",
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.01,
RatingID: "21a5ab9",
},
"288bfa6": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.005,
BalanceFactor: 1,
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.005,
},
"24d6c02": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "7a54a9e9-d610-4c82-bcb5-a315b9a65010",
RatingID: "3cd6425",
Units: 1,
BalanceFactor: 1,
ExtraChargeID: "288bfa6",
},
},
@@ -2654,37 +2642,32 @@ func TestECSyncKeys(t *testing.T) {
},
Accounting: Accounting{
"2012888": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.01,
BalanceFactor: 1,
RatingID: "21a5ab9",
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.01,
RatingID: "21a5ab9",
},
"288bfa6": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
BalanceFactor: 1,
Units: 0.005,
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.005,
},
"9bdad10": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
BalanceFactor: 1,
Units: 0.1,
AccountID: "cgrates.org:dan",
BalanceUUID: "8c54a9e9-d610-4c82-bcb5-a315b9a65010",
Units: 0.1,
},
"44d6c02": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "4b8b53d7-c1a1-4159-b845-4623a00a0165",
RatingID: "3cd6425",
Units: 1,
BalanceFactor: 1,
ExtraChargeID: "288bfa6",
},
"3455b83": &BalanceCharge{
AccountID: "cgrates.org:dan",
BalanceUUID: "4b8b53d7-c1a1-4159-b845-4623a00a0165",
Units: 1,
BalanceFactor: 1,
ExtraChargeID: "*none",
},
},
@@ -4264,9 +4247,7 @@ func TestECnewChargingIncrementNoUnitInfo(t *testing.T) {
}
expEC := &EventCost{
Accounting: Accounting{
utils.MetaPause: &BalanceCharge{
BalanceFactor: 1,
},
utils.MetaPause: &BalanceCharge{},
},
}
rcv := ec.newChargingIncrement(incr, rf, false, true)
@@ -4366,7 +4347,8 @@ func TestECAsRefundIncrements2(t *testing.T) {
Cost: 5,
BalanceInfo: &DebitInfo{
Unit: &UnitInfo{
UUID: "extraBcUUID",
UUID: "extraBcUUID",
Factor: 1,
},
AccountID: "bcAccID",
},
@@ -4651,7 +4633,8 @@ func TestECnewIntervalFromCharge(t *testing.T) {
BalanceInfo: &DebitInfo{
AccountID: "1001",
Unit: &UnitInfo{
UUID: "asdfgh1",
UUID: "asdfgh1",
Factor: 1,
RateInterval: &RateInterval{
Rating: &RIRate{
RoundingDecimals: 4,

9
engine/libeventcost.go
View File

@@ -191,7 +191,7 @@ type BalanceCharge struct {
BalanceUUID string // balance charged
RatingID string // special price applied on this balance
Units float64 // number of units charged
BalanceFactor float64 // calculation multiplier for units; always 1 for *monetary balances
BalanceFactor float64 `json:",omitempty"` // calculation multiplier for units
ExtraChargeID string // used in cases when paying *voice with *monetary
}
@@ -212,6 +212,10 @@ func (bc *BalanceCharge) FieldAsInterface(fldPath []string) (val any, err error)
case utils.Units:
return bc.Units, nil
case utils.BalanceFactor:
if bc.BalanceFactor == 0 {
// If 0, return the real default value.
return 1.0, nil
}
return bc.BalanceFactor, nil
case utils.ExtraChargeID:
return bc.ExtraChargeID, nil
@@ -667,8 +671,7 @@ func NewFreeEventCost(cgrID, runID, account string, tStart time.Time, usage time
utils.MetaPause: {
AccountID: account,
// BalanceUUID: "",
RatingID: utils.MetaPause,
BalanceFactor: 1,
RatingID: utils.MetaPause,
},
},
RatingFilters: RatingFilters{