uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Added default category and subject if not present in event for forksession. closes#1434

Browse Source
This commit is contained in:
Trial97
2019-02-27 12:06:20 +02:00
committed by Dan Christian Bogos
parent b384e23079
commit 4d2bfb706e
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apier/v1/sessionsv1_it_test.go
View File

@@ -140,7 +140,6 @@ func TestSSv1ItAuth(t *testing.T) {
ID: "TestSSv1ItAuth",
Event: map[string]interface{}{
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.OriginID: "TestSSv1It1",
utils.RequestType: utils.META_PREPAID,
@@ -154,7 +153,7 @@ func TestSSv1ItAuth(t *testing.T) {
}
var rply sessions.V1AuthorizeReply
if err := sSv1BiRpc.Call(utils.SessionSv1AuthorizeEvent, args, &rply); err != nil {
t.Error(err)
t.Fatal(err)
}
if *rply.MaxUsage != authUsage {
t.Errorf("Unexpected MaxUsage: %v", rply.MaxUsage)
@@ -192,7 +191,6 @@ func TestSSv1ItAuth(t *testing.T) {
Event: map[string]interface{}{
utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9",
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.Account: "1001",
utils.Subject: "ANY2CNT",
@@ -223,7 +221,6 @@ func TestSSv1ItAuthWithDigest(t *testing.T) {
ID: "TestSSv1ItAuth",
Event: map[string]interface{}{
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.OriginID: "TestSSv1It1",
utils.RequestType: utils.META_PREPAID,
@@ -266,7 +263,6 @@ func TestSSv1ItInitiateSession(t *testing.T) {
ID: "TestSSv1ItInitiateSession",
Event: map[string]interface{}{
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.OriginID: "TestSSv1It1",
utils.RequestType: utils.META_PREPAID,
@@ -299,7 +295,6 @@ func TestSSv1ItInitiateSession(t *testing.T) {
Event: map[string]interface{}{
utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9",
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.Account: "1001",
utils.Subject: "ANY2CNT",
@@ -336,7 +331,6 @@ func TestSSv1ItInitiateSessionWithDigest(t *testing.T) {
ID: "TestSSv1ItInitiateSession",
Event: map[string]interface{}{
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.OriginID: "TestSSv1It1",
utils.RequestType: utils.META_PREPAID,
@@ -383,7 +377,6 @@ func TestSSv1ItUpdateSession(t *testing.T) {
ID: "TestSSv1ItUpdateSession",
Event: map[string]interface{}{
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.OriginID: "TestSSv1It1",
utils.RequestType: utils.META_PREPAID,
@@ -410,7 +403,6 @@ func TestSSv1ItUpdateSession(t *testing.T) {
Event: map[string]interface{}{
utils.CGRID: "5668666d6b8e44eb949042f25ce0796ec3592ff9",
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.Account: "1001",
utils.Subject: "ANY2CNT",
@@ -448,7 +440,6 @@ func TestSSv1ItTerminateSession(t *testing.T) {
ID: "TestSSv1ItUpdateSession",
Event: map[string]interface{}{
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.OriginID: "TestSSv1It1",
utils.RequestType: utils.META_PREPAID,
@@ -482,7 +473,6 @@ func TestSSv1ItProcessCDR(t *testing.T) {
ID: "TestSSv1ItProcessCDR",
Event: map[string]interface{}{
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.OriginID: "TestSSv1It1",
utils.RequestType: utils.META_PREPAID,
@@ -517,7 +507,6 @@ func TestSSv1ItProcessEvent(t *testing.T) {
ID: "TestSSv1ItProcessEvent",
Event: map[string]interface{}{
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.OriginID: "TestSSv1It2",
utils.RequestType: utils.META_PREPAID,
@@ -550,7 +539,6 @@ func TestSSv1ItProcessEvent(t *testing.T) {
Event: map[string]interface{}{
utils.CGRID: "c87609aa1cb6e9529ab1836cfeeeb0ab7aa7ebaf",
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.Account: "1001",
utils.Subject: "ANY2CNT",

2
apier/v2/cdrs_it_test.go
View File

@@ -128,7 +128,7 @@ func testV2CDRsProcessCDR(t *testing.T) {
utils.OriginHost: "192.168.1.1",
utils.Source: "testV2CDRsProcessCDR",
utils.RequestType: utils.META_RATED,
utils.Category: "call",
// utils.Category: "call", //it will be populated as default in MapEvent.AsCDR
utils.Account: "testV2CDRsProcessCDR",
utils.Subject: "ANY2CNT",
utils.Destination: "+4986517174963",

12
sessions/sessions.go
View File

@@ -956,6 +956,14 @@ func (sS *SessionS) forkSession(s *Session) (err error) {
startTime = s.EventStart.GetTimeIgnoreErrors(utils.SetupTime,
sS.cgrCfg.GeneralCfg().DefaultTimezone)
}
category := me.GetStringIgnoreErrors(utils.Category)
if len(category) == 0 {
category = sS.cgrCfg.GeneralCfg().DefaultCategory
}
subject := me.GetStringIgnoreErrors(utils.Subject)
if len(subject) == 0 {
subject = me.GetStringIgnoreErrors(utils.Account)
}
s.SRuns[i] = &SRun{
Event: me,
CD: &engine.CallDescriptor{
@@ -963,8 +971,8 @@ func (sS *SessionS) forkSession(s *Session) (err error) {
RunID: me.GetStringIgnoreErrors(utils.RunID),
TOR: me.GetStringIgnoreErrors(utils.ToR),
Tenant: s.Tenant,
Category: me.GetStringIgnoreErrors(utils.Category),
Subject: me.GetStringIgnoreErrors(utils.Subject),
Category: category,
Subject: subject,
Account: me.GetStringIgnoreErrors(utils.Account),
Destination: me.GetStringIgnoreErrors(utils.Destination),
TimeStart: startTime,