From 39b601780a3abec7bb9645384c87d3f461dafdc4 Mon Sep 17 00:00:00 2001 From: DanB Date: Thu, 13 Oct 2016 11:16:41 +0200 Subject: [PATCH] Fix for setBalance not checking actionTriggers on default balance --- apier/v2/apierv2_it_test.go | 5 ++--- engine/account.go | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apier/v2/apierv2_it_test.go b/apier/v2/apierv2_it_test.go index 2c878ff52..540a69dac 100644 --- a/apier/v2/apierv2_it_test.go +++ b/apier/v2/apierv2_it_test.go @@ -140,7 +140,6 @@ func TestApierV2itSetAccountActionTriggers(t *testing.T) { GroupID: utils.StringPointer("MONITOR_MAX_BALANCE"), ThresholdType: utils.StringPointer(utils.TRIGGER_MAX_BALANCE), ThresholdValue: utils.Float64Pointer(50), - BalanceID: utils.StringPointer(utils.META_DEFAULT), BalanceType: utils.StringPointer(utils.MONETARY), ActionsID: utils.StringPointer("DISABLE_ACCOUNT"), } @@ -186,8 +185,8 @@ func TestApierV2itFraudMitigation(t *testing.T) { t.Error(err) } else if len(acnt.BalanceMap) != 1 || acnt.BalanceMap[utils.MONETARY][0].Value != 60.0 { t.Errorf("Unexpected balance received: %+v", acnt.BalanceMap[utils.MONETARY][0]) - //} else if !acnt.Disabled { - // t.Fatalf("Received account: %+v", acnt) + } else if !acnt.Disabled { + t.Fatalf("Received account: %+v", acnt) } attrSetAcnt := AttrSetAccount{ Tenant: "cgrates.org", diff --git a/engine/account.go b/engine/account.go index e234dd5b7..ec28caf32 100644 --- a/engine/account.go +++ b/engine/account.go @@ -127,6 +127,7 @@ func (acc *Account) setBalanceAction(a *Action) error { balance.ID = utils.META_DEFAULT if a.Balance.Value != nil { balance.Value = a.Balance.GetValue() + balance.SetDirty() // Mark the balance as dirty since we have modified and it should be checked by action triggers } } else { a.Balance.ModifyBalance(balance)