From efc924014246dd0e0e039ea873db212630a19a31 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 18 Apr 2014 23:04:14 +0300 Subject: [PATCH] removed BalanceType from AttrGetAccount --- apier/apier.go | 7 ++-- apier/apier_local_test.go | 26 ++++++------ apier/tutfscsv_local_test.go | 16 +++---- apier/tutfsjson_local_test.go | 78 +++++++++++++++++------------------ 4 files changed, 63 insertions(+), 64 deletions(-) diff --git a/apier/apier.go b/apier/apier.go index 03ac21319..848f5a7d1 100644 --- a/apier/apier.go +++ b/apier/apier.go @@ -65,10 +65,9 @@ func (self *ApierV1) GetRatingPlan(rplnId string, reply *engine.RatingPlan) erro } type AttrGetAccount struct { - Tenant string - Account string - BalanceType string - Direction string + Tenant string + Account string + Direction string } // Get balance diff --git a/apier/apier_local_test.go b/apier/apier_local_test.go index 8bc4d6ad4..4410c316f 100644 --- a/apier/apier_local_test.go +++ b/apier/apier_local_test.go @@ -1162,35 +1162,35 @@ func TestApierGetAccount(t *testing.T) { return } var reply *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 11.5 { // We expect 11.5 since we have added in the previous test 1.5 + } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 11.5 { // We expect 11.5 since we have added in the previous test 1.5 t.Errorf("Calling ApierV1.GetBalance expected: 11.5, received: %f", reply) } - attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan", BalanceType: "*monetary", Direction: "*out"} + attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 1.5 { + } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 1.5 { t.Errorf("Calling ApierV1.GetAccount expected: 1.5, received: %f", reply) } // The one we have topped up though executeAction - attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan2", BalanceType: "*monetary", Direction: "*out"} + attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan2", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 10 { + } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 10 { t.Errorf("Calling ApierV1.GetAccount expected: 10, received: %f", reply) } - attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan3", BalanceType: "*monetary", Direction: "*out"} + attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan3", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 3.6 { + } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 3.6 { t.Errorf("Calling ApierV1.GetAccount expected: 3.6, received: %f", reply) } - attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan6", BalanceType: "*monetary", Direction: "*out"} + attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan6", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 1 { + } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 1 { t.Errorf("Calling ApierV1.GetAccount expected: 1, received: %f", reply) } } @@ -1262,11 +1262,11 @@ func TestApierGetAccountAfterLoad(t *testing.T) { return } var reply *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 11 { - t.Errorf("Calling ApierV1.GetBalance expected: 11, received: %f", reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 11 { + t.Errorf("Calling ApierV1.GetBalance expected: 11, received: %f", reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue()) } } diff --git a/apier/tutfscsv_local_test.go b/apier/tutfscsv_local_test.go index a3b066b5a..1205b38e4 100644 --- a/apier/tutfscsv_local_test.go +++ b/apier/tutfscsv_local_test.go @@ -182,11 +182,11 @@ func TestFsCsvGetAccount(t *testing.T) { return } var reply *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 10.0 { // We expect 11.5 since we have added in the previous test 1.5 - t.Errorf("Calling ApierV1.GetBalance expected: 10.0, received: %f", reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 10.0 { // We expect 11.5 since we have added in the previous test 1.5 + t.Errorf("Calling ApierV1.GetBalance expected: 10.0, received: %f", reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue()) } } @@ -222,11 +222,11 @@ func TestFsCsvCall1(t *testing.T) { } // Make sure the account was debited correctly for the first loop index (ConnectFee included) var reply *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 9.4 { // We expect 11.5 since we have added in the previous test 1.5 - t.Errorf("Calling ApierV1.GetAccount expected: 9.4, received: %f", reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 9.4 { // We expect 11.5 since we have added in the previous test 1.5 + t.Errorf("Calling ApierV1.GetAccount expected: 9.4, received: %f", reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue()) } else if len(reply.UnitCounters) != 1 || utils.Round(reply.UnitCounters[0].Balances[0].Value, 2, utils.ROUNDING_MIDDLE) != 0.6 { // Make sure we correctly count usage t.Errorf("Received unexpected UnitCounters: %v", reply.UnitCounters) @@ -253,8 +253,8 @@ func TestFsCsvCall1(t *testing.T) { var reply2 *engine.Account if err := rater.Call("ApierV1.GetAccount", attrs, &reply2); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if utils.Round(reply2.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue(), 2, utils.ROUNDING_MIDDLE) != 9.20 { - t.Errorf("Calling ApierV1.GetAccount expected: 9.2, received: %f", reply2.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + } else if utils.Round(reply2.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue(), 2, utils.ROUNDING_MIDDLE) != 9.20 { + t.Errorf("Calling ApierV1.GetAccount expected: 9.2, received: %f", reply2.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue()) } else if len(reply2.UnitCounters) != 1 || utils.Round(reply2.UnitCounters[0].Balances[0].Value, 2, utils.ROUNDING_MIDDLE) != 0.8 { // Make sure we correctly count usage t.Errorf("Received unexpected UnitCounters: %v", reply2.UnitCounters) diff --git a/apier/tutfsjson_local_test.go b/apier/tutfsjson_local_test.go index 8de50a86d..d5346ba9b 100644 --- a/apier/tutfsjson_local_test.go +++ b/apier/tutfsjson_local_test.go @@ -185,17 +185,17 @@ func TestFsJsonGetAccount1001(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } - if acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 10.0 { - t.Errorf("Calling ApierV1.GetBalance expected: 10.0, received: %f", acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + if acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 10.0 { + t.Errorf("Calling ApierV1.GetBalance expected: 10.0, received: %f", acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue()) } - if len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction]) != 2 { - t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction])) + if len(acnt.BalanceMap[engine.CREDIT+attrs.Direction]) != 2 { + t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[engine.CREDIT+attrs.Direction])) } - blncLst := acnt.BalanceMap[attrs.BalanceType+attrs.Direction] + blncLst := acnt.BalanceMap[engine.CREDIT+attrs.Direction] for _, blnc := range blncLst { if len(blnc.SharedGroup) == 0 && blnc.Value != 5 { t.Errorf("Unexpected value for general balance: %f", blnc.Value) @@ -210,17 +210,17 @@ func TestFsJsonGetAccount1002(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1002", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1002", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } - if acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 10.0 { - t.Errorf("Calling ApierV1.GetBalance expected: 10.0, received: %f", acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + if acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 10.0 { + t.Errorf("Calling ApierV1.GetBalance expected: 10.0, received: %f", acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue()) } - if len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction]) != 1 { - t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction])) + if len(acnt.BalanceMap[engine.CREDIT+attrs.Direction]) != 1 { + t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[engine.CREDIT+attrs.Direction])) } - blnc := acnt.BalanceMap[attrs.BalanceType+attrs.Direction][0] + blnc := acnt.BalanceMap[engine.CREDIT+attrs.Direction][0] if blnc.Value != 10 { t.Errorf("Unexpected value for general balance: %f", blnc.Value) } @@ -231,17 +231,17 @@ func TestFsJsonGetAccount1003(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1003", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1003", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } - if acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 10.0 { - t.Errorf("Calling ApierV1.GetBalance expected: 10.0, received: %f", acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + if acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 10.0 { + t.Errorf("Calling ApierV1.GetBalance expected: 10.0, received: %f", acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue()) } - if len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction]) != 1 { - t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction])) + if len(acnt.BalanceMap[engine.CREDIT+attrs.Direction]) != 1 { + t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[engine.CREDIT+attrs.Direction])) } - blnc := acnt.BalanceMap[attrs.BalanceType+attrs.Direction][0] + blnc := acnt.BalanceMap[engine.CREDIT+attrs.Direction][0] if blnc.Value != 10 { t.Errorf("Unexpected value for general balance: %f", blnc.Value) } @@ -252,17 +252,17 @@ func TestFsJsonGetAccount1004(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1004", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1004", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } - if acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 10.0 { - t.Errorf("Calling ApierV1.GetBalance expected: 10.0, received: %f", acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + if acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 10.0 { + t.Errorf("Calling ApierV1.GetBalance expected: 10.0, received: %f", acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue()) } - if len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction]) != 1 { - t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction])) + if len(acnt.BalanceMap[engine.CREDIT+attrs.Direction]) != 1 { + t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[engine.CREDIT+attrs.Direction])) } - blnc := acnt.BalanceMap[attrs.BalanceType+attrs.Direction][0] + blnc := acnt.BalanceMap[engine.CREDIT+attrs.Direction][0] if blnc.Value != 10 { t.Errorf("Unexpected value for general balance: %f", blnc.Value) } @@ -273,7 +273,7 @@ func TestFsJsonGetAccount1006(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1006", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1006", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err == nil { t.Error("Got no error when querying unexisting balance") } @@ -284,17 +284,17 @@ func TestFsJsonGetAccount1007(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1007", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1007", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } - if acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 0 { - t.Errorf("Calling ApierV1.GetBalance expected: 0, received: %f", acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + if acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 0 { + t.Errorf("Calling ApierV1.GetBalance expected: 0, received: %f", acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue()) } - if len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction]) != 1 { - t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction])) + if len(acnt.BalanceMap[engine.CREDIT+attrs.Direction]) != 1 { + t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[engine.CREDIT+attrs.Direction])) } - blncLst := acnt.BalanceMap[attrs.BalanceType+attrs.Direction] + blncLst := acnt.BalanceMap[engine.CREDIT+attrs.Direction] for _, blnc := range blncLst { if len(blnc.SharedGroup) == 0 && blnc.Value != 0 { // General balance t.Errorf("Unexpected value for general balance: %f", blnc.Value) @@ -405,7 +405,7 @@ func TestMaxDebit1001(t *testing.T) { } else if cc.GetDuration() > time.Duration(1)*time.Minute { t.Errorf("Unexpected call duration received: %v", cc.GetDuration()) } - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else { @@ -445,7 +445,7 @@ func TestMaxDebit1007(t *testing.T) { t.Errorf("Unexpected call duration received: %v", cc.GetDuration()) } // Debit out of shared balance should reflect in the 1001 instead of 1007 - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", BalanceType: "*monetary", Direction: "*out"} + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else { @@ -462,17 +462,17 @@ func TestMaxDebit1007(t *testing.T) { } } // Make sure 1007 remains the same - attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "1007", BalanceType: "*monetary", Direction: "*out"} + attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "1007", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } - if acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 0 { - t.Errorf("Calling ApierV1.GetBalance expected: 0, received: %f", acnt.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + if acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 0 { + t.Errorf("Calling ApierV1.GetBalance expected: 0, received: %f", acnt.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue()) } - if len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction]) != 1 { - t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[attrs.BalanceType+attrs.Direction])) + if len(acnt.BalanceMap[engine.CREDIT+attrs.Direction]) != 1 { + t.Errorf("Unexpected number of balances found: %d", len(acnt.BalanceMap[engine.CREDIT+attrs.Direction])) } - blnc := acnt.BalanceMap[attrs.BalanceType+attrs.Direction][0] + blnc := acnt.BalanceMap[engine.CREDIT+attrs.Direction][0] if len(blnc.SharedGroup) == 0 { // General balance t.Errorf("Unexpected general balance: %f", blnc.Value) } else if blnc.SharedGroup == "SHARED_A" && blnc.Value != 0 {