From 2a6f2c140a8a92a2c7e752aeb743c8482045e056 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 19 Jul 2021 09:33:27 +0300 Subject: [PATCH] Updated account threshold test --- engine/balances.go | 2 ++ general_tests/accountswiththresholds_it_test.go | 2 +- guardian/guardian.go | 8 ++++---- utils/consts.go | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/engine/balances.go b/engine/balances.go index 1033ba97f..297dff015 100644 --- a/engine/balances.go +++ b/engine/balances.go @@ -822,5 +822,7 @@ func (bl *BalanceSummary) FieldAsInterface(fldPath []string) (val interface{}, e return bl.Value, nil case utils.Disabled: return bl.Disabled, nil + case utils.Initial: + return bl.Initial, nil } } diff --git a/general_tests/accountswiththresholds_it_test.go b/general_tests/accountswiththresholds_it_test.go index 1399680d7..a8019fcec 100644 --- a/general_tests/accountswiththresholds_it_test.go +++ b/general_tests/accountswiththresholds_it_test.go @@ -116,7 +116,7 @@ func testAccWThdSetThresholdProfile(t *testing.T) { ThdPrf := &engine.ThresholdProfileWithAPIOpts{ ThresholdProfile: &engine.ThresholdProfile{ Tenant: "cgrates.org", - FilterIDs: []string{"*string:~*opts.*eventType:AccountUpdate", "*string:~*asm.ID:1002", "*lt:~*asm.BalanceSummaries.testBalanceID.Value:56m"}, + FilterIDs: []string{"*string:~*opts.*eventType:AccountUpdate", "*string:~*asm.ID:1002", "*lt:~*asm.BalanceSummaries.testBalanceID.Value:56m", "*gte:~*asm.BalanceSummaries.testBalanceID.Initial:58m"}, ID: "THD_ACNT_1002", MaxHits: 1, }, diff --git a/guardian/guardian.go b/guardian/guardian.go index 2b8bc1c1c..c921c495f 100644 --- a/guardian/guardian.go +++ b/guardian/guardian.go @@ -175,9 +175,9 @@ func (gl *GuardianLocker) GuardIDs(refID string, timeout time.Duration, lkIDs .. } // UnguardIDs attempts to unlock a set of locks based on their reference ID received on lock -func (gl *GuardianLocker) UnguardIDs(refID string) (_ []string) { - if refID == "" { - return +func (gl *GuardianLocker) UnguardIDs(refID string) []string { + if refID != "" { + return gl.unlockWithReference(refID) } - return gl.unlockWithReference(refID) + return nil } diff --git a/utils/consts.go b/utils/consts.go index 612800079..d2ca8a47a 100644 --- a/utils/consts.go +++ b/utils/consts.go @@ -588,6 +588,7 @@ const ( ExpiryTime = "ExpiryTime" AllowNegative = "AllowNegative" Disabled = "Disabled" + Initial = "Initial" Action = "Action" SessionSCosts = "SessionSCosts"