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

Add error constant for INSUFFICIENT_CREDIT_BALANCE_BLOCKER

Browse Source
This commit is contained in:
ionutboangiu
2024-01-26 13:15:47 -05:00
committed by Dan Christian Bogos
parent c4899cc01b
commit 8c0bee1a1a
5 changed files with 107 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/account.go
View File

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

5
engine/account_test.go
View File

@@ -271,10 +271,9 @@ func TestDebitCreditBlocker(t *testing.T) {
}
rifsBalance := &Account{ID: "other",
BalanceMap: map[string]Balances{utils.MetaMonetary: {b1, b2}}}
expectedErr := "insufficient credit with balance Blocker"
_, err := rifsBalance.debitCreditBalance(cd, false, true, true, nil)
if err == nil || err.Error() != expectedErr {
t.Fatalf("expected %v, received %v", expectedErr, err)
if !errors.Is(err, utils.ErrInsufficientCreditBalanceBlocker) {
t.Fatalf("expected %v, received %v", utils.ErrInsufficientCreditBalanceBlocker, err)
}
if rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 0.1152 ||
rifsBalance.BalanceMap[utils.MetaMonetary][1].GetValue() != 1.5 {

11
engine/calldesc_test.go
View File

@@ -19,6 +19,7 @@ package engine
import (
"bytes"
"errors"
"log"
"os"
"reflect"
@@ -764,10 +765,9 @@ func TestGetMaxSessiontWithBlocker(t *testing.T) {
TimeEnd: time.Date(2016, 1, 13, 14, 30, 0, 0, time.UTC),
MaxCostSoFar: 0,
}
expectedErr := "insufficient credit with balance Blocker"
result, err := cd.GetMaxSessionDuration(nil)
if result != 0 || err == nil || err.Error() != expectedErr {
t.Errorf("expected %v, received %v", expectedErr, err)
if !errors.Is(err, utils.ErrInsufficientCreditBalanceBlocker) || result != 0 {
t.Fatalf("expected %v, received %v", utils.ErrInsufficientCreditBalanceBlocker, err)
}
cd = &CallDescriptor{
Category: "call",
@@ -813,10 +813,9 @@ func TestGetMaxSessiontWithBlockerEmpty(t *testing.T) {
TimeEnd: time.Date(2016, 1, 13, 14, 30, 0, 0, time.UTC),
MaxCostSoFar: 0,
}
expectedErr := "insufficient credit with balance Blocker"
result, err := cd.GetMaxSessionDuration(nil)
if result != 0 || err == nil || err.Error() != expectedErr {
t.Errorf("expected %v, received %v", expectedErr, err)
if !errors.Is(err, utils.ErrInsufficientCreditBalanceBlocker) || result != 0 {
t.Fatalf("expected %v, received %v", utils.ErrInsufficientCreditBalanceBlocker, err)
}
cd = &CallDescriptor{
Category: "call",

2
general_tests/balance_it_test.go
View File

@@ -220,7 +220,7 @@ cgrates.org,sms,1001,2014-01-14T00:00:00Z,RP_ANY,`,
if len(cdrs) != 1 {
t.Fatalf("expected to receive only one CDR: %v", utils.ToJSON(cdrs))
}
if cdrs[0].ExtraInfo != "insufficient credit with balance Blocker" {
if cdrs[0].ExtraInfo != utils.ErrInsufficientCreditBalanceBlocker.Error() {
t.Errorf("Unexpected ExtraInfo field value: %v", cdrs[0].ExtraInfo)
}
})

190
utils/errors.go
View File

@@ -25,102 +25,104 @@ import (
)
var (
ErrNoMoreData = errors.New("NO_MORE_DATA")
ErrNotImplemented = errors.New("NOT_IMPLEMENTED")
ErrNotFound = errors.New("NOT_FOUND")
ErrDSPHostNotFound = errors.New("DSP_HOST_NOT_FOUND")
ErrDSPProfileNotFound = errors.New("DSP_PROFILE_NOT_FOUND")
ErrTimedOut = errors.New("TIMED_OUT")
ErrServerError = errors.New("SERVER_ERROR")
ErrMaxRecursionDepth = errors.New("MAX_RECURSION_DEPTH")
ErrMandatoryIeMissing = errors.New("MANDATORY_IE_MISSING")
ErrExists = errors.New("EXISTS")
ErrBrokenReference = errors.New("BROKEN_REFERENCE")
ErrParserError = errors.New("PARSER_ERROR")
ErrInvalidPath = errors.New("INVALID_PATH")
ErrInvalidKey = errors.New("INVALID_KEY")
ErrUnauthorizedDestination = errors.New("UNAUTHORIZED_DESTINATION")
ErrRatingPlanNotFound = errors.New("RATING_PLAN_NOT_FOUND")
ErrAccountNotFound = errors.New("ACCOUNT_NOT_FOUND")
ErrAccountDisabled = errors.New("ACCOUNT_DISABLED")
ErrInsufficientCredit = errors.New("INSUFFICIENT_CREDIT")
ErrNotConvertible = errors.New("NOT_CONVERTIBLE")
ErrResourceUnavailable = errors.New("RESOURCE_UNAVAILABLE")
ErrResourceUnauthorized = errors.New("RESOURCE_UNAUTHORIZED")
ErrNoActiveSession = errors.New("NO_ACTIVE_SESSION")
ErrPartiallyExecuted = errors.New("PARTIALLY_EXECUTED")
ErrMaxUsageExceeded = errors.New("MAX_USAGE_EXCEEDED")
ErrMaxCostExceeded = errors.New("MAX_COST_EXCEEDED")
ErrFilterNotPassingNoCaps = errors.New("filter not passing")
ErrNotConvertibleNoCaps = errors.New("not convertible")
ErrMandatoryIeMissingNoCaps = errors.New("mandatory information missing")
ErrUnauthorizedApi = errors.New("UNAUTHORIZED_API")
ErrUnknownApiKey = errors.New("UNKNOWN_API_KEY")
ErrReqUnsynchronized = errors.New("REQ_UNSYNCHRONIZED")
ErrUnsupporteServiceMethod = errors.New("UNSUPPORTED_SERVICE_METHOD")
ErrDisconnected = errors.New("DISCONNECTED")
ErrReplyTimeout = errors.New("REPLY_TIMEOUT")
ErrSessionNotFound = errors.New("SESSION_NOT_FOUND")
ErrJsonIncompleteComment = errors.New("JSON_INCOMPLETE_COMMENT")
ErrNotEnoughParameters = errors.New("NotEnoughParameters")
ErrNotConnected = errors.New("NOT_CONNECTED")
RalsErrorPrfx = "RALS_ERROR"
DispatcherErrorPrefix = "DISPATCHER_ERROR"
RateSErrPrfx = "RATES_ERROR"
ErrNotAuthorized = errors.New("NOT_AUTHORIZED")
ErrUnsupportedFormat = errors.New("UNSUPPORTED_FORMAT")
ErrNoDatabaseConn = errors.New("NO_DATABASE_CONNECTION")
ErrMaxIncrementsExceeded = errors.New("MAX_INCREMENTS_EXCEEDED")
ErrUncomputableIncrement = errors.New("UNCOMPUTABLE_INCREMENT")
ErrIndexOutOfBounds = errors.New("INDEX_OUT_OF_BOUNDS")
ErrWrongPath = errors.New("WRONG_PATH")
ErrServiceAlreadyRunning = fmt.Errorf("service already running")
ErrMaxConcurrentRPCExceededNoCaps = errors.New("max concurrent rpc exceeded") // on internal we return this error for concureq
ErrMaxConcurrentRPCExceeded = errors.New("MAX_CONCURRENT_RPC_EXCEEDED") // but the codec will rewrite it with this one to be sure that we corectly dealocate the request
ErrMaxIterationsReached = errors.New("maximum iterations reached")
ErrNegative = errors.New("NEGATIVE")
ErrCastFailed = errors.New("CAST_FAILED")
ErrNoMoreData = errors.New("NO_MORE_DATA")
ErrNotImplemented = errors.New("NOT_IMPLEMENTED")
ErrNotFound = errors.New("NOT_FOUND")
ErrDSPHostNotFound = errors.New("DSP_HOST_NOT_FOUND")
ErrDSPProfileNotFound = errors.New("DSP_PROFILE_NOT_FOUND")
ErrTimedOut = errors.New("TIMED_OUT")
ErrServerError = errors.New("SERVER_ERROR")
ErrMaxRecursionDepth = errors.New("MAX_RECURSION_DEPTH")
ErrMandatoryIeMissing = errors.New("MANDATORY_IE_MISSING")
ErrExists = errors.New("EXISTS")
ErrBrokenReference = errors.New("BROKEN_REFERENCE")
ErrParserError = errors.New("PARSER_ERROR")
ErrInvalidPath = errors.New("INVALID_PATH")
ErrInvalidKey = errors.New("INVALID_KEY")
ErrUnauthorizedDestination = errors.New("UNAUTHORIZED_DESTINATION")
ErrRatingPlanNotFound = errors.New("RATING_PLAN_NOT_FOUND")
ErrAccountNotFound = errors.New("ACCOUNT_NOT_FOUND")
ErrAccountDisabled = errors.New("ACCOUNT_DISABLED")
ErrInsufficientCredit = errors.New("INSUFFICIENT_CREDIT")
ErrInsufficientCreditBalanceBlocker = errors.New("INSUFFICIENT_CREDIT_BALANCE_BLOCKER")
ErrNotConvertible = errors.New("NOT_CONVERTIBLE")
ErrResourceUnavailable = errors.New("RESOURCE_UNAVAILABLE")
ErrResourceUnauthorized = errors.New("RESOURCE_UNAUTHORIZED")
ErrNoActiveSession = errors.New("NO_ACTIVE_SESSION")
ErrPartiallyExecuted = errors.New("PARTIALLY_EXECUTED")
ErrMaxUsageExceeded = errors.New("MAX_USAGE_EXCEEDED")
ErrMaxCostExceeded = errors.New("MAX_COST_EXCEEDED")
ErrFilterNotPassingNoCaps = errors.New("filter not passing")
ErrNotConvertibleNoCaps = errors.New("not convertible")
ErrMandatoryIeMissingNoCaps = errors.New("mandatory information missing")
ErrUnauthorizedApi = errors.New("UNAUTHORIZED_API")
ErrUnknownApiKey = errors.New("UNKNOWN_API_KEY")
ErrReqUnsynchronized = errors.New("REQ_UNSYNCHRONIZED")
ErrUnsupporteServiceMethod = errors.New("UNSUPPORTED_SERVICE_METHOD")
ErrDisconnected = errors.New("DISCONNECTED")
ErrReplyTimeout = errors.New("REPLY_TIMEOUT")
ErrSessionNotFound = errors.New("SESSION_NOT_FOUND")
ErrJsonIncompleteComment = errors.New("JSON_INCOMPLETE_COMMENT")
ErrNotEnoughParameters = errors.New("NotEnoughParameters")
ErrNotConnected = errors.New("NOT_CONNECTED")
RalsErrorPrfx = "RALS_ERROR"
DispatcherErrorPrefix = "DISPATCHER_ERROR"
RateSErrPrfx = "RATES_ERROR"
ErrNotAuthorized = errors.New("NOT_AUTHORIZED")
ErrUnsupportedFormat = errors.New("UNSUPPORTED_FORMAT")
ErrNoDatabaseConn = errors.New("NO_DATABASE_CONNECTION")
ErrMaxIncrementsExceeded = errors.New("MAX_INCREMENTS_EXCEEDED")
ErrUncomputableIncrement = errors.New("UNCOMPUTABLE_INCREMENT")
ErrIndexOutOfBounds = errors.New("INDEX_OUT_OF_BOUNDS")
ErrWrongPath = errors.New("WRONG_PATH")
ErrServiceAlreadyRunning = fmt.Errorf("service already running")
ErrMaxConcurrentRPCExceededNoCaps = errors.New("max concurrent rpc exceeded") // on internal we return this error for concureq
ErrMaxConcurrentRPCExceeded = errors.New("MAX_CONCURRENT_RPC_EXCEEDED") // but the codec will rewrite it with this one to be sure that we corectly dealocate the request
ErrMaxIterationsReached = errors.New("maximum iterations reached")
ErrNegative = errors.New("NEGATIVE")
ErrCastFailed = errors.New("CAST_FAILED")
ErrMap = map[string]error{
ErrNoMoreData.Error(): ErrNoMoreData,
ErrNotImplemented.Error(): ErrNotImplemented,
ErrDSPProfileNotFound.Error(): ErrDSPProfileNotFound,
ErrDSPHostNotFound.Error(): ErrDSPHostNotFound,
ErrNotFound.Error(): ErrNotFound,
ErrTimedOut.Error(): ErrTimedOut,
ErrServerError.Error(): ErrServerError,
ErrMaxRecursionDepth.Error(): ErrMaxRecursionDepth,
ErrExists.Error(): ErrExists,
ErrBrokenReference.Error(): ErrBrokenReference,
ErrParserError.Error(): ErrParserError,
ErrInvalidPath.Error(): ErrInvalidPath,
ErrInvalidKey.Error(): ErrInvalidKey,
ErrUnauthorizedDestination.Error(): ErrUnauthorizedDestination,
ErrRatingPlanNotFound.Error(): ErrRatingPlanNotFound,
ErrInsufficientCredit.Error(): ErrInsufficientCredit,
ErrNotConvertible.Error(): ErrNotConvertible,
ErrResourceUnavailable.Error(): ErrResourceUnavailable,
ErrResourceUnauthorized.Error(): ErrResourceUnauthorized,
ErrNoActiveSession.Error(): ErrNoActiveSession,
ErrPartiallyExecuted.Error(): ErrPartiallyExecuted,
ErrMaxUsageExceeded.Error(): ErrMaxUsageExceeded,
ErrFilterNotPassingNoCaps.Error(): ErrFilterNotPassingNoCaps,
ErrNotConvertibleNoCaps.Error(): ErrNotConvertibleNoCaps,
ErrUnauthorizedApi.Error(): ErrUnauthorizedApi,
ErrUnknownApiKey.Error(): ErrUnknownApiKey,
ErrReqUnsynchronized.Error(): ErrReqUnsynchronized,
ErrUnsupporteServiceMethod.Error(): ErrUnsupporteServiceMethod,
ErrDisconnected.Error(): ErrDisconnected,
ErrReplyTimeout.Error(): ErrReplyTimeout,
ErrSessionNotFound.Error(): ErrSessionNotFound,
ErrJsonIncompleteComment.Error(): ErrJsonIncompleteComment,
ErrNotEnoughParameters.Error(): ErrNotEnoughParameters,
ErrUnsupportedFormat.Error(): ErrUnsupportedFormat,
ErrNoDatabaseConn.Error(): ErrNoDatabaseConn,
ErrMaxIncrementsExceeded.Error(): ErrMaxIncrementsExceeded,
ErrIndexOutOfBounds.Error(): ErrIndexOutOfBounds,
ErrWrongPath.Error(): ErrWrongPath,
ErrDSPHostNotFound.Error(): ErrDSPHostNotFound,
ErrNoMoreData.Error(): ErrNoMoreData,
ErrNotImplemented.Error(): ErrNotImplemented,
ErrDSPProfileNotFound.Error(): ErrDSPProfileNotFound,
ErrDSPHostNotFound.Error(): ErrDSPHostNotFound,
ErrNotFound.Error(): ErrNotFound,
ErrTimedOut.Error(): ErrTimedOut,
ErrServerError.Error(): ErrServerError,
ErrMaxRecursionDepth.Error(): ErrMaxRecursionDepth,
ErrExists.Error(): ErrExists,
ErrBrokenReference.Error(): ErrBrokenReference,
ErrParserError.Error(): ErrParserError,
ErrInvalidPath.Error(): ErrInvalidPath,
ErrInvalidKey.Error(): ErrInvalidKey,
ErrUnauthorizedDestination.Error(): ErrUnauthorizedDestination,
ErrRatingPlanNotFound.Error(): ErrRatingPlanNotFound,
ErrInsufficientCredit.Error(): ErrInsufficientCredit,
ErrInsufficientCreditBalanceBlocker.Error(): ErrInsufficientCreditBalanceBlocker,
ErrNotConvertible.Error(): ErrNotConvertible,
ErrResourceUnavailable.Error(): ErrResourceUnavailable,
ErrResourceUnauthorized.Error(): ErrResourceUnauthorized,
ErrNoActiveSession.Error(): ErrNoActiveSession,
ErrPartiallyExecuted.Error(): ErrPartiallyExecuted,
ErrMaxUsageExceeded.Error(): ErrMaxUsageExceeded,
ErrFilterNotPassingNoCaps.Error(): ErrFilterNotPassingNoCaps,
ErrNotConvertibleNoCaps.Error(): ErrNotConvertibleNoCaps,
ErrUnauthorizedApi.Error(): ErrUnauthorizedApi,
ErrUnknownApiKey.Error(): ErrUnknownApiKey,
ErrReqUnsynchronized.Error(): ErrReqUnsynchronized,
ErrUnsupporteServiceMethod.Error(): ErrUnsupporteServiceMethod,
ErrDisconnected.Error(): ErrDisconnected,
ErrReplyTimeout.Error(): ErrReplyTimeout,
ErrSessionNotFound.Error(): ErrSessionNotFound,
ErrJsonIncompleteComment.Error(): ErrJsonIncompleteComment,
ErrNotEnoughParameters.Error(): ErrNotEnoughParameters,
ErrUnsupportedFormat.Error(): ErrUnsupportedFormat,
ErrNoDatabaseConn.Error(): ErrNoDatabaseConn,
ErrMaxIncrementsExceeded.Error(): ErrMaxIncrementsExceeded,
ErrIndexOutOfBounds.Error(): ErrIndexOutOfBounds,
ErrWrongPath.Error(): ErrWrongPath,
ErrDSPHostNotFound.Error(): ErrDSPHostNotFound,
}
)