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

When using ApierV2.SetActions consider Categories and TimingIDs for balance filter

Browse Source
This commit is contained in:
TeoV
2019-04-02 12:22:56 +03:00
committed by Dan Christian Bogos
parent 2f8cfaf5d7
commit dda0677c17
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apier/v2/apier.go
View File

@@ -297,6 +297,8 @@ func (self *ApierV2) SetActions(attrs utils.AttrSetActions, reply *string) error
DestinationIDs: utils.StringMapPointer(utils.ParseStringMap(apiAct.DestinationIds)),
RatingSubject: utils.StringPointer(apiAct.RatingSubject),
SharedGroups: utils.StringMapPointer(utils.ParseStringMap(apiAct.SharedGroups)),
Categories: utils.StringMapPointer(utils.ParseStringMap(apiAct.Categories)),
TimingIDs: utils.StringMapPointer(utils.ParseStringMap(apiAct.TimingTags)),
},
}
storeActions[idx] = a

38
apier/v2/apierv2_it_test.go
View File

@@ -311,6 +311,44 @@ func TestApierV2itSetAccountWithAP(t *testing.T) {
}
}
func TestApierV2itSetActionWithCategory(t *testing.T) {
var reply string
attrsSetAccount := &utils.AttrSetAccount{Tenant: "cgrates.org", Account: "TestApierV2itSetActionWithCategory"}
if err := apierRPC.Call("ApierV1.SetAccount", attrsSetAccount, &reply); err != nil {
t.Error("Got error on ApierV1.SetAccount: ", err.Error())
} else if reply != utils.OK {
t.Errorf("Calling ApierV1.SetAccount received: %s", reply)
}
argActs1 := utils.AttrSetActions{ActionsId: "TestApierV2itSetActionWithCategory_ACT",
Actions: []*utils.TPAction{
{Identifier: engine.TOPUP_RESET,
BalanceType: utils.MONETARY, Categories: "test", Units: "5.0", Weight: 20.0},
}}
if err := apierRPC.Call("ApierV2.SetActions", argActs1, &reply); err != nil {
t.Error(err)
}
attrsEA := &utils.AttrExecuteAction{Tenant: attrsSetAccount.Tenant, Account: attrsSetAccount.Account, ActionsId: argActs1.ActionsId}
if err := apierRPC.Call("ApierV1.ExecuteAction", attrsEA, &reply); err != nil {
t.Error("Got error on ApierV1.ExecuteAction: ", err.Error())
} else if reply != utils.OK {
t.Errorf("Calling ApierV1.ExecuteAction received: %s", reply)
}
var acnt engine.Account
if err := apierRPC.Call("ApierV2.GetAccount", &utils.AttrGetAccount{Tenant: "cgrates.org",
Account: "TestApierV2itSetActionWithCategory"}, &acnt); err != nil {
t.Error(err)
} else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MONETARY][0].Value != 5.0 {
t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MONETARY][0])
} else if len(acnt.BalanceMap[utils.MONETARY][0].Categories) != 1 &&
acnt.BalanceMap[utils.MONETARY][0].Categories["test"] != true {
t.Fatalf("Unexpected category received: %+v", utils.ToJSON(acnt))
}
}
func TestApierV2itKillEngine(t *testing.T) {
if err := engine.KillEngine(delay); err != nil {
t.Error(err)