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

before switching to MINUTES+OUTBOUND

Browse Source
This commit is contained in:
Radu Ioan Fericean
2013-09-05 20:17:14 +03:00
parent 931c6efb1a
commit f3f9d03c80
8 changed files with 61 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/action.go
View File

@@ -35,9 +35,9 @@ type Action struct {
ExpirationString string
Weight float64
Balance *Balance
DestinationTag, RateType string // From here for import/load purposes only
ExpirationDate time.Time
Units, RateValue, MinutesWeight float64
destinationTag, rateType string // From here for import/load purposes only
expirationDate time.Time
units, rateValue, minutesWeight float64
}
const (

27
engine/actions_test.go
View File

@@ -605,8 +605,9 @@ func TestActionResetPrepaid(t *testing.T) {
if ub.Type != UB_TYPE_PREPAID ||
ub.BalanceMap[CREDIT].GetTotalValue() != 0 ||
len(ub.UnitCounters) != 0 ||
len(ub.BalanceMap[MINUTES]) != 0 ||
ub.BalanceMap[MINUTES][0].Value != 0 ||
ub.ActionTriggers[0].Executed == true || ub.ActionTriggers[1].Executed == true {
t.Log(ub.BalanceMap)
t.Error("Reset prepaid action failed!")
}
}
@@ -623,7 +624,7 @@ func TestActionResetPostpaid(t *testing.T) {
if ub.Type != UB_TYPE_POSTPAID ||
ub.BalanceMap[CREDIT].GetTotalValue() != 0 ||
len(ub.UnitCounters) != 0 ||
len(ub.BalanceMap[MINUTES]) != 0 ||
ub.BalanceMap[MINUTES][0].Value != 0 ||
ub.ActionTriggers[0].Executed == true || ub.ActionTriggers[1].Executed == true {
t.Error("Reset postpaid action failed!")
}
@@ -637,7 +638,7 @@ func TestActionTopupResetCredit(t *testing.T) {
UnitCounters: []*UnitsCounter{&UnitsCounter{BalanceId: CREDIT, Direction: OUTBOUND, Units: 1}},
ActionTriggers: ActionTriggerPriotityList{&ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 2, ActionsId: "TEST_ACTIONS", Executed: true}, &ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 2, ActionsId: "TEST_ACTIONS", Executed: true}},
}
a := &Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 10}
a := &Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}}
topupResetAction(ub, a)
if ub.Type != UB_TYPE_PREPAID ||
ub.BalanceMap[CREDIT+OUTBOUND].GetTotalValue() != 10 ||
@@ -650,9 +651,11 @@ func TestActionTopupResetCredit(t *testing.T) {
func TestActionTopupResetMinutes(t *testing.T) {
ub := &UserBalance{
Id: "TEST_UB",
Type: UB_TYPE_PREPAID,
BalanceMap: map[string]BalanceChain{CREDIT + OUTBOUND: BalanceChain{&Balance{Value: 100}}, MINUTES: BalanceChain{&Balance{Value: 10, Weight: 20, SpecialPrice: 1, DestinationId: "NAT"}, &Balance{Weight: 10, SpecialPrice: 10, SpecialPriceType: PRICE_ABSOLUTE, DestinationId: "RET"}}},
Id: "TEST_UB",
Type: UB_TYPE_PREPAID,
BalanceMap: map[string]BalanceChain{
CREDIT + OUTBOUND: BalanceChain{&Balance{Value: 100}},
MINUTES: BalanceChain{&Balance{Value: 10, Weight: 20, SpecialPrice: 1, DestinationId: "NAT"}, &Balance{Weight: 10, SpecialPrice: 10, SpecialPriceType: PRICE_ABSOLUTE, DestinationId: "RET"}}},
UnitCounters: []*UnitsCounter{&UnitsCounter{BalanceId: CREDIT, Direction: OUTBOUND, Units: 1}},
ActionTriggers: ActionTriggerPriotityList{&ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 2, ActionsId: "TEST_ACTIONS", Executed: true}, &ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 2, ActionsId: "TEST_ACTIONS", Executed: true}},
}
@@ -664,7 +667,7 @@ func TestActionTopupResetMinutes(t *testing.T) {
len(ub.UnitCounters) != 1 ||
len(ub.BalanceMap[MINUTES]) != 1 ||
ub.ActionTriggers[0].Executed != true || ub.ActionTriggers[1].Executed != true {
t.Error("Topup reset minutes action failed!", ub.BalanceMap[MINUTES][0])
t.Errorf("Topup reset minutes action failed: %v", ub.BalanceMap)
}
}
@@ -676,7 +679,7 @@ func TestActionTopupCredit(t *testing.T) {
UnitCounters: []*UnitsCounter{&UnitsCounter{BalanceId: CREDIT, Direction: OUTBOUND, Units: 1}},
ActionTriggers: ActionTriggerPriotityList{&ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 2, ActionsId: "TEST_ACTIONS", Executed: true}, &ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 2, ActionsId: "TEST_ACTIONS", Executed: true}},
}
a := &Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 10}
a := &Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}}
topupAction(ub, a)
if ub.Type != UB_TYPE_PREPAID ||
ub.BalanceMap[CREDIT+OUTBOUND].GetTotalValue() != 110 ||
@@ -715,7 +718,7 @@ func TestActionDebitCredit(t *testing.T) {
UnitCounters: []*UnitsCounter{&UnitsCounter{BalanceId: CREDIT, Direction: OUTBOUND, Units: 1}},
ActionTriggers: ActionTriggerPriotityList{&ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 2, ActionsId: "TEST_ACTIONS", Executed: true}, &ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 2, ActionsId: "TEST_ACTIONS", Executed: true}},
}
a := &Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 10}
a := &Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}}
debitAction(ub, a)
if ub.Type != UB_TYPE_PREPAID ||
ub.BalanceMap[CREDIT+OUTBOUND].GetTotalValue() != 90 ||
@@ -889,13 +892,13 @@ func TestActionTimingLogging(t *testing.T) {
}
func TestActionMakeNegative(t *testing.T) {
a := &Action{Units: 10}
a := &Action{Balance: &Balance{Value: 10}}
genericMakeNegative(a)
if a.Units > 0 {
if a.Balance.Value > 0 {
t.Error("Failed to make negative: ", a)
}
genericMakeNegative(a)
if a.Units > 0 {
if a.Balance.Value > 0 {
t.Error("Failed to preserve negative: ", a)
}
}

15
engine/balances.go
View File

@@ -40,7 +40,7 @@ type Balance struct {
func (b *Balance) Equal(o *Balance) bool {
return b.ExpirationDate.Equal(o.ExpirationDate) &&
b.Weight == o.Weight &&
b.SpecialPrice == b.SpecialPrice &&
b.SpecialPrice == o.SpecialPrice &&
b.DestinationId == o.DestinationId
}
@@ -50,12 +50,13 @@ func (b *Balance) IsExpired() bool {
func (b *Balance) Clone() *Balance {
return &Balance{
Id: b.Id,
Value: b.Value,
SpecialPrice: b.SpecialPrice,
DestinationId: b.DestinationId,
ExpirationDate: b.ExpirationDate,
Weight: b.Weight,
Id: b.Id,
Value: b.Value,
SpecialPrice: b.SpecialPrice,
SpecialPriceType: b.SpecialPriceType,
DestinationId: b.DestinationId,
ExpirationDate: b.ExpirationDate,
Weight: b.Weight,
}
}

14
engine/minute_buckets_test.go → engine/balances_test.go
View File

@@ -23,7 +23,7 @@ import (
"testing"
)
func TestMinutBucketSortWeight(t *testing.T) {
func TestBalanceSortWeight(t *testing.T) {
mb1 := &Balance{Weight: 1, precision: 2, SpecialPrice: 2}
mb2 := &Balance{Weight: 2, precision: 1, SpecialPrice: 1}
var bs BalanceChain
@@ -34,7 +34,7 @@ func TestMinutBucketSortWeight(t *testing.T) {
}
}
func TestMinutBucketSortPrecision(t *testing.T) {
func TestBalanceSortPrecision(t *testing.T) {
mb1 := &Balance{Weight: 1, precision: 2, SpecialPrice: 2}
mb2 := &Balance{Weight: 1, precision: 1, SpecialPrice: 1}
var bs BalanceChain
@@ -45,7 +45,7 @@ func TestMinutBucketSortPrecision(t *testing.T) {
}
}
func TestMinutBucketSortSpecialPrice(t *testing.T) {
func TestBalanceSortSpecialPrice(t *testing.T) {
mb1 := &Balance{Weight: 1, precision: 1, SpecialPrice: 1}
mb2 := &Balance{Weight: 1, precision: 1, SpecialPrice: 2}
var bs BalanceChain
@@ -56,19 +56,19 @@ func TestMinutBucketSortSpecialPrice(t *testing.T) {
}
}
func TestMinutBucketEqual(t *testing.T) {
func TestBalanceEqual(t *testing.T) {
mb1 := &Balance{Weight: 1, precision: 1, SpecialPrice: 1, SpecialPriceType: PRICE_ABSOLUTE, DestinationId: ""}
mb2 := &Balance{Weight: 1, precision: 1, SpecialPrice: 1, SpecialPriceType: PRICE_ABSOLUTE, DestinationId: ""}
mb3 := &Balance{Weight: 1, precision: 1, SpecialPrice: 2, SpecialPriceType: PRICE_ABSOLUTE, DestinationId: ""}
if !mb1.Equal(mb2) || mb2.Equal(mb3) {
t.Error("Equal failure!", mb1, mb2, mb3)
t.Error("Equal failure!", mb1 == mb2, mb3)
}
}
func TestMinutBucketClone(t *testing.T) {
func TestBalanceClone(t *testing.T) {
mb1 := &Balance{Value: 1, Weight: 2, SpecialPrice: 3, SpecialPriceType: PRICE_ABSOLUTE, DestinationId: "5"}
mb2 := mb1.Clone()
if mb1 == mb2 || !reflect.DeepEqual(mb1, mb2) {
t.Error("Cloning failure: ", mb1, mb2)
t.Errorf("Cloning failure: \n%v\n%v", mb1, mb2)
}
}

2
engine/storage_sql.go
View File

@@ -541,7 +541,7 @@ func (self *SQLStorage) SetTPActions(tpid string, acts map[string][]*Action) err
}
qry += fmt.Sprintf("('%s','%s','%s','%s','%s',%f,'%s','%s','%s',%f,%f,%f)",
tpid, actId, act.ActionType, act.BalanceId, act.Direction, act.Balance.Value, act.ExpirationString,
act.DestinationTag, act.RateType, act.RateValue, act.MinutesWeight, act.Weight)
act.destinationTag, act.rateType, act.rateValue, act.minutesWeight, act.Weight)
i++
}
}

12
engine/tpimporter_csv.go
View File

@@ -317,12 +317,12 @@ func (self *TPCSVImporter) importActions(fn string) error {
ActionType: actionType,
BalanceId: balanceType,
Direction: direction,
Units: units,
ExpirationDate: expiryTime,
DestinationTag: destTag,
RateType: rateType,
RateValue: rateValue,
MinutesWeight: minutesWeight,
units: units,
expirationDate: expiryTime,
destinationTag: destTag,
rateType: rateType,
rateValue: rateValue,
minutesWeight: minutesWeight,
Weight: weight,
}
if err := self.StorDb.SetTPActions(self.TPid, map[string][]*Action{actId: []*Action{act}}); err != nil {

14
engine/userbalance.go
View File

@@ -182,23 +182,21 @@ func (ub *UserBalance) debitMinutesBalance(amount float64, prefix string, count
// Debits some amount of user's specified balance adding the balance if it does not exists.
// Returns the remaining credit in user's balance.
func (ub *UserBalance) debitBalanceAction(a *Action) float64 {
newBalance := &Balance{
Id: utils.GenUUID(),
ExpirationDate: a.ExpirationDate,
}
newBalance := &Balance{Id: utils.GenUUID()}
if a.Balance != nil {
newBalance.ExpirationDate = a.Balance.ExpirationDate
newBalance.Weight = a.Balance.Weight
}
found := false
id := a.BalanceId + a.Direction
for _, b := range ub.BalanceMap[id] {
if b.Equal(newBalance) {
b.Value -= a.Units
b.Value -= a.Balance.Value
found = true
}
}
if !found {
newBalance.Value -= a.Units
newBalance.Value -= a.Balance.Value
ub.BalanceMap[id] = append(ub.BalanceMap[id], newBalance)
}
return ub.BalanceMap[a.BalanceId+OUTBOUND].GetTotalValue()
@@ -209,7 +207,7 @@ Debits some amount of user's specified balance. Returns the remaining credit in
*/
func (ub *UserBalance) debitBalance(balanceId string, amount float64, count bool) float64 {
if count {
ub.countUnits(&Action{BalanceId: balanceId, Direction: OUTBOUND, Units: amount})
ub.countUnits(&Action{BalanceId: balanceId, Direction: OUTBOUND, Balance: &Balance{Value: amount}})
}
ub.BalanceMap[balanceId+OUTBOUND].Debit(amount)
return ub.BalanceMap[balanceId+OUTBOUND].GetTotalValue()
@@ -335,7 +333,7 @@ func (ub *UserBalance) countUnits(a *Action) {
if a.BalanceId == MINUTES && a.Balance != nil {
unitsCounter.addMinutes(a.Balance.Value, a.Balance.DestinationId)
} else {
unitsCounter.Units += a.Units
unitsCounter.Units += a.Balance.Value
}
ub.executeActionTriggers(nil)
}

30
engine/userbalance_test.go
View File

@@ -34,12 +34,12 @@ func init() {
func populateTestActionsForTriggers() {
ats := []*Action{
&Action{ActionType: "*topup", BalanceId: CREDIT, Direction: OUTBOUND, Units: 10},
&Action{ActionType: "*topup", BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}},
&Action{ActionType: "*topup", BalanceId: MINUTES, Direction: OUTBOUND, Balance: &Balance{Weight: 20, SpecialPrice: 1, Value: 10, DestinationId: "NAT"}},
}
storageGetter.SetActions("TEST_ACTIONS", ats)
ats1 := []*Action{
&Action{ActionType: "*topup", BalanceId: CREDIT, Direction: OUTBOUND, Units: 10, Weight: 20},
&Action{ActionType: "*topup", BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}, Weight: 20},
&Action{ActionType: "*reset_prepaid", Weight: 10},
}
storageGetter.SetActions("TEST_ACTIONS_ORDER", ats1)
@@ -402,18 +402,18 @@ func TestUserBalanceExecuteTriggeredActions(t *testing.T) {
UnitCounters: []*UnitsCounter{&UnitsCounter{BalanceId: CREDIT, Direction: OUTBOUND, Units: 1}},
ActionTriggers: ActionTriggerPriotityList{&ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 2, ThresholdType: TRIGGER_MAX_COUNTER, ActionsId: "TEST_ACTIONS"}},
}
ub.countUnits(&Action{BalanceId: CREDIT, Units: 1})
ub.countUnits(&Action{BalanceId: CREDIT, Balance: &Balance{Value: 1}})
if ub.BalanceMap[CREDIT+OUTBOUND][0].Value != 110 || ub.BalanceMap[MINUTES][0].Value != 20 {
t.Error("Error executing triggered actions", ub.BalanceMap[CREDIT+OUTBOUND][0].Value, ub.BalanceMap[MINUTES][0].Value)
}
// are set to executed
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 1})
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 1}})
if ub.BalanceMap[CREDIT+OUTBOUND][0].Value != 110 || ub.BalanceMap[MINUTES][0].Value != 20 {
t.Error("Error executing triggered actions", ub.BalanceMap[CREDIT+OUTBOUND][0].Value, ub.BalanceMap[MINUTES][0].Value)
}
// we can reset them
ub.resetActionTriggers(nil)
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 1})
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}})
if ub.BalanceMap[CREDIT+OUTBOUND][0].Value != 120 || ub.BalanceMap[MINUTES][0].Value != 30 {
t.Error("Error executing triggered actions", ub.BalanceMap[CREDIT+OUTBOUND][0].Value, ub.BalanceMap[MINUTES][0].Value)
}
@@ -426,7 +426,7 @@ func TestUserBalanceExecuteTriggeredActionsBalance(t *testing.T) {
UnitCounters: []*UnitsCounter{&UnitsCounter{BalanceId: CREDIT, Direction: OUTBOUND, Units: 1}},
ActionTriggers: ActionTriggerPriotityList{&ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 100, ThresholdType: TRIGGER_MIN_COUNTER, ActionsId: "TEST_ACTIONS"}},
}
ub.countUnits(&Action{BalanceId: CREDIT, Units: 1})
ub.countUnits(&Action{BalanceId: CREDIT, Balance: &Balance{Value: 1}})
if ub.BalanceMap[CREDIT+OUTBOUND][0].Value != 110 || ub.BalanceMap[MINUTES][0].Value != 20 {
t.Error("Error executing triggered actions", ub.BalanceMap[CREDIT+OUTBOUND][0].Value, ub.BalanceMap[MINUTES][0].Value)
}
@@ -439,7 +439,7 @@ func TestUserBalanceExecuteTriggeredActionsOrder(t *testing.T) {
UnitCounters: []*UnitsCounter{&UnitsCounter{BalanceId: CREDIT, Direction: OUTBOUND, Units: 1}},
ActionTriggers: ActionTriggerPriotityList{&ActionTrigger{BalanceId: CREDIT, Direction: OUTBOUND, ThresholdValue: 2, ThresholdType: TRIGGER_MAX_COUNTER, ActionsId: "TEST_ACTIONS_ORDER"}},
}
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 1})
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 1}})
if len(ub.BalanceMap[CREDIT+OUTBOUND]) != 1 || ub.BalanceMap[CREDIT+OUTBOUND][0].Value != 10 {
t.Error("Error executing triggered actions in order", ub.BalanceMap[CREDIT+OUTBOUND])
}
@@ -467,11 +467,11 @@ func TestCleanExpired(t *testing.T) {
func TestUserBalanceUnitCounting(t *testing.T) {
ub := &UserBalance{}
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 10})
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}})
if len(ub.UnitCounters) != 1 && ub.UnitCounters[0].BalanceId != CREDIT || ub.UnitCounters[0].Units != 10 {
t.Error("Error counting units")
}
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 10})
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}})
if len(ub.UnitCounters) != 1 && ub.UnitCounters[0].BalanceId != CREDIT || ub.UnitCounters[0].Units != 20 {
t.Error("Error counting units")
}
@@ -479,15 +479,15 @@ func TestUserBalanceUnitCounting(t *testing.T) {
func TestUserBalanceUnitCountingOutbound(t *testing.T) {
ub := &UserBalance{}
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 10})
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}})
if len(ub.UnitCounters) != 1 && ub.UnitCounters[0].BalanceId != CREDIT || ub.UnitCounters[0].Units != 10 {
t.Error("Error counting units")
}
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 10})
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}})
if len(ub.UnitCounters) != 1 && ub.UnitCounters[0].BalanceId != CREDIT || ub.UnitCounters[0].Units != 20 {
t.Error("Error counting units")
}
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 10})
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}})
if len(ub.UnitCounters) != 1 && ub.UnitCounters[0].BalanceId != CREDIT || ub.UnitCounters[0].Units != 30 {
t.Error("Error counting units")
}
@@ -495,15 +495,15 @@ func TestUserBalanceUnitCountingOutbound(t *testing.T) {
func TestUserBalanceUnitCountingOutboundInbound(t *testing.T) {
ub := &UserBalance{}
ub.countUnits(&Action{BalanceId: CREDIT, Units: 10})
ub.countUnits(&Action{BalanceId: CREDIT, Balance: &Balance{Value: 10}})
if len(ub.UnitCounters) != 1 && ub.UnitCounters[0].BalanceId != CREDIT || ub.UnitCounters[0].Units != 10 {
t.Error("Error counting units")
}
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Units: 10})
ub.countUnits(&Action{BalanceId: CREDIT, Direction: OUTBOUND, Balance: &Balance{Value: 10}})
if len(ub.UnitCounters) != 1 && ub.UnitCounters[0].BalanceId != CREDIT || ub.UnitCounters[0].Units != 20 {
t.Error("Error counting units")
}
ub.countUnits(&Action{BalanceId: CREDIT, Direction: INBOUND, Units: 10})
ub.countUnits(&Action{BalanceId: CREDIT, Direction: INBOUND, Balance: &Balance{Value: 10}})
if len(ub.UnitCounters) != 2 && ub.UnitCounters[1].BalanceId != CREDIT || ub.UnitCounters[0].Units != 20 || ub.UnitCounters[1].Units != 10 {
t.Error("Error counting units")
}