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

Fixup build, removed removeFromDb parameter in cdr_export console command

Browse Source
This commit is contained in:
DanB
2014-03-25 13:30:39 +01:00
parent f390281f41
commit 29e3bd137b
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apier/tutfsjson_local_test.go
View File

@@ -413,7 +413,7 @@ func TestMaxDebit1001(t *testing.T) {
for _, blnc := range blncLst {
if blnc.SharedGroup == "SHARED_A" && blnc.Value != 5 {
t.Errorf("Unexpected value for shared balance: %f", blnc.Value)
} else if len(blnc.SharedGroup) == 0 && blnc.Value != 4.7 {
} else if len(blnc.SharedGroup) == 0 && blnc.Value != 4.4 {
t.Errorf("Unexpected value for general balance: %f", blnc.Value)
}
}
@@ -448,9 +448,9 @@ func TestMaxDebit1007(t *testing.T) {
}
blncLst := acnt.BalanceMap["*monetary*out"]
for _, blnc := range blncLst {
if blnc.SharedGroup == "SHARED_A" && blnc.Value != 4.7 {
if blnc.SharedGroup == "SHARED_A" && blnc.Value != 4 {
t.Errorf("Unexpected value for shared balance: %f", blnc.Value)
} else if len(blnc.SharedGroup) == 0 && blnc.Value != 4.7 {
} else if len(blnc.SharedGroup) == 0 && blnc.Value != 4.4 {
t.Errorf("Unexpected value for general balance: %f", blnc.Value)
}
}

11
console/export_cdrs.go
View File

@@ -37,13 +37,13 @@ type CmdExportCdrs struct {
// name should be exec's name
func (self *CmdExportCdrs) Usage(name string) string {
return fmt.Sprintf("\n\tUsage: cgr-console [cfg_opts...{-h}] export_cdrs <dry_run|csv> [<start_time|*one_month> [<stop_time> [remove_from_db]]]")
return fmt.Sprintf("\n\tUsage: cgr-console [cfg_opts...{-h}] export_cdrs <dry_run|csv> [<start_time|*one_month> [<stop_time> ]]")
}
// set param defaults
func (self *CmdExportCdrs) defaults() error {
self.rpcMethod = "ApierV1.ExportCdrsToFile"
self.rpcParams = &utils.AttrExpFileCdrs{CdrFormat:"csv"}
self.rpcParams = &utils.AttrExpFileCdrs{CdrFormat: "csv"}
return nil
}
@@ -60,20 +60,17 @@ func (self *CmdExportCdrs) FromArgs(args []string) error {
switch len(args) {
case 4:
timeStart = args[3]
case 5:
timeStart = args[3]
timeEnd = args[4]
case 6:
timeStart = args[3]
timeEnd = args[4]
if args[5] == "remove_from_db" {
self.rpcParams.RemoveFromDb = true
}
}
if timeStart == "*one_month" {
now := time.Now()
self.rpcParams.TimeStart = now.AddDate(0,-1,0).String()
self.rpcParams.TimeStart = now.AddDate(0, -1, 0).String()
self.rpcParams.TimeEnd = now.String()
} else {
self.rpcParams.TimeStart = timeStart

14
engine/storage_sql_local_test.go
View File

@@ -218,6 +218,20 @@ func TestGetStoredCdrs(t *testing.T) {
} else if len(storedCdrs) != 8 {
t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs)
}
// Filter on cgrids
if storedCdrs, err := mysql.GetStoredCdrs([]string{utils.FSCgrId("bbb1"), utils.FSCgrId("bbb2")},
"", "", "", "", "", "", "", "", "", "", timeStart, timeEnd, false, false); err != nil {
t.Error(err.Error())
} else if len(storedCdrs) != 2 {
t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs)
}
// Filter on cgrids plus reqType
if storedCdrs, err := mysql.GetStoredCdrs([]string{utils.FSCgrId("bbb1"), utils.FSCgrId("bbb2")},
"", "", "", "prepaid", "", "", "", "", "", "", timeStart, timeEnd, false, false); err != nil {
t.Error(err.Error())
} else if len(storedCdrs) != 1 {
t.Error("Unexpected number of StoredCdrs returned: ", storedCdrs)
}
// Filter on runId
if storedCdrs, err := mysql.GetStoredCdrs(nil, utils.DEFAULT_RUNID, "", "", "", "", "", "", "", "", "", timeStart, timeEnd, false, false); err != nil {
t.Error(err.Error())