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

Prevent balance Blocker to partially debit

Browse Source
This commit is contained in:
DanB
2024-01-19 16:28:09 +01:00
parent 2fab0b92c5
commit e0d15f1a9e
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/account.go
View File

@@ -421,7 +421,10 @@ func (acc *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun bo
}
// check for blocker
if balance.Blocker {
return // don't go to next balances
if cd.GetDuration() != 0 {
return nil, errors.New("insufficient credit with balance Blocker")
}
goto COMMIT // don't go to next balances
}
}
}
@@ -454,7 +457,10 @@ func (acc *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun bo
}
// check for blocker
if balance.Blocker {
return // don't go to next balances
if cd.GetDuration() != 0 {
return nil, errors.New("insufficient credit with balance Blocker")
}
goto COMMIT // don't go to next balances
}
}
}

12
general_tests/balance_blocker_it_test.go
View File

@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package general_tests
import (
"fmt"
//"fmt"
"testing"
"time"
@@ -54,6 +54,10 @@ func TestBalanceBlocker(t *testing.T) {
content := `{
"general": {
"log_level": 7,
},
"data_db": {
"db_type": "*internal"
},
@@ -119,7 +123,7 @@ cgrates.org,sms,1001,2014-01-14T00:00:00Z,RP_ANY,`,
if err := client.Call(context.Background(), utils.APIerSv2GetAccount, attrs, &acnt); err != nil {
t.Fatal(err)
}
fmt.Println(utils.ToJSON(acnt))
//fmt.Println("initial account: " + utils.ToJSON(acnt))
})
t.Run("ProcessCDR", func(t *testing.T) {
@@ -156,7 +160,7 @@ cgrates.org,sms,1001,2014-01-14T00:00:00Z,RP_ANY,`,
t.Fatal(err)
}
fmt.Println(utils.ToJSON(cdrs))
//fmt.Println(utils.ToJSON(cdrs))
})
t.Run("CheckFinalBalance", func(t *testing.T) {
@@ -166,6 +170,6 @@ cgrates.org,sms,1001,2014-01-14T00:00:00Z,RP_ANY,`,
t.Fatal(err)
}
fmt.Println(utils.ToJSON(acnt))
//fmt.Println("final account: " + utils.ToJSON(acnt))
})
}