Users returning USERS_NOT_FOUND error for better error handling

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()) { // 5030 in case of AccountNotFound
+			if strings.HasSuffix(err.Error(), utils.ErrAccountNotFound.Error()) || strings.HasSuffix(err.Error(), utils.ErrUsersNotFound.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("<DiameterAgent> Processing message: %+v set CCA Reply-Code, error: %s", ccr.diamMessage, err))

engine/users.go

@@ -495,5 +495,5 @@ func LoadUserProfile(in interface{}, extraFields string) error {
 		utils.SetMapExtraFields(in, m, extraFields)
 		return nil
 	}
-	return utils.ErrNotFound
+	return utils.ErrUsersNotFound
 }

engine/users_test.go

@@ -708,7 +708,7 @@ func TestUsersExternalCDRGetLoadUserProfileExtraFieldsNotFound(t *testing.T) {
 	}
 
 	err := LoadUserProfile(ur, "ExtraFields")
-	if err != utils.ErrNotFound {
+	if err != utils.ErrUsersNotFound {
 		t.Error("Error detecting err in loading user profile: ", err)
 	}
 }

utils/consts.go

@@ -28,6 +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")
 )
 
 const (