From 7c02a8ec14aadf7bbcfab10618d58a72eb12ab28 Mon Sep 17 00:00:00 2001
From: porosnicuadrian <adrian.porosnicu@itsyscom.com>
Date: Fri, 12 Feb 2021 18:03:38 +0200
Subject: [PATCH] Removed APIAccountProfileWithCache struct

---
 accounts/accounts.go        | 2 +-
 apier/v1/accountprofiles.go | 2 +-
 engine/filterhelpers.go     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/accounts/accounts.go b/accounts/accounts.go
index 43280a9e7..9b7fd5950 100644
--- a/accounts/accounts.go
+++ b/accounts/accounts.go
@@ -130,7 +130,7 @@ func (aS *AccountS) matchingAccountForEvent(tnt string, cgrEv *utils.CGREvent,
 			}
 			continue
 		}
-		if acnt == nil || acnt.Weight < qAcnt.Weight {
+		if acnt == nil {
 			acnt = qAcnt
 			if lked {
 				if lkID != utils.EmptyString {
diff --git a/apier/v1/accountprofiles.go b/apier/v1/accountprofiles.go
index 8b17c268b..3a2bd53e6 100644
--- a/apier/v1/accountprofiles.go
+++ b/apier/v1/accountprofiles.go
@@ -88,7 +88,7 @@ func (apierSv1 *APIerSv1) GetAccountProfileIDsCount(args *utils.TenantWithOpts,
 }
 
 type APIAccountProfileWithCache struct {
-	*utils.APIAccountProfileWithOpts
+	*utils.APIAccountProfile
 	Cache *string
 }
 
diff --git a/engine/filterhelpers.go b/engine/filterhelpers.go
index 6870f77ac..1323527d6 100644
--- a/engine/filterhelpers.go
+++ b/engine/filterhelpers.go
@@ -104,7 +104,7 @@ func MatchingItemIDsForEvent(ev utils.MapStorage, stringFldIDs, prefixFldIDs, su
 
 // Weight returns weight of the first matching DynamicWeight
 func WeightFromDynamics(dWs []*utils.DynamicWeight,
-	fltrS FilterS, tnt string, ev utils.DataProvider) (wg float64, err error) {
+	fltrS *FilterS, tnt string, ev utils.DataProvider) (wg float64, err error) {
 	for _, dW := range dWs {
 		var pass bool
 		if pass, err = fltrS.Pass(tnt, dW.FilterIDs, ev); err != nil {