Update attributes test in apier

2026-02-11 18:16:24 +05:00 · 2018-07-23 10:10:14 -04:00
parent 4a3888b8f0
commit c0cc48bbf8
4 changed files with 52 additions and 57 deletions
--- a/apier/v1/attributes.go
+++ b/apier/v1/attributes.go
@@ -19,6 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 package v1

 import (
+	"fmt"
+
 	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/utils"
 )
@@ -89,8 +91,12 @@ func (alSv1 *AttributeSv1) Call(serviceMethod string,

 // GetAttributeForEvent  returns matching AttributeProfile for Event
 func (alSv1 *AttributeSv1) GetAttributeForEvent(args *engine.AttrArgsProcessEvent,
-	reply *engine.AttributeProfile) error {
-	return alSv1.attrS.V1GetAttributeForEvent(args, reply)
+	reply *engine.AttributeProfile) (err error) {
+	if err = alSv1.attrS.V1GetAttributeForEvent(args, reply); err != nil {
+		return
+	}
+	fmt.Printf("\n###APIER##### ATTR_PRF : %+v , SUBSISTUTE : %+v\n", reply, reply.Attributes[0].Substitute[0])
+	return
 }

 // ProcessEvent will replace event fields with the ones in maching AttributeProfile
--- a/apier/v1/attributes_it_test.go
+++ b/apier/v1/attributes_it_test.go
@@ -47,21 +47,21 @@ var sTestsAlsPrf = []func(t *testing.T){
 	testAttributeSInitCfg,
 	testAttributeSInitDataDb,
 	testAttributeSResetStorDb,
-	//testAttributeSStartEngine,
+	testAttributeSStartEngine,
 	testAttributeSRPCConn,
 	testAttributeSLoadFromFolder,
 	testAttributeSGetAttributeForEvent,
-	// testAttributeSGetAttributeForEventNotFound,
-	// testAttributeSGetAttributeForEventWithMetaAnyContext,
-	// testAttributeSProcessEvent,
-	// testAttributeSProcessEventWithNoneSubstitute,
-	// testAttributeSProcessEventWithNoneSubstitute2,
-	// testAttributeSProcessEventWithNoneSubstitute3,
-	// testAttributeSGetAlsPrfBeforeSet,
-	// testAttributeSSetAlsPrf,
-	// testAttributeSUpdateAlsPrf,
-	// testAttributeSRemAlsPrf,
-	// testAttributeSPing,
+	testAttributeSGetAttributeForEventNotFound,
+	testAttributeSGetAttributeForEventWithMetaAnyContext,
+	testAttributeSProcessEvent,
+	testAttributeSProcessEventWithNoneSubstitute,
+	testAttributeSProcessEventWithNoneSubstitute2,
+	testAttributeSProcessEventWithNoneSubstitute3,
+	testAttributeSGetAlsPrfBeforeSet,
+	testAttributeSSetAlsPrf,
+	testAttributeSUpdateAlsPrf,
+	testAttributeSRemAlsPrf,
+	testAttributeSPing,
 	testAttributeSKillEngine,
 }

@@ -177,13 +177,14 @@ func testAttributeSGetAttributeForEvent(t *testing.T) {
 		},
 		Weight: 10.0,
 	}
-	//eAttrPrf.Compile()
-
+	eAttrPrf.Compile()
 	var attrReply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.AttributeSv1GetAttributeForEvent,
 		ev, &attrReply); err != nil {
 		t.Error(err)
-	} else if !reflect.DeepEqual(eAttrPrf.Attributes[0].Substitute[0], attrReply.Attributes[0].Substitute[0]) {
+	}
+	attrReply.Compile() // Populate private variables in RSRParsers
+	if !reflect.DeepEqual(eAttrPrf.Attributes[0].Substitute[0], attrReply.Attributes[0].Substitute[0]) {
 		t.Errorf("Expecting: %+v, received: %+v", eAttrPrf.Attributes[0].Substitute[0], attrReply.Attributes[0].Substitute[0])
 	}
 }
@@ -215,6 +216,7 @@ func testAttributeSGetAttributeForEventNotFound(t *testing.T) {
 		},
 		Weight: 10.0,
 	}
