From 2b8f5c14eef71dda90be05e38bb45eccb91e549c Mon Sep 17 00:00:00 2001
From: adragusin <adrian.dragusin@itsyscom.com>
Date: Fri, 12 Jun 2020 17:58:40 +0300
Subject: [PATCH] Some fixes in migrator

---
 migrator/derived_chargers.go | 2 +-
 migrator/stats.go            | 3 +++
 migrator/stats_it_test.go    | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/migrator/derived_chargers.go b/migrator/derived_chargers.go
index cc18200bf..1abf861fb 100644
--- a/migrator/derived_chargers.go
+++ b/migrator/derived_chargers.go
@@ -224,7 +224,7 @@ func (m *Migrator) migrateV1DerivedChargers() (err error) {
 	if m.dryRun {
 		return
 	}
-	if m.removeV1DerivedChargers(); err != nil {
+	if err = m.removeV1DerivedChargers(); err != nil && err != utils.ErrNoMoreData {
 		return
 	}
 	// All done, update version wtih current one
diff --git a/migrator/stats.go b/migrator/stats.go
index ccd6c5eab..ddbf16fef 100644
--- a/migrator/stats.go
+++ b/migrator/stats.go
@@ -240,6 +240,9 @@ func (m *Migrator) migrateStats() (err error) {
 			}
 		}
 	}
+	if m.dryRun || !migrated {
+		return nil
+	}
 	// call the remove function here
 
 	// All done, update version wtih current one
diff --git a/migrator/stats_it_test.go b/migrator/stats_it_test.go
index 0141d96c1..c82d18ff0 100755
--- a/migrator/stats_it_test.go
+++ b/migrator/stats_it_test.go
@@ -372,7 +372,7 @@ func testStsITMigrateFromv1(t *testing.T) {
 		t.Error("Error when setting v1Stat ", err.Error())
 	}
 
-	if err := stsMigrator.dmIN.DataManager().DataDB().SetVersions(engine.Versions{utils.StatS: 1}, true); err != nil {
+	if err := stsMigrator.dmOut.DataManager().DataDB().SetVersions(engine.Versions{utils.StatS: 1}, true); err != nil {
 		t.Errorf("error: <%s> when updating Stats version into dataDB", err.Error())
 	}
 
@@ -380,10 +380,10 @@ func testStsITMigrateFromv1(t *testing.T) {
 		t.Error(err)
 	}
 
-	if vrs, err := stsMigrator.dmIN.DataManager().DataDB().GetVersions(utils.StatS); err != nil {
+	if vrs, err := stsMigrator.dmOut.DataManager().DataDB().GetVersions(utils.StatS); err != nil {
 		t.Errorf("error: <%s> when updating Stats version into dataDB", err.Error())
 	} else if vrs[utils.StatS] != 3 {
-		t.Errorf("Expecting: 3, received: %+v", vrs)
+		t.Errorf("Expecting: 3, received: %+v", vrs[utils.StatS])
 	}
 
 	//from V1 to V2