From 1f9c5f79620bed4550d5e9bc0fb076da19ffe935 Mon Sep 17 00:00:00 2001 From: DanB Date: Thu, 21 Feb 2019 16:42:06 +0100 Subject: [PATCH] Migrator - create indexes together with attribute profiles out of users and aliases --- migrator/alias.go | 2 +- migrator/user.go | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/migrator/alias.go b/migrator/alias.go index 67cebff14..edca51253 100644 --- a/migrator/alias.go +++ b/migrator/alias.go @@ -139,7 +139,7 @@ func (m *Migrator) migrateAlias2Attributes() (err error) { if err := m.dmIN.remV1Alias(alias.GetId()); err != nil { return err } - if err := m.dmOut.DataManager().DataDB().SetAttributeProfileDrv(attr); err != nil { + if err := m.dmOut.DataManager().SetAttributeProfile(attr, true); err != nil { return err } m.stats[Alias] += 1 diff --git a/migrator/user.go b/migrator/user.go index 6053872cb..8216d31c1 100644 --- a/migrator/user.go +++ b/migrator/user.go @@ -69,13 +69,16 @@ func userProfile2attributeProfile(user *v1UserProfile) (attr *engine.AttributePr Append: true, }) } - for fieldname, substitute := range user.Profile { - if utils.IsSliceMember(usrFltr, fieldname) { - attr.FilterIDs = append(attr.FilterIDs, fmt.Sprintf("*string:%s:%s", fieldname, substitute)) + for fieldName, substitute := range user.Profile { + if fieldName == "ReqType" { // old style + fieldName = utils.RequestType + } + if utils.IsSliceMember(usrFltr, fieldName) { + attr.FilterIDs = append(attr.FilterIDs, fmt.Sprintf("*string:%s:%s", fieldName, substitute)) continue } attr.Attributes = append(attr.Attributes, &engine.Attribute{ - FieldName: fieldname, + FieldName: fieldName, Initial: utils.META_ANY, Substitute: config.NewRSRParsersMustCompile(substitute, true, utils.INFIELD_SEP), Append: true, @@ -103,7 +106,7 @@ func (m *Migrator) migrateV1User2AttributeProfile() (err error) { if err := m.dmIN.remV1User(user.GetId()); err != nil { return err } - if err := m.dmOut.DataManager().DataDB().SetAttributeProfileDrv(attr); err != nil { + if err := m.dmOut.DataManager().SetAttributeProfile(attr, true); err != nil { return err } m.stats[utils.User] += 1