+	eAttrPrf2.Compile()
 	var result string
 	if err := attrSRPC.Call("ApierV1.SetAttributeProfile", eAttrPrf2, &result); err != nil {
 		t.Error(err)
@@ -225,7 +227,9 @@ func testAttributeSGetAttributeForEventNotFound(t *testing.T) {
 	if err := attrSRPC.Call("ApierV1.GetAttributeProfile",
 		&utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_3"}, &reply); err != nil {
 		t.Error(err)
-	} else if !reflect.DeepEqual(eAttrPrf2, reply) {
+	}
+	reply.Compile()
+	if !reflect.DeepEqual(eAttrPrf2, reply) {
 		t.Errorf("Expecting : %+v, received: %+v", eAttrPrf2, reply)
 	}
 	var attrReply *engine.AttributeProfile
@@ -262,6 +266,7 @@ func testAttributeSGetAttributeForEventWithMetaAnyContext(t *testing.T) {
 		},
 		Weight: 10.0,
 	}
+	eAttrPrf2.Compile()
 	var result string
 	if err := attrSRPC.Call("ApierV1.SetAttributeProfile", eAttrPrf2, &result); err != nil {
 		t.Error(err)
@@ -272,14 +277,18 @@ func testAttributeSGetAttributeForEventWithMetaAnyContext(t *testing.T) {
 	if err := attrSRPC.Call("ApierV1.GetAttributeProfile",
 		&utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_2"}, &reply); err != nil {
 		t.Error(err)
-	} else if !reflect.DeepEqual(eAttrPrf2, reply) {
+	}
+	reply.Compile()
+	if !reflect.DeepEqual(eAttrPrf2, reply) {
 		t.Errorf("Expecting : %+v, received: %+v", eAttrPrf2, reply)
 	}
 	var attrReply *engine.AttributeProfile
 	if err := attrSRPC.Call(utils.AttributeSv1GetAttributeForEvent,
 		ev, &attrReply); err != nil {
 		t.Error(err)
-	} else if !reflect.DeepEqual(eAttrPrf2, attrReply) {
+	}
+	attrReply.Compile()
+	if !reflect.DeepEqual(eAttrPrf2, attrReply) {
 		t.Errorf("Expecting: %s, received: %s", utils.ToJSON(eAttrPrf2), utils.ToJSON(attrReply))
 	}
 }
@@ -363,11 +372,12 @@ func testAttributeSProcessEventWithNoneSubstitute(t *testing.T) {
 				FieldName:  utils.Subject,
 				Initial:    utils.ANY,
 				Substitute: utils.NewRSRParsersMustCompile(utils.META_NONE, true),
-				Append:     true,
+				Append:     false,
 			},
 		},
 		Weight: 20,
 	}
