From bb0803bd96055c5f51c71f46b9fc8b6aebaed993 Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Thu, 6 Feb 2020 10:19:55 +0200
Subject: [PATCH] Correctly send destination with "+" when GetCDR for mongo

---
 apier/v2/cdrs_it_test.go       | 40 ++++++++++++++++++++++++++++++++++
 engine/storage_mongo_stordb.go |  3 +++
 2 files changed, 43 insertions(+)

diff --git a/apier/v2/cdrs_it_test.go b/apier/v2/cdrs_it_test.go
index 8b82ad4d2..fe2bbac1c 100644
--- a/apier/v2/cdrs_it_test.go
+++ b/apier/v2/cdrs_it_test.go
@@ -64,6 +64,8 @@ var (
 		testV2CDRsProcessCDRWithThreshold,
 		testV2CDRsGetThreshold,
 
+		testv2CDRsGetCDRsDest,
+
 		testV2CDRsKillEngine,
 	}
 )
@@ -796,6 +798,44 @@ func testV2CDRsGetThreshold(t *testing.T) {
 	}
 }
 
+func testv2CDRsGetCDRsDest(t *testing.T) {
+	args := &engine.ArgV1ProcessEvent{
+		Flags: []string{utils.MetaStore},
+		CGREvent: utils.CGREvent{
+			Tenant: "cgrates.org",
+			Event: map[string]interface{}{
+				utils.CGRID:       "9b3cd5e698af94f8916220866c831a982ed16318",
+				utils.ToR:         utils.VOICE,
+				utils.RunID:       utils.MetaRaw,
+				utils.OriginID:    "25160047719:0",
+				utils.OriginHost:  "192.168.1.1",
+				utils.Source:      "*sessions",
+				utils.RequestType: utils.META_NONE,
+				utils.Category:    "call",
+				utils.Account:     "1001",
+				utils.Subject:     "1001",
+				utils.Destination: "+4915117174963",
+				utils.AnswerTime:  time.Date(2018, 8, 24, 16, 00, 26, 0, time.UTC),
+				utils.Usage:       100 * time.Minute,
+			},
+		},
+	}
+	var reply string
+	if err := cdrsRpc.Call(utils.CDRsV1ProcessEvent, args, &reply); err != nil {
+		t.Error("Unexpected error: ", err.Error())
+	} else if reply != utils.OK {
+		t.Error("Unexpected reply received: ", reply)
+	}
+
+	var cdrs []*engine.ExternalCDR
+	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, utils.RPCCDRsFilter{DestinationPrefixes: []string{"+4915117174963"}},
+		&cdrs); err != nil {
+		t.Error("Unexpected error: ", err.Error())
+	} else if len(cdrs) != 3 {
+		t.Error("Unexpected number of CDRs returned: ", len(reply))
+	}
+}
+
 func testV2CDRsKillEngine(t *testing.T) {
 	if err := engine.KillEngine(*waitRater); err != nil {
 		t.Error(err)
diff --git a/engine/storage_mongo_stordb.go b/engine/storage_mongo_stordb.go
index b121341bd..d93440a54 100644
--- a/engine/storage_mongo_stordb.go
+++ b/engine/storage_mongo_stordb.go
@@ -1033,6 +1033,9 @@ func (ms *MongoStorage) GetCDRs(qryFltr *utils.CDRsFilter, remove bool) ([]*CDR,
 			if len(prefix) == 0 {
 				continue
 			}
+			if strings.HasPrefix(prefix, "+") {
+				prefix = "\\" + prefix
+			}
 			if len(regexpRule) != 0 {
 				regexpRule += "|"
 			}