add config methods for *rates in sessions opts

2026-02-23 08:08:45 +05:00 · 2026-02-19 07:51:35 -05:00
parent babb50f748
commit 34ab081b33
7 changed files with 176 additions and 3 deletions
--- a/config/config.go
+++ b/config/config.go
@@ -148,6 +148,7 @@ func newCGRConfig(config []byte) (cfg *CGRConfig, err error) {
 			DefaultUsage: make(map[string]time.Duration),
 			Opts: &SessionsOpts{
 				Accounts:               []*DynamicBoolOpt{{value: SessionsAccountsDftOpt}},
+				Rates:                  []*DynamicBoolOpt{{value: SessionsRatesDftOpt}},
 				Attributes:             []*DynamicBoolOpt{{value: SessionsAttributesDftOpt}},
 				CDRs:                   []*DynamicBoolOpt{{value: SessionsCDRsDftOpt}},
 				Chargers:               []*DynamicBoolOpt{{value: SessionsChargersDftOpt}},
--- a/config/config_defaults.go
+++ b/config/config_defaults.go
@@ -701,6 +701,13 @@ const CGRATES_CFG_JSON = `
 		// 		"Value": false
 		// 	}
 		// ],
+		//  "*rates": [
+        //  {
+        //      "Tenant": "*any",
+        //      "FilterIDs": [],
+        //      "Value": false
+        //  }
+        // ],
 		// "*attributes": [
 		// 	{
 		// 		"Tenant": "*any",
--- a/config/config_it_test.go
+++ b/config/config_it_test.go
@@ -852,6 +852,7 @@ func testCGRConfigReloadConfigFromJSONSessionS(t *testing.T) {
 		},
 		Opts: &SessionsOpts{
 			Accounts:               []*DynamicBoolOpt{{}},
+			Rates:                  []*DynamicBoolOpt{{}},
 			Attributes:             []*DynamicBoolOpt{{}},
 			CDRs:                   []*DynamicBoolOpt{{}},
 			Chargers:               []*DynamicBoolOpt{{}},
@@ -950,6 +951,7 @@ func testCGRConfigReloadConfigFromStringSessionS(t *testing.T) {
 		},
 		Opts: &SessionsOpts{
 			Accounts:               []*DynamicBoolOpt{{}},
+			Rates:                  []*DynamicBoolOpt{{}},
 			Attributes:             []*DynamicBoolOpt{{}},
 			CDRs:                   []*DynamicBoolOpt{{}},
 			Chargers:               []*DynamicBoolOpt{{}},
@@ -993,7 +995,7 @@ func testCGRConfigReloadConfigFromStringSessionS(t *testing.T) {
 	}

 	var rcv string
-	expected := `{"sessions":{"accounts_conns":[],"actions_conns":[],"alterable_fields":[],"attributes_conns":["*localhost"],"cdrs_conns":["*internal"],"channel_sync_interval":"0","chargers_conns":["*localhost"],"client_protocol":1,"default_usage":{"*any":"3h0m0s","*data":"1048576","*sms":"1","*voice":"3h0m0s"},"enabled":true,"ips_conns":["*localhost"],"listen_bigob":"","listen_bijson":"127.0.0.1:2014","min_dur_low_balance":"0","opts":{"*accounts":[{"FilterIDs":null,"Tenant":""}],"*accountsForceUsage":[],"*attributes":[{"FilterIDs":null,"Tenant":""}],"*attributesDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*blockerError":[{"FilterIDs":null,"Tenant":""}],"*cdrs":[{"FilterIDs":null,"Tenant":""}],"*cdrsDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*chargeable":[{"FilterIDs":null,"Tenant":""}],"*chargers":[{"FilterIDs":null,"Tenant":""}],"*debitInterval":[{"FilterIDs":null,"Tenant":""}],"*forceUsage":[],"*initiate":[{"FilterIDs":null,"Tenant":""}],"*ips":[{"FilterIDs":null,"Tenant":""}],"*ipsAllocate":[{"FilterIDs":null,"Tenant":""}],"*ipsAuthorize":[{"FilterIDs":null,"Tenant":""}],"*ipsRelease":[{"FilterIDs":null,"Tenant":""}],"*maxUsage":[{"FilterIDs":null,"Tenant":""}],"*message":[{"FilterIDs":null,"Tenant":""}],"*originID":[],"*resources":[{"FilterIDs":null,"Tenant":""}],"*resourcesAllocate":[{"FilterIDs":null,"Tenant":""}],"*resourcesAuthorize":[{"FilterIDs":null,"Tenant":""}],"*resourcesDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*resourcesRelease":[{"FilterIDs":null,"Tenant":""}],"*routes":[{"FilterIDs":null,"Tenant":""}],"*routesDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*stats":[{"FilterIDs":null,"Tenant":""}],"*statsDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*terminate":[{"FilterIDs":null,"Tenant":""}],"*thresholds":[{"FilterIDs":null,"Tenant":""}],"*thresholdsDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*ttl":[{"FilterIDs":null,"Tenant":""}],"*ttlLastUsage":[],"*ttlLastUsed":[],"*ttlMaxDelay":[{"FilterIDs":null,"Tenant":""}],"*ttlUsage":[],"*update":[{"FilterIDs":null,"Tenant":""}]},"rates_conns":[],"replication_conns":[],"resources_conns":["*localhost"],"routes_conns":["*localhost"],"session_indexes":[],"stats_conns":[],"stir":{"allowed_attest":["*any"],"default_attest":"A","payload_maxduration":"-1","privatekey_path":"","publickey_path":""},"store_session_costs":false,"terminate_attempts":5,"thresholds_conns":[]}}`
+	expected := `{"sessions":{"accounts_conns":[],"actions_conns":[],"alterable_fields":[],"attributes_conns":["*localhost"],"cdrs_conns":["*internal"],"channel_sync_interval":"0","chargers_conns":["*localhost"],"client_protocol":1,"default_usage":{"*any":"3h0m0s","*data":"1048576","*sms":"1","*voice":"3h0m0s"},"enabled":true,"ips_conns":["*localhost"],"listen_bigob":"","listen_bijson":"127.0.0.1:2014","min_dur_low_balance":"0","opts":{"*accounts":[{"FilterIDs":null,"Tenant":""}],"*accountsForceUsage":[],"*attributes":[{"FilterIDs":null,"Tenant":""}],"*attributesDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*blockerError":[{"FilterIDs":null,"Tenant":""}],"*cdrs":[{"FilterIDs":null,"Tenant":""}],"*cdrsDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*chargeable":[{"FilterIDs":null,"Tenant":""}],"*chargers":[{"FilterIDs":null,"Tenant":""}],"*debitInterval":[{"FilterIDs":null,"Tenant":""}],"*forceUsage":[],"*initiate":[{"FilterIDs":null,"Tenant":""}],"*ips":[{"FilterIDs":null,"Tenant":""}],"*ipsAllocate":[{"FilterIDs":null,"Tenant":""}],"*ipsAuthorize":[{"FilterIDs":null,"Tenant":""}],"*ipsRelease":[{"FilterIDs":null,"Tenant":""}],"*maxUsage":[{"FilterIDs":null,"Tenant":""}],"*message":[{"FilterIDs":null,"Tenant":""}],"*originID":[],"*rates":[{"FilterIDs":null,"Tenant":""}],"*resources":[{"FilterIDs":null,"Tenant":""}],"*resourcesAllocate":[{"FilterIDs":null,"Tenant":""}],"*resourcesAuthorize":[{"FilterIDs":null,"Tenant":""}],"*resourcesDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*resourcesRelease":[{"FilterIDs":null,"Tenant":""}],"*routes":[{"FilterIDs":null,"Tenant":""}],"*routesDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*stats":[{"FilterIDs":null,"Tenant":""}],"*statsDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*terminate":[{"FilterIDs":null,"Tenant":""}],"*thresholds":[{"FilterIDs":null,"Tenant":""}],"*thresholdsDerivedReply":[{"FilterIDs":null,"Tenant":""}],"*ttl":[{"FilterIDs":null,"Tenant":""}],"*ttlLastUsage":[],"*ttlLastUsed":[],"*ttlMaxDelay":[{"FilterIDs":null,"Tenant":""}],"*ttlUsage":[],"*update":[{"FilterIDs":null,"Tenant":""}]},"rates_conns":[],"replication_conns":[],"resources_conns":["*localhost"],"routes_conns":["*localhost"],"session_indexes":[],"stats_conns":[],"stir":{"allowed_attest":["*any"],"default_attest":"A","payload_maxduration":"-1","privatekey_path":"","publickey_path":""},"store_session_costs":false,"terminate_attempts":5,"thresholds_conns":[]}}`
 	if err := cfg.V1GetConfigAsJSON(context.Background(), &SectionWithAPIOpts{Sections: []string{SessionSJSON}}, &rcv); err != nil {
 		t.Error(err)
 	} else if expected != rcv {
@@ -1048,6 +1050,7 @@ func testCGRConfigReloadAll(t *testing.T) {
 		},
 		Opts: &SessionsOpts{
 			Accounts:               []*DynamicBoolOpt{{}},
+			Rates:                  []*DynamicBoolOpt{{}},
 			Attributes:             []*DynamicBoolOpt{{}},
 			CDRs:                   []*DynamicBoolOpt{{}},
 			Chargers:               []*DynamicBoolOpt{{}},
--- a/config/config_test.go
+++ b/config/config_test.go
--- a/config/sessionscfg.go
+++ b/config/sessionscfg.go
@@ -30,6 +30,7 @@ import (

 const (
 	SessionsAccountsDftOpt               = false
+	SessionsRatesDftOpt                  = false
 	SessionsAttributesDftOpt             = false
 	SessionsCDRsDftOpt                   = false
 	SessionsChargersDftOpt               = false
@@ -159,6 +160,13 @@ func (sesOpts *SessionsOpts) loadFromJSONCfg(jsnCfg *SessionsOptsJson) error {
 		}
 		sesOpts.Accounts = append(opt, sesOpts.Accounts...)
 	}
+	if jsnCfg.Rates != nil {
+		opt, err := IfaceToBoolDynamicOpts(jsnCfg.Rates)
+		if err != nil {
+			return err
+		}
+		sesOpts.Rates = append(opt, sesOpts.Rates...)
+	}
 	if jsnCfg.Attributes != nil {
 		opts, err := IfaceToBoolDynamicOpts(jsnCfg.Attributes)
 		if err != nil {
@@ -533,6 +541,7 @@ func (scfg SessionSCfg) AsMapInterface() any {
 	}
 	opts := map[string]any{
 		utils.MetaAccounts:                  scfg.Opts.Accounts,
+		utils.MetaRates:                     scfg.Opts.Rates,
 		utils.MetaAttributes:                scfg.Opts.Attributes,
 		utils.MetaCDRs:                      scfg.Opts.CDRs,
 		utils.MetaChargers:                  scfg.Opts.Chargers,
@@ -634,6 +643,7 @@ func (scfg SessionSCfg) CloneSection() Section { return scfg.Clone() }
 func (o *SessionsOpts) Clone() *SessionsOpts {
 	return &SessionsOpts{
 		Accounts:               CloneDynamicBoolOpt(o.Accounts),
+		Rates:                  CloneDynamicBoolOpt(o.Rates),
 		Attributes:             CloneDynamicBoolOpt(o.Attributes),
 		CDRs:                   CloneDynamicBoolOpt(o.CDRs),
 		Chargers:               CloneDynamicBoolOpt(o.Chargers),
@@ -829,6 +839,7 @@ func diffSTIRJsonCfg(d *STIRJsonCfg, v1, v2 *STIRcfg) *STIRJsonCfg {

 type SessionsOptsJson struct {
 	Accounts               []*DynamicInterfaceOpt `json:"*accounts"`
+	Rates                  []*DynamicInterfaceOpt `json:"*rates"`
 	Attributes             []*DynamicInterfaceOpt `json:"*attributes"`
 	CDRs                   []*DynamicInterfaceOpt `json:"*cdrs"`
 	Chargers               []*DynamicInterfaceOpt `json:"*chargers"`
@@ -903,6 +914,9 @@ func diffSessionsOptsJsonCfg(d *SessionsOptsJson, v1, v2 *SessionsOpts) *Session
 	if !DynamicBoolOptEqual(v1.Accounts, v2.Accounts) {
 		d.Accounts = BoolToIfaceDynamicOpts(v2.Accounts)
 	}
+	if !DynamicBoolOptEqual(v1.Rates, v2.Rates) {
+		d.Rates = BoolToIfaceDynamicOpts(v2.Rates)
+	}
 	if !DynamicBoolOptEqual(v1.Attributes, v2.Attributes) {
 		d.Attributes = BoolToIfaceDynamicOpts(v2.Attributes)
 	}
--- a/config/sessionscfg_test.go
+++ b/config/sessionscfg_test.go
@@ -137,6 +137,7 @@ func TestSessionSCfgloadFromJsonCfgCase1(t *testing.T) {
 		},
 		Opts: &SessionsOpts{
 			Accounts:               []*DynamicBoolOpt{{}},
+			Rates:                  []*DynamicBoolOpt{{}},
 			Attributes:             []*DynamicBoolOpt{{}},
 			CDRs:                   []*DynamicBoolOpt{{}},
 			Chargers:               []*DynamicBoolOpt{{}},
@@ -376,6 +377,7 @@ func TestSessionSCfgloadFromJsonCfgCase10(t *testing.T) {
 		},
 		Opts: &SessionsOpts{
 			Accounts:               []*DynamicBoolOpt{{}},
+			Rates:                  []*DynamicBoolOpt{{}},
 			Attributes:             []*DynamicBoolOpt{{}},
 			CDRs:                   []*DynamicBoolOpt{{}},
 			Chargers:               []*DynamicBoolOpt{{}},
@@ -540,6 +542,7 @@ func TestSessionSCfgAsMapInterfaceCase1(t *testing.T) {
 		},
 		utils.OptsCfg: map[string]any{
 			utils.MetaAccounts:                  []*DynamicBoolOpt{{}},
+			utils.MetaRates:                     []*DynamicBoolOpt{{}},
 			utils.MetaAttributes:                []*DynamicBoolOpt{{}},
 			utils.MetaCDRs:                      []*DynamicBoolOpt{{}},
 			utils.MetaChargers:                  []*DynamicBoolOpt{{}},
@@ -665,6 +668,7 @@ func TestSessionSCfgAsMapInterfaceCase2(t *testing.T) {
 		},
 		utils.OptsCfg: map[string]any{
 			utils.MetaAccounts:                  []*DynamicBoolOpt{{}},
+			utils.MetaRates:                     []*DynamicBoolOpt{{}},
 			utils.MetaAttributes:                []*DynamicBoolOpt{{}},
 			utils.MetaCDRs:                      []*DynamicBoolOpt{{}},
 			utils.MetaChargers:                  []*DynamicBoolOpt{{}},
--- a/sessions/sessions_ratesdynamic_it_test.go
+++ b/sessions/sessions_ratesdynamic_it_test.go
@@ -0,0 +1,141 @@
+//go:build integration
+// +build integration
+
+/*
+Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
+Copyright (C) ITsysCOM GmbH
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>
+*/
+
+package sessions
+
+import (
+	"testing"
+	"time"
+
+	"github.com/cgrates/birpc/context"
+	"github.com/cgrates/cgrates/engine"
+	"github.com/cgrates/cgrates/utils"
+)
+
+func TestSessionSv1ProcessEventDynamicRates(t *testing.T) {
+	var dbcfg engine.DBCfg
+	switch *utils.DBType {
+	case utils.MetaInternal:
+		dbcfg = engine.InternalDBCfg
+	case utils.MetaRedis:
+		dbcfg = engine.RedisDBCfg
+	case utils.MetaMySQL:
+		dbcfg = engine.MySQLDBCfg
+	case utils.MetaMongo:
+		dbcfg = engine.MongoDBCfg
+	case utils.MetaPostgres:
+		dbcfg = engine.PostgresDBCfg
+	default:
+		t.Fatal("unsupported dbtype value")
+	}
+
+	ng := engine.TestEngine{
+		ConfigJSON: `{
+"sessions": {
+    "enabled": true,
+    "rates_conns": ["*localhost"],
+    "opts": {
+        "*rates": [
+            {
+                "filterIDs": ["*string:~*req.Destination:1002"],
+                "value": true
+            }
+        ]
+    }
+},
+"rates": {
+    "enabled": true
+},
+"admins": {
+    "enabled": true
+},
+"configs": {
+    "enabled": true
+}
+}`,
+		TpFiles: map[string]string{
+			utils.RatesCsv: `#Tenant,ID,FilterIDs,Weights,MinCost,MaxCost,MaxCostStrategy,RateID,RateFilterIDs,RateActivationStart,RateWeights,RateBlocker,RateIntervalStart,RateFixedFee,RateRecurrentFee,RateUnit,RateIncrement
+cgrates.org,RP_SIMPLE,,;10,,,,RT_SIMPLE,*string:~*req.Destination:1002,"* * * * *",;10,false,0s,0,1,1m,1m`,
+		},
+		DBCfg:    dbcfg,
+		Encoding: *utils.Encoding,
+	}
+
+	client, _ := ng.Run(t)
+	time.Sleep(100 * time.Millisecond)
+
+	t.Run("dynamicMatch", func(t *testing.T) {
+		var rply V1ProcessEventReply
+		err := client.Call(context.Background(), utils.SessionSv1ProcessEvent,
+			&utils.CGREvent{
+				Tenant: "cgrates.org",
+				ID:     "dynMatch",
+				APIOpts: map[string]any{
+					utils.MetaUsage: 1 * time.Minute,
+				},
+				Event: map[string]any{
+					utils.AccountField: "1001",
+					utils.Destination:  "1002",
+					utils.AnswerTime:   "2018-01-07T17:00:00Z",
+				},
+			}, &rply)
+		if err != nil {
+			t.Fatalf("ProcessEvent failed: %v", err)
+		}
+
+		if rply.RateSCost == nil {
+			t.Fatal("RateSCost should not be nil when dynamic filter matches")
+		}
+
+		cost, exists := rply.RateSCost[utils.MetaDefault]
+		if !exists {
+			t.Fatalf("no RateSCost entry for *default runID, got: %v", rply.RateSCost)
+		}
+
+		if cost != 1.0 {
+			t.Errorf("RateSCost[*default] = %g, want 1.0", cost)
+		}
+	})
+
+	t.Run("dynamicNoMatch", func(t *testing.T) {
+		var rply V1ProcessEventReply
+		err := client.Call(context.Background(), utils.SessionSv1ProcessEvent,
+			&utils.CGREvent{
+				Tenant: "cgrates.org",
+				ID:     "dynNoMatch",
+				APIOpts: map[string]any{
+					utils.MetaUsage: 1 * time.Minute,
+				},
+				Event: map[string]any{
+					utils.AccountField: "1001",
+					utils.Destination:  "9999",
+					utils.AnswerTime:   "2018-01-07T17:00:00Z",
+				},
+			}, &rply)
+		if err != nil {
+			t.Fatalf("ProcessEvent failed: %v", err)
+		}
+
+		if len(rply.RateSCost) > 0 {
+			t.Errorf("RateSCost should be empty when filter does not match, got: %v", rply.RateSCost)
+		}
+	})
+}