From 1db0390b16c73eaf5a27a7b303a61027f15ca792 Mon Sep 17 00:00:00 2001
From: ionutboangiu <ionut.boangiu@itsyscom.com>
Date: Mon, 19 Jul 2021 16:46:39 +0300
Subject: [PATCH] Change utils.PrefixSliceItems function signature to start
 with prefix

---
 engine/resources.go        |  2 +-
 engine/z_resources_test.go |  4 ++--
 utils/slice.go             | 10 ++++++----
 utils/slice_test.go        |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/engine/resources.go b/engine/resources.go
index 494154247..728990eeb 100644
--- a/engine/resources.go
+++ b/engine/resources.go
@@ -297,7 +297,7 @@ func (rs Resources) resIDsMp() (mp utils.StringSet) {
 	return mp
 }
 
-func (rs Resources) tenatIDs() []string {
+func (rs Resources) tenantIDs() []string {
 	ids := make([]string, len(rs))
 	for i, r := range rs {
 		ids[i] = r.TenantID()
diff --git a/engine/z_resources_test.go b/engine/z_resources_test.go
index 562bb718d..5cf012579 100644
--- a/engine/z_resources_test.go
+++ b/engine/z_resources_test.go
@@ -2236,7 +2236,7 @@ func TestResourceResIDsMp(t *testing.T) {
 		t.Errorf("Expecting: %+v, received: %+v", expected, rcv)
 	}
 }
-func TestResourceTenatIDs(t *testing.T) {
+func TestResourceTenantIDs(t *testing.T) {
 	resprf := []*ResourceProfile{
 		{
 			Tenant:    config.CgrConfig().GeneralCfg().DefaultTenant,
@@ -2306,7 +2306,7 @@ func TestResourceTenatIDs(t *testing.T) {
 		"cgrates.org:ResourceProfile2",
 		"cgrates.org:ResourceProfile3",
 	}
-	if rcv := resourceTest.tenatIDs(); !reflect.DeepEqual(rcv, expected) {
+	if rcv := resourceTest.tenantIDs(); !reflect.DeepEqual(rcv, expected) {
 		t.Errorf("Expecting: %+v, received: %+v", expected, rcv)
 	}
 }
diff --git a/utils/slice.go b/utils/slice.go
index 808213068..1584cedc5 100644
--- a/utils/slice.go
+++ b/utils/slice.go
@@ -37,10 +37,12 @@ func SliceHasMember(ss []string, s string) bool {
 }
 
 // PrefixSliceItems iterates through slice and add a prefix before every element
-func PrefixSliceItems(slc []string, prfx string) (out []string) {
-	out = make([]string, len(slc))
-	for i, itm := range slc {
-		out[i] = prfx + itm
+func PrefixSliceItems(prfx string, slc []string) (out []string) {
+	out = make([]string, 0, len(slc))
+	for _, itm := range slc {
+		if itm != EmptyString {
+			out = append(out, prfx+itm)
+		}
 	}
 	return
 }
diff --git a/utils/slice_test.go b/utils/slice_test.go
index 69a0b40eb..ad2ae0a30 100644
--- a/utils/slice_test.go
+++ b/utils/slice_test.go
@@ -60,7 +60,7 @@ func TestHasPrefixSlice(t *testing.T) {
 }
 
 func TestPrefixSliceItems(t *testing.T) {
-	rcv := PrefixSliceItems([]string{"1", "2", "3", "4", "5"}, "*")
+	rcv := PrefixSliceItems("*", []string{"1", "2", "3", "4", "5"})
 	sort.Strings(rcv)
 	eOut := []string{"*1", "*2", "*3", "*4", "*5"}
 	if !reflect.DeepEqual(eOut, rcv) {