From 2e300def4615818801724084f420c6f8bb12a16b Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Tue, 13 Apr 2021 10:31:35 +0300
Subject: [PATCH] Updated Attribute APIs

---
 apis/attributes.go      | 40 ++++++++++++++++------------------------
 engine/libattributes.go | 27 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/apis/attributes.go b/apis/attributes.go
index bde5aac4b..dfaaa2126 100644
--- a/apis/attributes.go
+++ b/apis/attributes.go
@@ -27,7 +27,7 @@ import (
 )
 
 // GetAttributeProfile returns an Attribute Profile based on the tenant and ID received
-func (admS *AdminS) GetAttributeProfile(ctx *context.Context, arg *utils.TenantIDWithAPIOpts, reply *engine.AttributeProfile) (err error) {
+func (admS *AdminS) GetAttributeProfile(ctx *context.Context, arg *utils.TenantIDWithAPIOpts, reply *engine.APIAttributeProfile) (err error) {
 	if missing := utils.MissingStructFields(arg, []string{utils.ID}); len(missing) != 0 { //Params missing
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
@@ -42,7 +42,8 @@ func (admS *AdminS) GetAttributeProfile(ctx *context.Context, arg *utils.TenantI
 		}
 		return
 	}
-	*reply = *alsPrf
+	attr := engine.NewAPIAttributeProfile(alsPrf)
+	*reply = *attr
 	return nil
 }
 
@@ -87,37 +88,28 @@ func (admS *AdminS) GetAttributeProfileIDsCount(ctx *context.Context, args *util
 	return
 }
 
-// SetAttributeProfile add/update a new Attribute Profile
-func (admS *AdminS) SetAttributeProfile(ctx *context.Context, alsWrp *engine.AttributeProfileWithAPIOpts, reply *string) error {
-	if missing := utils.MissingStructFields(alsWrp.AttributeProfile, []string{utils.ID, utils.Attributes}); len(missing) != 0 {
+//SetAttributeProfile add/update a new Attribute Profile
+func (admS *AdminS) SetAttributeProfile(ctx *context.Context, arg *engine.AttributeWithAPIOpts, reply *string) error {
+	if missing := utils.MissingStructFields(arg.APIAttributeProfile, []string{utils.ID}); len(missing) != 0 {
 		return utils.NewErrMandatoryIeMissing(missing...)
 	}
-	if alsWrp.Tenant == utils.EmptyString {
-		alsWrp.Tenant = admS.cfg.GeneralCfg().DefaultTenant
+	if arg.Tenant == utils.EmptyString {
+		arg.Tenant = admS.cfg.GeneralCfg().DefaultTenant
 	}
-	for _, attr := range alsWrp.Attributes {
-		if attr.Path == utils.EmptyString {
-			return utils.NewErrMandatoryIeMissing("Path")
-		}
-		for _, sub := range attr.Value {
-			if sub.Rules == utils.EmptyString {
-				return utils.NewErrMandatoryIeMissing("Rules")
-			}
-			if err := sub.Compile(); err != nil {
-				return utils.NewErrServerError(err)
-			}
-		}
+	alsPrf, err := arg.APIAttributeProfile.AsAttributeProfile()
+	if err != nil {
+		return utils.APIErrorHandler(err)
 	}
-	if err := admS.dm.SetAttributeProfile(ctx, alsWrp.AttributeProfile, true); err != nil {
+	if err := admS.dm.SetAttributeProfile(ctx, alsPrf, true); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	//generate a loadID for CacheAttributeProfiles and store it in database
-	if err := admS.dm.SetLoadIDs(ctx, map[string]int64{utils.CacheAttributeProfiles: time.Now().UnixNano()}); err != nil {
+	if err := admS.dm.SetLoadIDs(ctx,
+		map[string]int64{utils.CacheAttributeProfiles: time.Now().UnixNano()}); err != nil {
 		return utils.APIErrorHandler(err)
 	}
-
-	if err := admS.CallCache(ctx, utils.IfaceAsString(alsWrp.APIOpts[utils.CacheOpt]), alsWrp.Tenant, utils.CacheAttributeProfiles,
-		alsWrp.TenantID(), &alsWrp.FilterIDs, alsWrp.Contexts, alsWrp.APIOpts); err != nil {
+	if err := admS.CallCache(ctx, utils.IfaceAsString(arg.APIOpts[utils.CacheOpt]), alsPrf.Tenant, utils.CacheAttributeProfiles,
+		alsPrf.TenantID(), &alsPrf.FilterIDs, alsPrf.Contexts, arg.APIOpts); err != nil {
 		return utils.APIErrorHandler(err)
 	}
 	*reply = utils.OK
diff --git a/engine/libattributes.go b/engine/libattributes.go
index 645ad9506..88950f72b 100644
--- a/engine/libattributes.go
+++ b/engine/libattributes.go
@@ -100,6 +100,33 @@ type APIAttributeProfile struct {
 	Weight             float64
 }
 
+type AttributeWithAPIOpts struct {
+	*APIAttributeProfile
+	APIOpts map[string]interface{}
+}
+
+func NewAPIAttributeProfile(attr *AttributeProfile) (ext *APIAttributeProfile) {
+	ext = &APIAttributeProfile{
+		Tenant:             attr.Tenant,
+		ID:                 attr.ID,
+		Contexts:           attr.Contexts,
+		FilterIDs:          attr.FilterIDs,
+		ActivationInterval: attr.ActivationInterval,
+		Attributes:         make([]*ExternalAttribute, len(attr.Attributes)),
+		Blocker:            attr.Blocker,
+		Weight:             attr.Weight,
+	}
+	for i, at := range attr.Attributes {
+		ext.Attributes[i] = &ExternalAttribute{
+			FilterIDs: at.FilterIDs,
+			Path:      at.Path,
+			Type:      at.Type,
+			Value:     at.Value.GetRule(utils.InfieldSep),
+		}
+	}
+	return
+}
+
 // AsAttributeProfile converts the external attribute format to the actual AttributeProfile
 func (ext *APIAttributeProfile) AsAttributeProfile() (attr *AttributeProfile, err error) {
 	attr = new(AttributeProfile)