+	alsPrf.Compile()
 	var result string
 	if err := attrSRPC.Call("ApierV1.SetAttributeProfile", alsPrf, &result); err != nil {
 		t.Error(err)
@@ -376,20 +386,7 @@ func testAttributeSProcessEventWithNoneSubstitute(t *testing.T) {
 	}
 	eRply := &engine.AttrSProcessEventReply{
 		MatchedProfiles: []string{"AttributeWithNonSubstitute"},
-		AlteredFields:   []string{utils.Account, utils.Subject},
-		CGREvent: &utils.CGREvent{
-			Tenant:  "cgrates.org",
-			ID:      "testAttributeSWithNoneSubstitute",
-			Context: utils.StringPointer(utils.MetaSessionS),
-			Event: map[string]interface{}{
-				utils.Account:     "1001",
-				utils.Destination: "+491511231234",
-			},
-		},
-	}
-	eRply2 := &engine.AttrSProcessEventReply{
-		MatchedProfiles: []string{"AttributeWithNonSubstitute"},
-		AlteredFields:   []string{utils.Subject, utils.Account},
+		AlteredFields:   []string{utils.Account},
 		CGREvent: &utils.CGREvent{
 			Tenant:  "cgrates.org",
 			ID:      "testAttributeSWithNoneSubstitute",
@@ -400,12 +397,12 @@ func testAttributeSProcessEventWithNoneSubstitute(t *testing.T) {
 			},
 		},
 	}
+
 	var rplyEv engine.AttrSProcessEventReply
 	if err := attrSRPC.Call(utils.AttributeSv1ProcessEvent,
 		ev, &rplyEv); err != nil {
 		t.Error(err)
-	} else if !reflect.DeepEqual(eRply, &rplyEv) &&
-		!reflect.DeepEqual(eRply2, &rplyEv) {
+	} else if !reflect.DeepEqual(eRply, &rplyEv) {
 		t.Errorf("Expecting: %s, received: %s",
 			utils.ToJSON(eRply), utils.ToJSON(rplyEv))
 	}
@@ -497,6 +494,7 @@ func testAttributeSProcessEventWithNoneSubstitute3(t *testing.T) {
 		Context: utils.StringPointer(utils.MetaSessionS),
 		Event: map[string]interface{}{
 			utils.Account:     "1008",
+			utils.Subject:     "1001",
 			utils.Destination: "+491511231234",
 		},
 	}
@@ -533,26 +531,14 @@ func testAttributeSProcessEventWithNoneSubstitute3(t *testing.T) {
 	}
 	eRply := &engine.AttrSProcessEventReply{
 		MatchedProfiles: []string{"AttributeWithNonSubstitute"},
-		AlteredFields:   []string{"Account", "Subject"},
-		CGREvent: &utils.CGREvent{
-			Tenant:  "cgrates.org",
-			ID:      "testAttributeSWithNoneSubstitute",
-			Context: utils.StringPointer(utils.MetaSessionS),
-			Event: map[string]interface{}{
-				utils.Account:     "1001",
-				utils.Destination: "+491511231234",
-			},
-		},
-	}
-	eRply2 := &engine.AttrSProcessEventReply{
-		MatchedProfiles: []string{"AttributeWithNonSubstitute"},
-		AlteredFields:   []string{utils.Subject, utils.Account},
+		AlteredFields:   []string{"Account"},
 		CGREvent: &utils.CGREvent{
 			Tenant:  "cgrates.org",
 			ID:      "testAttributeSWithNoneSubstitute",
 			Context: utils.StringPointer(utils.MetaSessionS),
 			Event: map[string]interface{}{
 				utils.Account:     "1001",
+				utils.Subject:     "1001",
 				utils.Destination: "+491511231234",
 			},
 		},
@@ -561,8 +547,7 @@ func testAttributeSProcessEventWithNoneSubstitute3(t *testing.T) {
 	if err := attrSRPC.Call(utils.AttributeSv1ProcessEvent,
 		ev, &rplyEv); err != nil {
 		t.Error(err)
-	} else if !reflect.DeepEqual(eRply, &rplyEv) &&
-		!reflect.DeepEqual(eRply2, &rplyEv) {
+	} else if !reflect.DeepEqual(eRply, &rplyEv) {
 		t.Errorf("Expecting: %s, received: %s",
 			utils.ToJSON(eRply), utils.ToJSON(rplyEv))
 	}
@@ -588,6 +573,7 @@ func testAttributeSSetAlsPrf(t *testing.T) {
 		},
 		Weight: 20,
 	}
+	alsPrf.Compile()
 	var result string
 	if err := attrSRPC.Call("ApierV1.SetAttributeProfile", alsPrf, &result); err != nil {
 		t.Error(err)
@@ -598,7 +584,9 @@ func testAttributeSSetAlsPrf(t *testing.T) {
 	if err := attrSRPC.Call("ApierV1.GetAttributeProfile",
 		&utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}, &reply); err != nil {
 		t.Error(err)
-	} else if !reflect.DeepEqual(alsPrf, reply) {
+	}
+	reply.Compile()
+	if !reflect.DeepEqual(alsPrf, reply) {
 		t.Errorf("Expecting : %+v, received: %+v", alsPrf, reply)
 	}
 }
@@ -618,6 +606,7 @@ func testAttributeSUpdateAlsPrf(t *testing.T) {
 			Append:     false,
 		},
 	}
+	alsPrf.Compile()
 	var result string
 	if err := attrSRPC.Call("ApierV1.SetAttributeProfile", alsPrf, &result); err != nil {
 		t.Error(err)
@@ -628,7 +617,9 @@ func testAttributeSUpdateAlsPrf(t *testing.T) {
 	if err := attrSRPC.Call("ApierV1.GetAttributeProfile",
 		&utils.TenantID{Tenant: "cgrates.org", ID: "ApierTest"}, &reply); err != nil {
 		t.Error(err)
-	} else if !reflect.DeepEqual(alsPrf, reply) {
+	}
+	reply.Compile()
+	if !reflect.DeepEqual(alsPrf, reply) {
 		t.Errorf("Expecting : %+v, received: %+v", alsPrf, reply)
 	}
 }
--- a/engine/attributes.go
+++ b/engine/attributes.go
@@ -219,7 +219,6 @@ func (alS *AttributeService) V1GetAttributeForEvent(args *AttrArgsProcessEvent,
 		}
 		return err
 	}
-	fmt.Printf("ATTR_PRF : %+v , SUBSISTUTE : %+v", attrPrf, attrPrf.Attributes[0].Substitute[0])
 	*attrPrfl = *attrPrf
 	return
 }
--- a/utils/rsrparser.go
+++ b/utils/rsrparser.go
@@ -190,7 +190,6 @@ func (prsr *RSRParser) Compile() (err error) {
 		return
 	}
 	*prsr = *newPrsr
-	//fmt.Printf("After compile Parser : %+v\n", prsr)
 	return
 }