diff --git a/apier/v1/accounts.go b/apier/v1/accounts.go
new file mode 100644
index 000000000..1242910ad
--- /dev/null
+++ b/apier/v1/accounts.go
@@ -0,0 +1,96 @@
+/*
+Rating system designed to be used in VoIP Carriers World
+Copyright (C) 2013 ITsysCOM
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see
+*/
+
+package apier
+
+import (
+ "errors"
+ "fmt"
+ "github.com/cgrates/cgrates/utils"
+ "time"
+)
+
+type AttrAcntActionTimings struct {
+ Tenant string
+ Account string
+ Direction string
+}
+
+// Returns the balance id as used internally
+// eg: *out:cgrates.org:1005
+func BalanceId(tenant, account, direction string) string {
+ return fmt.Sprintf("%s:%s:%s", direction, tenant, account)
+}
+
+type AccountActionTiming struct {
+ Id string // The id to reference this particular ActionTiming
+ ActionTimingsId string // The id of the ActionTimings profile attached to the account
+ ActionsId string // The id of actions which will be executed
+ NextExecTime time.Time // Next execution time
+}
+
+func (self *ApierV1) GetAccountActionTimings(attrs AttrAcntActionTimings, reply *[]*AccountActionTiming) error {
+ if missing := utils.MissingStructFields(&attrs, []string{"Tenant", "Account", "Direction"}); len(missing) != 0 {
+ return fmt.Errorf("%s:%v", utils.ERR_MANDATORY_IE_MISSING, missing)
+ }
+ accountATs := make([]*AccountActionTiming, 0)
+ allATs, err := self.AccountDb.GetAllActionTimings()
+ if err != nil {
+ return fmt.Errorf("%s:%s", utils.ERR_SERVER_ERROR, err.Error())
+ }
+ for _, ats := range allATs {
+ for _, at := range ats {
+ if utils.IsSliceMember(at.UserBalanceIds, BalanceId(attrs.Tenant, attrs.Account, attrs.Direction)) {
+ accountATs = append(accountATs, &AccountActionTiming{Id: at.Id, ActionTimingsId: at.Tag, ActionsId: at.ActionsId, NextExecTime: at.GetNextStartTime()})
+ }
+ }
+ }
+ *reply = accountATs
+ return nil
+}
+
+type AttrRemAcntActionTiming struct {
+ Tenant string // Tenant he account belongs to
+ Account string // Account name
+ Direction string // Traffic direction
+ ActionTimingsId string // Id identifying the ActionTimings profile
+ ActionTimingId string // Internal CGR id identifying particular ActionTiming, *all for all user related ActionTimings to be canceled
+}
+
+func (self *ApierV1) RemAccountActionTiming(attrs AttrRemAcntActionTiming, reply *string) error {
+ if missing := utils.MissingStructFields(&attrs, []string{"Tenant", "Account", "Direction", "ActionTimingsId", "ActionTimingId"}); len(missing) != 0 {
+ return fmt.Errorf("%s:%v", utils.ERR_MANDATORY_IE_MISSING, missing)
+ }
+ ats, err := self.AccountDb.GetActionTimings(attrs.ActionTimingsId)
+ if err != nil {
+ return fmt.Errorf("%s:%s", utils.ERR_SERVER_ERROR, err.Error())
+ } else if len(ats) == 0 {
+ return errors.New(utils.ERR_NOT_FOUND)
+ }
+ for idx, at := range ats {
+ if utils.IsSliceMember(at.UserBalanceIds, BalanceId(attrs.Tenant, attrs.Account, attrs.Direction)) &&
+ (at.Id == attrs.ActionTimingId || attrs.ActionTimingId == "*any") {
+ ats[idx], ats = ats[len(ats)-1], ats[:len(ats)-1] // Remove from ats
+ }
+ }
+ if err := self.AccountDb.SetActionTimings(attrs.ActionTimingsId, ats); err != nil {
+ return fmt.Errorf("%s:%s", utils.ERR_SERVER_ERROR, err.Error())
+ }
+ *reply = OK
+ return nil
+}
diff --git a/apier/v1/apier.go b/apier/v1/apier.go
index 8b776f07b..dc0790e94 100644
--- a/apier/v1/apier.go
+++ b/apier/v1/apier.go
@@ -526,8 +526,8 @@ func (self *ApierV1) GetCachedItemAge(itemId string, reply *utils.CachedItemAge)
}
cachedItemAge := new(utils.CachedItemAge)
var found bool
- for idx, cacheKey := range []string{ engine.DESTINATION_PREFIX+itemId, engine.RATING_PLAN_PREFIX+itemId, engine.RATING_PROFILE_PREFIX+itemId,
- engine.ACTION_PREFIX+itemId} {
+ for idx, cacheKey := range []string{engine.DESTINATION_PREFIX + itemId, engine.RATING_PLAN_PREFIX + itemId, engine.RATING_PROFILE_PREFIX + itemId,
+ engine.ACTION_PREFIX + itemId} {
if age, err := cache2go.GetKeyAge(cacheKey); err == nil {
found = true
switch idx {
diff --git a/apier/v1/cdrs.go b/apier/v1/cdrs.go
index f0ad83f5f..f92659924 100644
--- a/apier/v1/cdrs.go
+++ b/apier/v1/cdrs.go
@@ -24,8 +24,8 @@ import (
"github.com/cgrates/cgrates/utils"
"os"
"path"
- "time"
"strings"
+ "time"
)
func (self *ApierV1) ExportCdrsToFile(attr utils.AttrExpFileCdrs, reply *utils.ExportedFileCdrs) error {
@@ -34,7 +34,7 @@ func (self *ApierV1) ExportCdrsToFile(attr utils.AttrExpFileCdrs, reply *utils.E
cdrFormat := strings.ToLower(attr.CdrFormat)
if !utils.IsSliceMember(utils.CdreCdrFormats, cdrFormat) {
return fmt.Errorf("%s:%s", utils.ERR_MANDATORY_IE_MISSING, "CdrFormat")
- }
+ }
if len(attr.TimeStart) != 0 {
if tStart, err = utils.ParseTimeDetectLayout(attr.TimeStart); err != nil {
return err
@@ -62,7 +62,7 @@ func (self *ApierV1) ExportCdrsToFile(attr utils.AttrExpFileCdrs, reply *utils.E
for _, cdr := range cdrs {
if err := csvWriter.Write(cdr); err != nil {
os.Remove(fileName)
- return err
+ return err
}
}
csvWriter.Close()
diff --git a/cdrc/cdrc.go b/cdrc/cdrc.go
index d36e4fbd9..a9fe8476d 100644
--- a/cdrc/cdrc.go
+++ b/cdrc/cdrc.go
@@ -39,7 +39,7 @@ import (
)
const (
- CSV = "csv"
+ CSV = "csv"
FS_CSV = "freeswitch_csv"
)
@@ -126,7 +126,7 @@ func (self *Cdrc) processCdrDir() error {
engine.Logger.Info(fmt.Sprintf(" Parsing folder %s for CDR files.", self.cgrCfg.CdrcCdrInDir))
filesInDir, _ := ioutil.ReadDir(self.cgrCfg.CdrcCdrInDir)
for _, file := range filesInDir {
- if self.cgrCfg.CdrcCdrType!=FS_CSV || path.Ext(file.Name())!=".csv" {
+ if self.cgrCfg.CdrcCdrType != FS_CSV || path.Ext(file.Name()) != ".csv" {
if err := self.processFile(path.Join(self.cgrCfg.CdrcCdrInDir, file.Name())); err != nil {
return err
}
@@ -150,7 +150,7 @@ func (self *Cdrc) trackCDRFiles() (err error) {
for {
select {
case ev := <-watcher.Event:
- if ev.IsCreate() && (self.cgrCfg.CdrcCdrType!=FS_CSV || path.Ext(ev.Name)!=".csv") {
+ if ev.IsCreate() && (self.cgrCfg.CdrcCdrType != FS_CSV || path.Ext(ev.Name) != ".csv") {
if err = self.processFile(ev.Name); err != nil {
return err
}
diff --git a/console/export_cdrs.go b/console/export_cdrs.go
index b864662ab..ae5e285a8 100644
--- a/console/export_cdrs.go
+++ b/console/export_cdrs.go
@@ -37,7 +37,7 @@ 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 [ [ [remove_from_db]]]")
+ return fmt.Sprintf("\n\tUsage: cgr-console [cfg_opts...{-h}] export_cdrs [ [ [remove_from_db]]]")
}
// set param defaults
diff --git a/engine/storage_sql.go b/engine/storage_sql.go
index ae03e59af..b4c1a36ac 100644
--- a/engine/storage_sql.go
+++ b/engine/storage_sql.go
@@ -788,15 +788,15 @@ func (self *SQLStorage) RemRatedCdrs(cgrIds []string) error {
}
buffRated := bytes.NewBufferString(fmt.Sprintf("DELETE FROM %s WHERE", utils.TBL_RATED_CDRS))
buffCosts := bytes.NewBufferString(fmt.Sprintf("DELETE FROM %s WHERE", utils.TBL_COST_DETAILS))
- buffCdrExtra := bytes.NewBufferString(fmt.Sprintf("DELETE FROM %s WHERE",utils.TBL_CDRS_EXTRA))
- buffCdrPrimary := bytes.NewBufferString(fmt.Sprintf("DELETE FROM %s WHERE",utils.TBL_CDRS_PRIMARY))
+ buffCdrExtra := bytes.NewBufferString(fmt.Sprintf("DELETE FROM %s WHERE", utils.TBL_CDRS_EXTRA))
+ buffCdrPrimary := bytes.NewBufferString(fmt.Sprintf("DELETE FROM %s WHERE", utils.TBL_CDRS_PRIMARY))
qryBuffers := []*bytes.Buffer{buffRated, buffCosts, buffCdrExtra, buffCdrPrimary}
for idx, cgrId := range cgrIds {
for _, buffer := range qryBuffers {
if idx != 0 {
buffer.WriteString(" OR")
}
- buffer.WriteString(fmt.Sprintf(" cgrid='%s'",cgrId))
+ buffer.WriteString(fmt.Sprintf(" cgrid='%s'", cgrId))
}
}
for _, buffer := range qryBuffers {
diff --git a/utils/apitpdata.go b/utils/apitpdata.go
index aba11f578..d7a054985 100644
--- a/utils/apitpdata.go
+++ b/utils/apitpdata.go
@@ -299,21 +299,21 @@ type AttrCachedItemAge struct {
}
type CachedItemAge struct {
- Destination time.Duration
- RatingPlan time.Duration
- RatingProfile time.Duration
- Action time.Duration
+ Destination time.Duration
+ RatingPlan time.Duration
+ RatingProfile time.Duration
+ Action time.Duration
}
type AttrExpFileCdrs struct {
- CdrFormat string // Cdr output file format
- TimeStart string // If provided, will represent the starting of the CDRs interval (>=)
- TimeEnd string // If provided, will represent the end of the CDRs interval (<)
- RemoveFromDb bool // If true the CDRs will be also deleted after export
-
+ CdrFormat string // Cdr output file format
+ TimeStart string // If provided, will represent the starting of the CDRs interval (>=)
+ TimeEnd string // If provided, will represent the end of the CDRs interval (<)
+ RemoveFromDb bool // If true the CDRs will be also deleted after export
+
}
type ExportedFileCdrs struct {
ExportedFilePath string // Full path to the newly generated export file
- NumberOfRecords int // Number of CDRs in the export file
+ NumberOfRecords int // Number of CDRs in the export file
}
diff --git a/utils/cgrcdr.go b/utils/cgrcdr.go
index 8ac63e97b..48120893f 100644
--- a/utils/cgrcdr.go
+++ b/utils/cgrcdr.go
@@ -22,8 +22,8 @@ import (
"errors"
"fmt"
"net/http"
- "time"
"strings"
+ "time"
)
func NewCgrCdrFromHttpReq(req *http.Request) (CgrCdr, error) {
@@ -177,7 +177,7 @@ func (cgrCdr CgrCdr) AsRatedCdr(runId, reqTypeFld, directionFld, tenantFld, torF
return nil, err
}
}
- if durStr, hasKey = cgrCdr[durationFld]; !hasKey && fieldsMandatory && !strings.HasPrefix(durationFld, STATIC_VALUE_PREFIX){
+ if durStr, hasKey = cgrCdr[durationFld]; !hasKey && fieldsMandatory && !strings.HasPrefix(durationFld, STATIC_VALUE_PREFIX) {
return nil, errors.New(fmt.Sprintf("%s:%s", ERR_MANDATORY_IE_MISSING, durationFld))
} else {
if strings.HasPrefix(durationFld, STATIC_VALUE_PREFIX) {
diff --git a/utils/cgrcdr_test.go b/utils/cgrcdr_test.go
index 751c142cf..071c9ef11 100644
--- a/utils/cgrcdr_test.go
+++ b/utils/cgrcdr_test.go
@@ -97,8 +97,8 @@ func TestCgrCdrAsRatedCdr(t *testing.T) {
t.Error("Unexpected error received", err)
}
expctRatedCdr2 := &RatedCDR{CgrId: FSCgrId("dsafdsaf"), AccId: "dsafdsaf", CdrHost: "192.168.1.1", CdrSource: "source_test", ReqType: "postpaid",
- Direction: "*in", Tenant: "cgrates.com", TOR: "premium_call", Account: "first_account", Subject: "first_subject", Destination: "1002",
- AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), Duration: time.Duration(12)*time.Second,
+ Direction: "*in", Tenant: "cgrates.com", TOR: "premium_call", Account: "first_account", Subject: "first_subject", Destination: "1002",
+ AnswerTime: time.Date(2013, 12, 7, 8, 42, 26, 0, time.UTC), Duration: time.Duration(12) * time.Second,
ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, MediationRunId: "wholesale_run", Cost: -1}
if !reflect.DeepEqual(rtCdrOut2, expctRatedCdr2) {
t.Errorf("Received: %v, expected: %v", rtCdrOut2, expctRatedCdr2)
diff --git a/utils/ratedcdr_test.go b/utils/ratedcdr_test.go
index e777889af..d3ff122e5 100644
--- a/utils/ratedcdr_test.go
+++ b/utils/ratedcdr_test.go
@@ -19,9 +19,9 @@ along with this program. If not, see
package utils
import (
+ "reflect"
"testing"
"time"
- "reflect"
)
func TestRatedCDRInterfaces(t *testing.T) {
@@ -33,9 +33,9 @@ func TestNewRatedCDRFromRawCDR(t *testing.T) {
cgrCdr := CgrCdr{"accid": "dsafdsaf", "cdrhost": "192.168.1.1", "cdrsource": "internal_test", "reqtype": "rated", "direction": "*out", "tenant": "cgrates.org", "tor": "call",
"account": "1001", "subject": "1001", "destination": "1002", "answer_time": "2013-11-07T08:42:26Z", "duration": "10",
"field_extr1": "val_extr1", "fieldextr2": "valextr2"}
- expctRtCdr := &RatedCDR{CgrId: FSCgrId(cgrCdr["accid"]), AccId: cgrCdr["accid"], CdrHost: cgrCdr["cdrhost"], CdrSource: cgrCdr["cdrsource"], ReqType: cgrCdr["reqtype"],
+ expctRtCdr := &RatedCDR{CgrId: FSCgrId(cgrCdr["accid"]), AccId: cgrCdr["accid"], CdrHost: cgrCdr["cdrhost"], CdrSource: cgrCdr["cdrsource"], ReqType: cgrCdr["reqtype"],
Direction: cgrCdr["direction"], Tenant: cgrCdr["tenant"], TOR: cgrCdr["tor"], Account: cgrCdr["account"], Subject: cgrCdr["subject"],
- Destination: cgrCdr["destination"], AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), Duration: time.Duration(10)*time.Second,
+ Destination: cgrCdr["destination"], AnswerTime: time.Date(2013, 11, 7, 8, 42, 26, 0, time.UTC), Duration: time.Duration(10) * time.Second,
ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, MediationRunId: DEFAULT_RUNID, Cost: -1}
if rt, err := NewRatedCDRFromRawCDR(cgrCdr); err != nil {
t.Error(err)
@@ -48,7 +48,7 @@ func TestRatedCdrFields(t *testing.T) {
ratedCdr := RatedCDR{CgrId: FSCgrId("dsafdsaf"), AccId: "dsafdsaf", CdrHost: "192.168.1.1", ReqType: "rated", Direction: "*out", Tenant: "cgrates.org",
TOR: "call", Account: "1001", Subject: "1001", Destination: "1002", AnswerTime: time.Unix(1383813746, 0), Duration: 10,
ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01,
- }
+ }
if ratedCdr.GetCgrId() != "b18944ef4dc618569f24c27b9872827a242bad0c" {
t.Error("Error parsing cdr: ", ratedCdr)
}