From 5660b7b8e244cdb278b213ca4ed4de35054a6d96 Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Wed, 6 Mar 2019 19:27:06 +0100
Subject: [PATCH] AttributeS.ProcessEvent with better error handling, migrator
 for aliases using *destinations instead of *destination

---
 engine/attributes.go      |  2 +-
 migrator/alias.go         | 12 ++++++++----
 migrator/alias_it_test.go |  2 +-
 migrator/alias_test.go    |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/engine/attributes.go b/engine/attributes.go
index f61b02c94..3c14f849b 100644
--- a/engine/attributes.go
+++ b/engine/attributes.go
@@ -250,7 +250,7 @@ func (alS *AttributeService) V1ProcessEvent(args *AttrArgsProcessEvent,
 				break
 			}
 		}
-	} else if apiRply != nil {
+	} else if err == nil {
 		for _, valIface := range apiRply.CGREvent.Event {
 			if valIface == interface{}(utils.MetaAttributes) {
 				// mandatory IE missing
diff --git a/migrator/alias.go b/migrator/alias.go
index 74533b7ec..b584c9210 100644
--- a/migrator/alias.go
+++ b/migrator/alias.go
@@ -87,13 +87,16 @@ func alias2AtttributeProfile(alias *v1Alias, defaultTenant string) *engine.Attri
 		out.Tenant = defaultTenant
 	}
 	if len(alias.Category) != 0 && alias.Category != utils.META_ANY {
-		out.FilterIDs = append(out.FilterIDs, "*string:~Category:"+alias.Category)
+		out.FilterIDs = append(out.FilterIDs,
+			fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.Category, alias.Category))
 	}
 	if len(alias.Account) != 0 && alias.Account != utils.META_ANY {
-		out.FilterIDs = append(out.FilterIDs, "*string:~Account:"+alias.Account)
+		out.FilterIDs = append(out.FilterIDs,
+			fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.Account, alias.Account))
 	}
 	if len(alias.Subject) != 0 && alias.Subject != utils.META_ANY {
-		out.FilterIDs = append(out.FilterIDs, "*string:~Subject:"+alias.Subject)
+		out.FilterIDs = append(out.FilterIDs,
+			fmt.Sprintf("%s:~%s:%s", utils.MetaString, utils.Subject, alias.Subject))
 	}
 	var destination string
 	for _, av := range alias.Values {
@@ -115,7 +118,8 @@ func alias2AtttributeProfile(alias *v1Alias, defaultTenant string) *engine.Attri
 		}
 	}
 	if len(destination) != 0 && destination != utils.META_ANY {
-		out.FilterIDs = append(out.FilterIDs, "*destination:~Destination:"+destination)
+		out.FilterIDs = append(out.FilterIDs,
+			fmt.Sprintf("%s:~%s:%s", utils.MetaDestinations, utils.Destination, destination))
 	}
 	return out
 }
diff --git a/migrator/alias_it_test.go b/migrator/alias_it_test.go
index abc09761d..453adc1f2 100644
--- a/migrator/alias_it_test.go
+++ b/migrator/alias_it_test.go
@@ -158,7 +158,7 @@ func testAlsITMigrateAndMove(t *testing.T) {
 		FilterIDs: []string{
 			"*string:~Account:1001",
 			"*string:~Subject:call_1001",
-			"*destination:~Destination:DST_1003",
+			"*destinations:~Destination:DST_1003",
 		},
 		ActivationInterval: nil,
 		Attributes: []*engine.Attribute{
diff --git a/migrator/alias_test.go b/migrator/alias_test.go
index b5a28ee93..17095d069 100644
--- a/migrator/alias_test.go
+++ b/migrator/alias_test.go
@@ -221,7 +221,7 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 			FilterIDs: []string{
 				"*string:~Category:*voice",
 				"*string:~Account:1001",
-				"*destination:~Destination:DST_1003",
+				"*destinations:~Destination:DST_1003",
 			},
 			ActivationInterval: nil,
 			Attributes: []*engine.Attribute{
@@ -246,7 +246,7 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 			FilterIDs: []string{
 				"*string:~Account:1001",
 				"*string:~Subject:call_1001",
-				"*destination:~Destination:DST_1003",
+				"*destinations:~Destination:DST_1003",
 			},
 			ActivationInterval: nil,
 			Attributes: []*engine.Attribute{