From 1f41970e86ac02cfb09ef68078754ec52f6ac054 Mon Sep 17 00:00:00 2001 From: DanB Date: Wed, 10 Feb 2016 15:19:39 +0100 Subject: [PATCH] USERS_NOT_FOUND -> USER_NOT_FOUND for consistency --- agents/dmtagent.go | 2 +- engine/users.go | 2 +- engine/users_test.go | 2 +- utils/consts.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/dmtagent.go b/agents/dmtagent.go index 8dfef11c9..bdf119ba1 100644 --- a/agents/dmtagent.go +++ b/agents/dmtagent.go @@ -139,7 +139,7 @@ func (self DiameterAgent) processCCR(ccr *CCR, reqProcessor *config.DARequestPro var unauthorizedResultCode bool if err != nil { utils.Logger.Debug(fmt.Sprintf("Received error from rater: %+v", err)) - if strings.HasSuffix(err.Error(), utils.ErrAccountNotFound.Error()) || strings.HasSuffix(err.Error(), utils.ErrUsersNotFound.Error()) { // 5030 in case of AccountNotFound + if strings.HasSuffix(err.Error(), utils.ErrAccountNotFound.Error()) || strings.HasSuffix(err.Error(), utils.ErrUserNotFound.Error()) { // 5030 in case of AccountNotFound if err := messageSetAVPsWithPath(cca.diamMessage, []interface{}{"Result-Code"}, "5030", false, self.cgrCfg.DiameterAgentCfg().Timezone); err != nil { utils.Logger.Err(fmt.Sprintf(" Processing message: %+v set CCA Reply-Code, error: %s", ccr.diamMessage, err)) diff --git a/engine/users.go b/engine/users.go index caa435558..66d573de2 100644 --- a/engine/users.go +++ b/engine/users.go @@ -495,5 +495,5 @@ func LoadUserProfile(in interface{}, extraFields string) error { utils.SetMapExtraFields(in, m, extraFields) return nil } - return utils.ErrUsersNotFound + return utils.ErrUserNotFound } diff --git a/engine/users_test.go b/engine/users_test.go index 45df6a58e..442b22411 100644 --- a/engine/users_test.go +++ b/engine/users_test.go @@ -708,7 +708,7 @@ func TestUsersExternalCDRGetLoadUserProfileExtraFieldsNotFound(t *testing.T) { } err := LoadUserProfile(ur, "ExtraFields") - if err != utils.ErrUsersNotFound { + if err != utils.ErrUserNotFound { t.Error("Error detecting err in loading user profile: ", err) } } diff --git a/utils/consts.go b/utils/consts.go index 9dd06ee16..c7d6e2d74 100644 --- a/utils/consts.go +++ b/utils/consts.go @@ -28,7 +28,7 @@ var ( ErrUnauthorizedDestination = errors.New("UNAUTHORIZED_DESTINATION") ErrRatingPlanNotFound = errors.New("RATING_PLAN_NOT_FOUND") ErrAccountNotFound = errors.New("ACCOUNT_NOT_FOUND") - ErrUsersNotFound = errors.New("USERS_NOT_FOUND") + ErrUserNotFound = errors.New("USER_NOT_FOUND") ) const (