From 27a8dd7d2ffb3d04e616f71f66c97565ebb9230f Mon Sep 17 00:00:00 2001 From: DanB Date: Fri, 27 Nov 2015 21:19:48 +0100 Subject: [PATCH] AddAccountAliases temporary fix since update not properly working --- apier/v1/aliases.go | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/apier/v1/aliases.go b/apier/v1/aliases.go index 531f97e14..d736cd270 100644 --- a/apier/v1/aliases.go +++ b/apier/v1/aliases.go @@ -50,16 +50,9 @@ func (self *ApierV1) AddRatingSubjectAliases(attrs AttrAddRatingSubjectAliases, for _, alias := range attrs.Aliases { als := engine.Alias{Direction: utils.META_OUT, Tenant: attrs.Tenant, Category: attrs.Category, Account: alias, Subject: alias, Context: utils.ALIAS_CONTEXT_RATING, Values: engine.AliasValues{&engine.AliasValue{DestinationId: utils.META_ANY, - Pairs: engine.AliasPairs{"Subject": map[string]string{alias: attrs.Subject}}, Weight: 10.0}}} - var ignrAls engine.Alias - if err := aliases.GetAlias(als, &ignrAls); err == nil { // Update the previous alias if already there - if err := aliases.UpdateAlias(als, &ignr); err != nil { - return utils.NewErrServerError(err) - } - } else { - if err := aliases.SetAlias(als, &ignr); err != nil { - return utils.NewErrServerError(err) - } + Pairs: engine.AliasPairs{"Account": map[string]string{alias: attrs.Subject}, "Subject": map[string]string{alias: attrs.Subject}}, Weight: 10.0}}} + if err := aliases.SetAlias(als, &ignr); err != nil { + return utils.NewErrServerError(err) } } *reply = utils.OK @@ -109,16 +102,9 @@ func (self *ApierV1) AddAccountAliases(attrs AttrAddAccountAliases, reply *strin for _, alias := range attrs.Aliases { als := engine.Alias{Direction: utils.META_OUT, Tenant: attrs.Tenant, Category: attrs.Category, Account: alias, Subject: alias, Context: utils.ALIAS_CONTEXT_RATING, Values: engine.AliasValues{&engine.AliasValue{DestinationId: utils.META_ANY, - Pairs: engine.AliasPairs{"Account": map[string]string{alias: attrs.Account}}, Weight: 10.0}}} - var ignrAls engine.Alias - if err := aliases.GetAlias(als, &ignrAls); err == nil { // Update the previous alias if already there - if err := aliases.UpdateAlias(als, &ignr); err != nil { - return utils.NewErrServerError(err) - } - } else { - if err := aliases.SetAlias(als, &ignr); err != nil { - return utils.NewErrServerError(err) - } + Pairs: engine.AliasPairs{"Account": map[string]string{alias: attrs.Account}, "Subject": map[string]string{alias: attrs.Account}}, Weight: 10.0}}} + if err := aliases.SetAlias(als, &ignr); err != nil { + return utils.NewErrServerError(err) } } *reply = utils.OK