Clean code after merge

apier/v1/filter_indexes.go

@@ -199,7 +199,8 @@ func (self *ApierV1) GetFilterReverseIndexes(arg AttrGetFilterReverseIndexes, re
 			}
 		}
 	} else {
-		indexes, err = self.DataManager.GetFilterReverseIndexes(utils.PrefixToRevIndexCache[arg.ItemType], key, nil)
+		indexes, err = self.DataManager.GetFilterReverseIndexes(
+			utils.PrefixToRevIndexCache[arg.ItemType], key, nil)
 		if err != nil {
 			return err
 		}
@@ -743,7 +744,7 @@ func (self *ApierV1) computeSupplierIndexes(tenant string, sppIDs *[]string, tra
 		if err := sppIndexers.StoreIndexes(true, transactionID); err != nil {
 			return nil, err
 		}
-		return nil, err
+		return nil, nil
 	} else {
 		if err := sppIndexers.StoreIndexes(false, transactionID); err != nil {
 			return nil, err

apier/v1/filter_indexes_it_test.go

@@ -235,7 +235,7 @@ func testV1FIdxSetThresholdProfile(t *testing.T) {
 		tenant); err != nil {
 		t.Error(err)
 	}
-	if err := onStor.RemoveFilterReverseIndexes(utils.PrefixToIndexCache[utils.ThresholdProfilePrefix],
+	if err := onStor.RemoveFilterReverseIndexes(utils.PrefixToRevIndexCache[utils.ThresholdProfilePrefix],
 		tenant); err != nil {
 		t.Error(err)
 	}
@@ -243,7 +243,7 @@ func testV1FIdxSetThresholdProfile(t *testing.T) {
 		tenant, engine.MetaString, nil); err != utils.ErrNotFound {
 		t.Error(err)
 	}
-	if _, err = onStor.GetFilterReverseIndexes(utils.PrefixToIndexCache[utils.ThresholdProfilePrefix],
+	if _, err = onStor.GetFilterReverseIndexes(utils.PrefixToRevIndexCache[utils.ThresholdProfilePrefix],
 		tenant, nil); err != nil && err != utils.ErrNotFound {
 		t.Error(err)
 	}
@@ -253,7 +253,6 @@ func testV1FIdxComputeThresholdsIndexes(t *testing.T) {
 	tenant := "cgrates.org"
 	var reply2 string
 	emptySlice := []string{}
-<<<<<<< HEAD
 	if err := tFIdxRpc.Call(utils.ApierV1ComputeFilterIndexes,
 		utils.ArgsComputeFilterIndexes{
 			Tenant:       tenant,
@@ -263,16 +262,6 @@ func testV1FIdxComputeThresholdsIndexes(t *testing.T) {
 			StatIDs:      &emptySlice,
 			SupplierIDs:  &emptySlice,
 		}, &reply2); err != nil {
-=======
-	if err := tFIdxRpc.Call(utils.ApierV1ComputeFilterIndexes, utils.ArgsComputeFilterIndexes{
-		Tenant:       tenant,
-		ThresholdIDs: nil,
-		AttributeIDs: &emptySlice,
-		ResourceIDs:  &emptySlice,
-		StatIDs:      &emptySlice,
-		SupplierIDs:  &emptySlice,
-	}, &reply2); err != nil {
->>>>>>> Update ComputeFilterIndexer to consider transactionID
 		t.Error(err)
 	}
 	if reply2 != utils.OK {

apier/v1/sessions_thresholds_it_test.go

@@ -171,7 +171,7 @@ func TestSessionSv1ItGetThreshold(t *testing.T) {
 func TestSessionSv1ItAuth(t *testing.T) {
 	args := &sessions.V1AuthorizeArgs{
 		AuthorizeResources: true,
-		ProcessThreshold:   utils.BoolPointer(true),
+		ProcessThresholds:  utils.BoolPointer(true),
 		CGREvent: utils.CGREvent{
 			Tenant: "cgrates.org",
 			ID:     "TestSSv1ItAuth",
@@ -236,7 +236,7 @@ func TestSessionSv1ItInitiateSession(t *testing.T) {
 		InitSession:       true,
 		AllocateResources: true,
 		GetAttributes:     true,
-		ProcessThreshold:  utils.BoolPointer(true),
+		ProcessThresholds: utils.BoolPointer(true),
 		CGREvent: utils.CGREvent{
 			Tenant: "cgrates.org",
 			ID:     "TestSSv1ItInitiateSession",
@@ -296,9 +296,9 @@ func TestSessionSv1ItInitiateSession(t *testing.T) {
 
 func TestSessionSv1ItTerminateSession(t *testing.T) {
 	args := &sessions.V1TerminateSessionArgs{
-		TerminateSession: true,
-		ReleaseResources: true,
-		ProcessThreshold: utils.BoolPointer(true),
+		TerminateSession:  true,
+		ReleaseResources:  true,
+		ProcessThresholds: utils.BoolPointer(true),
 		CGREvent: utils.CGREvent{
 			Tenant: "cgrates.org",
 			ID:     "TestSSv1ItTerminateSession",

data/conf/samples/tutmongo/cgrates.json

@@ -17,6 +17,7 @@
 
 "data_db": {
 	"db_type": "mongo",
+	"db_name": "10",
 	"db_port": 27017,
 },
 

engine/datamanager.go

@@ -480,7 +480,6 @@ func (dm *DataManager) SetThresholdProfile(th *ThresholdProfile, withIndex bool)
 		if err = indexer.StoreIndexes(true, utils.NonTransactional); err != nil {
 			return
 		}
-		Cache.Clear([]string{utils.CacheEventResources})
 	}
 	return
 }

engine/storage_mongo_datadb.go

@@ -2096,8 +2096,8 @@ func (ms *MongoStorage) SetFilterReverseIndexesDrv(cacheID, itemIDPrefix string,
 		pairs := []interface{}{}
 		for key, itmMp := range revIdx {
 			param := fmt.Sprintf("value.%s", key)
-			pairs = append(pairs, bson.M{"key": dbKey})
-			pairs = append(pairs, bson.M{"$set": bson.M{"key": dbKey,
+			pairs = append(pairs, bson.M{"key": originKey})
+			pairs = append(pairs, bson.M{"$set": bson.M{"key": originKey,
 				param: itmMp.Slice()}})
 		}
 		if len(pairs) != 0 {