From 3d3827bbee971ec3e96848853f27788681c86fbc Mon Sep 17 00:00:00 2001
From: ionutboangiu <ionut.boangiu@itsyscom.com>
Date: Thu, 13 Jan 2022 09:35:49 +0200
Subject: [PATCH] Make error handling consistent across Get*Profiles apis

---
 apis/account.go     | 5 +----
 apis/actions.go     | 5 +----
 apis/attributes.go  | 5 +----
 apis/chargers.go    | 5 +----
 apis/dispatchers.go | 5 +----
 apis/rates.go       | 5 +----
 apis/resources.go   | 5 +----
 apis/routes.go      | 5 +----
 8 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/apis/account.go b/apis/account.go
index 148b7d844..8333b75bf 100644
--- a/apis/account.go
+++ b/apis/account.go
@@ -89,10 +89,7 @@ func (admS *AdminSv1) GetAccounts(ctx *context.Context, args *utils.ArgsItemIDs,
 		var acc *utils.Account
 		acc, err = admS.dm.GetAccount(ctx, tnt, accID)
 		if err != nil {
-			if err.Error() != utils.ErrNotFound.Error() {
-				err = utils.NewErrServerError(err)
-			}
-			return
+			return utils.APIErrorHandler(err)
 		}
 		*accs = append(*accs, acc)
 	}
diff --git a/apis/actions.go b/apis/actions.go
index 8e412f605..ed8ace12b 100644
--- a/apis/actions.go
+++ b/apis/actions.go
@@ -90,10 +90,7 @@ func (admS *AdminSv1) GetActionProfiles(ctx *context.Context, args *utils.ArgsIt
 		var ap *engine.ActionProfile
 		ap, err = admS.dm.GetActionProfile(ctx, tnt, actPrfID, true, true, utils.NonTransactional)
 		if err != nil {
-			if err.Error() != utils.ErrNotFound.Error() {
-				err = utils.NewErrServerError(err)
-			}
-			return
+			return utils.APIErrorHandler(err)
 		}
 		*actPrfs = append(*actPrfs, ap)
 	}
diff --git a/apis/attributes.go b/apis/attributes.go
index 4e6f0aef0..5b1ef72c4 100644
--- a/apis/attributes.go
+++ b/apis/attributes.go
@@ -90,10 +90,7 @@ func (admS *AdminSv1) GetAttributeProfiles(ctx *context.Context, args *utils.Arg
 		var ap *engine.AttributeProfile
 		ap, err = admS.dm.GetAttributeProfile(ctx, tnt, attrPrfID, true, true, utils.NonTransactional)
 		if err != nil {
-			if err.Error() != utils.ErrNotFound.Error() {
-				err = utils.NewErrServerError(err)
-			}
-			return
+			return utils.APIErrorHandler(err)
 		}
 		*attrPrfs = append(*attrPrfs, ap)
 	}
diff --git a/apis/chargers.go b/apis/chargers.go
index d3bb0baba..d1d3f77ea 100644
--- a/apis/chargers.go
+++ b/apis/chargers.go
@@ -87,10 +87,7 @@ func (admS *AdminSv1) GetChargerProfiles(ctx *context.Context, args *utils.ArgsI
 		var chgrPrf *engine.ChargerProfile
 		chgrPrf, err = admS.dm.GetChargerProfile(ctx, tnt, chrgPrfID, true, true, utils.NonTransactional)
 		if err != nil {
-			if err.Error() != utils.ErrNotFound.Error() {
-				err = utils.NewErrServerError(err)
-			}
-			return
+			return utils.APIErrorHandler(err)
 		}
 		*chrgPrfs = append(*chrgPrfs, chgrPrf)
 	}
diff --git a/apis/dispatchers.go b/apis/dispatchers.go
index ce35d6525..39e51e3b9 100644
--- a/apis/dispatchers.go
+++ b/apis/dispatchers.go
@@ -88,10 +88,7 @@ func (admS *AdminSv1) GetDispatcherProfiles(ctx *context.Context, args *utils.Ar
 		var dspPrf *engine.DispatcherProfile
 		dspPrf, err = admS.dm.GetDispatcherProfile(ctx, tnt, dspPrfID, true, true, utils.NonTransactional)
 		if err != nil {
-			if err.Error() != utils.ErrNotFound.Error() {
-				err = utils.NewErrServerError(err)
-			}
-			return
+			return utils.APIErrorHandler(err)
 		}
 		*dspPrfs = append(*dspPrfs, dspPrf)
 	}
diff --git a/apis/rates.go b/apis/rates.go
index e2cc40ec6..36eb8967a 100644
--- a/apis/rates.go
+++ b/apis/rates.go
@@ -90,10 +90,7 @@ func (admS *AdminSv1) GetRateProfiles(ctx *context.Context, args *utils.ArgsItem
 		var ratePrf *utils.RateProfile
 		ratePrf, err = admS.dm.GetRateProfile(ctx, tnt, ratePrfID, true, true, utils.NonTransactional)
 		if err != nil {
-			if err.Error() != utils.ErrNotFound.Error() {
-				err = utils.NewErrServerError(err)
-			}
-			return
+			return utils.APIErrorHandler(err)
 		}
 		*ratePrfs = append(*ratePrfs, ratePrf)
 	}
diff --git a/apis/resources.go b/apis/resources.go
index be922fab4..d777fdab6 100644
--- a/apis/resources.go
+++ b/apis/resources.go
@@ -86,10 +86,7 @@ func (admS *AdminSv1) GetResourceProfiles(ctx *context.Context, args *utils.Args
 		var rsPrf *engine.ResourceProfile
 		rsPrf, err = admS.dm.GetResourceProfile(ctx, tnt, rsPrfID, true, true, utils.NonTransactional)
 		if err != nil {
-			if err.Error() != utils.ErrNotFound.Error() {
-				err = utils.NewErrServerError(err)
-			}
-			return
+			return utils.APIErrorHandler(err)
 		}
 		*rsPrfs = append(*rsPrfs, rsPrf)
 	}
diff --git a/apis/routes.go b/apis/routes.go
index 9d42e8aa3..1c4ef235a 100644
--- a/apis/routes.go
+++ b/apis/routes.go
@@ -86,10 +86,7 @@ func (admS *AdminSv1) GetRouteProfiles(ctx *context.Context, args *utils.ArgsIte
 		var rouPrf *engine.RouteProfile
 		rouPrf, err = admS.dm.GetRouteProfile(ctx, tnt, rouPrfID, true, true, utils.NonTransactional)
 		if err != nil {
-			if err.Error() != utils.ErrNotFound.Error() {
-				err = utils.NewErrServerError(err)
-			}
-			return
+			return utils.APIErrorHandler(err)
 		}
 		*rouPrfs = append(*rouPrfs, rouPrf)
 	}