uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-22 07:38:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

SM_Cost -> SessionsCost and update FSEvent and KamEvent

Browse Source
This commit is contained in:
TeoV
2018-01-31 19:19:03 +02:00
committed by Dan Christian Bogos
parent 67b621e456
commit 976cd20713
18 changed files with 374 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
engine/storage_sql.go
View File

@@ -107,7 +107,7 @@ func (self *SQLStorage) IsDBEmpty() (resp bool, err error) {
utils.TBLTPSharedGroups, utils.TBLTPCdrStats, utils.TBLTPLcrs, utils.TBLTPActions,
utils.TBLTPActionTriggers, utils.TBLTPAccountActions, utils.TBLTPDerivedChargers, utils.TBLTPUsers,
utils.TBLTPAliases, utils.TBLTPResources, utils.TBLTPStats, utils.TBLTPThresholds,
utils.TBLTPFilters, utils.SMCostsTBL, utils.CDRsTBL, utils.TBLTPActionPlans,
utils.TBLTPFilters, utils.SessionsCostsTBL, utils.CDRsTBL, utils.TBLTPActionPlans,
utils.TBLVersions, utils.TBLTPSuppliers, utils.TBLTPAttributes,
}
for _, tbl := range tbls {
@@ -743,7 +743,7 @@ func (self *SQLStorage) SetSMCost(smc *SMCost) error {
return nil
}
tx := self.db.Begin()
cd := &SMCostSQL{
cd := &SessionsCostsSQL{
Cgrid: smc.CGRID,
RunID: smc.RunID,
OriginHost: smc.OriginHost,
@@ -764,7 +764,8 @@ func (self *SQLStorage) SetSMCost(smc *SMCost) error {
func (self *SQLStorage) RemoveSMCost(smc *SMCost) error {
tx := self.db.Begin()
if err := tx.Where(&SMCostSQL{Cgrid: smc.CGRID, RunID: smc.RunID}).Delete(SMCost{}).Error; err != nil {
if err := tx.Where(&SessionsCostsSQL{Cgrid: smc.CGRID,
RunID: smc.RunID}).Delete(SessionsCostsSQL{}).Error; err != nil {
tx.Rollback()
return err
}
@@ -775,7 +776,7 @@ func (self *SQLStorage) RemoveSMCost(smc *SMCost) error {
// GetSMCosts is used to retrieve one or multiple SMCosts based on filter
func (self *SQLStorage) GetSMCosts(cgrid, runid, originHost, originIDPrefix string) ([]*SMCost, error) {
var smCosts []*SMCost
filter := &SMCostSQL{}
filter := &SessionsCostsSQL{}
if cgrid != "" {
filter.Cgrid = cgrid
}
@@ -789,7 +790,7 @@ func (self *SQLStorage) GetSMCosts(cgrid, runid, originHost, originIDPrefix stri
if originIDPrefix != "" {
q = self.db.Where(filter).Where(fmt.Sprintf("origin_id LIKE '%s%%'", originIDPrefix))
}
results := make([]*SMCostSQL, 0)
results := make([]*SessionsCostsSQL, 0)
if err := q.Find(&results).Error; err != nil {
return nil, err
}