From 9d3e5e62a6c9c9f521b65966a5e8eb1bf7ceb19b Mon Sep 17 00:00:00 2001
From: ionutboangiu <ionut.boangiu@itsyscom.com>
Date: Fri, 22 Nov 2024 16:23:01 +0200
Subject: [PATCH] Implement getter method for EventExporterCfg (by ID)

Removed redundant getter method for default EventExporterCfg.
---
 config/eescfg.go      | 12 +++++++-----
 config/erscfg.go      | 10 +++++-----
 config/erscfg_test.go | 10 ----------
 ees/rpc_test.go       | 10 +++++-----
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/config/eescfg.go b/config/eescfg.go
index cfed87491..47849a4aa 100644
--- a/config/eescfg.go
+++ b/config/eescfg.go
@@ -32,11 +32,13 @@ type EEsCfg struct {
 	Exporters       []*EventExporterCfg
 }
 
-// GetDefaultExporter returns the exporter with the *default id
-func (eeS *EEsCfg) GetDefaultExporter() *EventExporterCfg {
-	for _, es := range eeS.Exporters {
-		if es.ID == utils.MetaDefault {
-			return es
+// ExporterCfg iterates over the Exporters slice and returns the exporter
+// configuration associated with the specified "id". If none were found, the
+// method will return nil.
+func (eeS *EEsCfg) ExporterCfg(id string) *EventExporterCfg {
+	for _, eeCfg := range eeS.Exporters {
+		if eeCfg.ID == id {
+			return eeCfg
 		}
 	}
 	return nil
diff --git a/config/erscfg.go b/config/erscfg.go
index 4fdecbf33..e641ddd44 100644
--- a/config/erscfg.go
+++ b/config/erscfg.go
@@ -35,12 +35,12 @@ type ERsCfg struct {
 	PartialCacheTTL  time.Duration
 }
 
-// ReaderCfg iterates over the Readers slice and returns if it finds any
-// reader configuration where the ID is equal to the "ID" parameter. If
-// none were found, the method will return nil.
-func (erS *ERsCfg) ReaderCfg(ID string) *EventReaderCfg {
+// ReaderCfg iterates over the Readers slice and returns the reader
+// configuration associated with the specified "id". If none were found, the
+// method will return nil.
+func (erS *ERsCfg) ReaderCfg(id string) *EventReaderCfg {
 	for _, rdr := range erS.Readers {
-		if rdr.ID == ID {
+		if rdr.ID == id {
 			return rdr
 		}
 	}
diff --git a/config/erscfg_test.go b/config/erscfg_test.go
index 2da4ac51e..dac7afa0d 100644
--- a/config/erscfg_test.go
+++ b/config/erscfg_test.go
@@ -1410,16 +1410,6 @@ func TestERsloadFromJsonCfg(t *testing.T) {
 		t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expectedERsCfg), utils.ToJSON(cfgCgr.ersCfg))
 	}
 }
-func TestGetDefaultExporter(t *testing.T) {
-	ees := new(EEsCfg)
-	if dft := ees.GetDefaultExporter(); dft != nil {
-		t.Fatalf("Expected no default cfg, received: %s", utils.ToJSON(dft))
-	}
-	cfgCgr := NewDefaultCGRConfig()
-	if dft := cfgCgr.EEsCfg().GetDefaultExporter(); dft == nil || dft.ID != utils.MetaDefault {
-		t.Fatalf("Unexpected default cfg returned: %s", utils.ToJSON(dft))
-	}
-}
 func TestEventReaderOptsCfg(t *testing.T) {
 	erCfg := new(EventReaderCfg)
 	if err := erCfg.Opts.loadFromJSONCfg(nil); err != nil {
diff --git a/ees/rpc_test.go b/ees/rpc_test.go
index a74a000e5..f067617a0 100644
--- a/ees/rpc_test.go
+++ b/ees/rpc_test.go
@@ -30,7 +30,7 @@ import (
 )
 
 func TestNewRpcEE(t *testing.T) {
-	eeSCfg := config.NewDefaultCGRConfig().EEsCfg().GetDefaultExporter()
+	eeSCfg := config.NewDefaultCGRConfig().EEsCfg().ExporterCfg(utils.MetaDefault)
 	dc, err := newEEMetrics("Local")
 	if err != nil {
 		t.Error(err)
@@ -103,7 +103,7 @@ func TestRPCCfg(t *testing.T) {
 }
 
 func TestRPCConnect(t *testing.T) {
-	eeSCfg := config.NewDefaultCGRConfig().EEsCfg().GetDefaultExporter()
+	eeSCfg := config.NewDefaultCGRConfig().EEsCfg().ExporterCfg(utils.MetaDefault)
 	dc, err := newEEMetrics("Local")
 	if err != nil {
 		t.Error(err)
@@ -119,7 +119,7 @@ func TestRPCConnect(t *testing.T) {
 }
 
 func TestRPCClose(t *testing.T) {
-	eeSCfg := config.NewDefaultCGRConfig().EEsCfg().GetDefaultExporter()
+	eeSCfg := config.NewDefaultCGRConfig().EEsCfg().ExporterCfg(utils.MetaDefault)
 	dc, err := newEEMetrics("Local")
 	if err != nil {
 		t.Error(err)
@@ -138,7 +138,7 @@ func TestRPCClose(t *testing.T) {
 }
 
 func TestRPCGetMetrics(t *testing.T) {
-	eeSCfg := config.NewDefaultCGRConfig().EEsCfg().GetDefaultExporter()
+	eeSCfg := config.NewDefaultCGRConfig().EEsCfg().ExporterCfg(utils.MetaDefault)
 	dc := &utils.SafeMapStorage{
 		MapStorage: utils.MapStorage{
 			"time":         "now",
@@ -157,7 +157,7 @@ func TestRPCGetMetrics(t *testing.T) {
 }
 
 func TestRPCPrepareMap(t *testing.T) {
-	eeSCfg := config.NewDefaultCGRConfig().EEsCfg().GetDefaultExporter()
+	eeSCfg := config.NewDefaultCGRConfig().EEsCfg().ExporterCfg(utils.MetaDefault)
 	dc, err := newEEMetrics("Local")
 	if err != nil {
 		t.Error(err)