Migrator - create indexes together with attribute profiles out of users and aliases

This commit is contained in:
DanB
2019-02-21 16:42:06 +01:00
parent df731770a7
commit 1f9c5f7962
2 changed files with 9 additions and 6 deletions

View File

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

View File

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