From 6e0e9cf3e37a33d9e5a325b9fdba900d42d81815 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Tue, 15 Jan 2019 17:04:35 +0200
Subject: [PATCH] Added fixes for alias migration

---
 engine/filters.go               | 4 ++--
 migrator/alias.go               | 2 +-
 migrator/alias_it_test.go       | 4 ++--
 migrator/alias_test.go          | 8 ++++----
 migrator/dispatchers_it_test.go | 6 ++++++
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/engine/filters.go b/engine/filters.go
index 90a332dc6..e790b6d6d 100644
--- a/engine/filters.go
+++ b/engine/filters.go
@@ -173,8 +173,8 @@ func NewFilterRule(rfType, fieldName string, vals []string) (*FilterRule, error)
 		return nil, fmt.Errorf("FieldName is mandatory for Type: %s", rfType)
 	}
 	if len(vals) == 0 && utils.IsSliceMember([]string{MetaString, MetaPrefix, MetaSuffix,
-		MetaTimings, MetaRSR, MetaDestinations, MetaDestinations, MetaLessThan,
-		MetaLessOrEqual, MetaGreaterThan, MetaGreaterOrEqual}, rfType) {
+		MetaTimings, MetaRSR, MetaDestinations, MetaLessThan, MetaLessOrEqual,
+		MetaGreaterThan, MetaGreaterOrEqual}, rfType) {
 		return nil, fmt.Errorf("Values is mandatory for Type: %s", rfType)
 	}
 	rf := &FilterRule{
diff --git a/migrator/alias.go b/migrator/alias.go
index da9d4c49f..749364b43 100644
--- a/migrator/alias.go
+++ b/migrator/alias.go
@@ -106,7 +106,7 @@ func alias2AtttributeProfile(alias *v1Alias, defaultTenant string) *engine.Attri
 		}
 	}
 	if len(destination) != 0 && destination != utils.META_ANY {
-		out.FilterIDs = append(out.FilterIDs, "*string:Destination:"+destination)
+		out.FilterIDs = append(out.FilterIDs, "*destination:Destination:"+destination)
 	}
 	return out
 }
diff --git a/migrator/alias_it_test.go b/migrator/alias_it_test.go
index c2dfa202f..1625e39c2 100644
--- a/migrator/alias_it_test.go
+++ b/migrator/alias_it_test.go
@@ -138,7 +138,7 @@ func testAlsITMigrateAndMove(t *testing.T) {
 		Context:   "*rated",
 		Values: v1AliasValues{
 			&v1AliasValue{
-				DestinationId: "1003",
+				DestinationId: "DST_1003",
 				Pairs: map[string]map[string]string{
 					"Account": map[string]string{
 						"1001": "1002",
@@ -158,7 +158,7 @@ func testAlsITMigrateAndMove(t *testing.T) {
 		FilterIDs: []string{
 			"*string:Account:1001",
 			"*string:Subject:call_1001",
-			"*string:Destination:1003",
+			"*destination:Destination:DST_1003",
 		},
 		ActivationInterval: nil,
 		Attributes: []*engine.Attribute{
diff --git a/migrator/alias_test.go b/migrator/alias_test.go
index b3e90988f..dc417019c 100644
--- a/migrator/alias_test.go
+++ b/migrator/alias_test.go
@@ -109,7 +109,7 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 			Context:   "*rated",
 			Values: v1AliasValues{
 				&v1AliasValue{
-					DestinationId: "1003",
+					DestinationId: "DST_1003",
 					Pairs: map[string]map[string]string{
 						"Account": map[string]string{
 							"1001": "1002",
@@ -131,7 +131,7 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 			Context:   "*rated",
 			Values: v1AliasValues{
 				&v1AliasValue{
-					DestinationId: "1003",
+					DestinationId: "DST_1003",
 					Pairs: map[string]map[string]string{
 						"Account": map[string]string{
 							"1001": "1002",
@@ -226,7 +226,7 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 			FilterIDs: []string{
 				"*string:Category:*voice",
 				"*string:Account:1001",
-				"*string:Destination:1003",
+				"*destination:Destination:DST_1003",
 			},
 			ActivationInterval: nil,
 			Attributes: []*engine.Attribute{
@@ -253,7 +253,7 @@ func TestAlias2AtttributeProfile(t *testing.T) {
 			FilterIDs: []string{
 				"*string:Account:1001",
 				"*string:Subject:call_1001",
-				"*string:Destination:1003",
+				"*destination:Destination:DST_1003",
 			},
 			ActivationInterval: nil,
 			Attributes: []*engine.Attribute{
diff --git a/migrator/dispatchers_it_test.go b/migrator/dispatchers_it_test.go
index 45ca5ffdd..4a5edd91f 100644
--- a/migrator/dispatchers_it_test.go
+++ b/migrator/dispatchers_it_test.go
@@ -153,6 +153,9 @@ func testDspITFlush(t *testing.T) {
 	} else if isEmpty != true {
 		t.Errorf("\nExpecting: true got :%+v", isEmpty)
 	}
+	if err := engine.SetDBVersions(dspMigrator.dmOut.DataManager().DataDB()); err != nil {
+		t.Error("Error  ", err.Error())
+	}
 	if err := dspMigrator.dmIN.DataManager().DataDB().Flush(""); err != nil {
 		t.Error(err)
 	}
@@ -161,6 +164,9 @@ func testDspITFlush(t *testing.T) {
 	} else if isEmpty != true {
 		t.Errorf("\nExpecting: true got :%+v", isEmpty)
 	}
+	if err := engine.SetDBVersions(dspMigrator.dmIN.DataManager().DataDB()); err != nil {
+		t.Error("Error  ", err.Error())
+	}
 }
 
 func testDspITMigrateAndMove(t *testing.T) {