AddAccountAliases temporary fix since update not properly working

This commit is contained in:
DanB
2015-11-27 21:19:48 +01:00
parent d3c326c372
commit 27a8dd7d2f

View File

@@ -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