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

Removed DerivedChrgerS

Browse Source
This commit is contained in:
Trial97
2019-02-18 16:12:36 +02:00
committed by Dan Christian Bogos
parent fd49d3194b
commit b8ff4bdfd9
83 changed files with 102 additions and 3337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
engine/storage_sql.go
View File

@@ -105,8 +105,7 @@ func (self *SQLStorage) IsDBEmpty() (resp bool, err error) {
utils.TBLTPTimings, utils.TBLTPDestinations, utils.TBLTPRates,
utils.TBLTPDestinationRates, utils.TBLTPRatingPlans, utils.TBLTPRateProfiles,
utils.TBLTPSharedGroups, utils.TBLTPActions, utils.TBLTPActionTriggers,
utils.TBLTPAccountActions, utils.TBLTPDerivedChargers,
utils.TBLTPResources, utils.TBLTPStats, utils.TBLTPThresholds,
utils.TBLTPAccountActions, utils.TBLTPResources, utils.TBLTPStats, utils.TBLTPThresholds,
utils.TBLTPFilters, utils.SessionCostsTBL, utils.CDRsTBL, utils.TBLTPActionPlans,
utils.TBLVersions, utils.TBLTPSuppliers, utils.TBLTPAttributes, utils.TBLTPChargers,
}
@@ -127,7 +126,7 @@ func (self *SQLStorage) GetTpIds(colName string) ([]string, error) {
qryStr := fmt.Sprintf(" (SELECT tpid FROM %s)", colName)
if colName == "" {
qryStr = fmt.Sprintf(
"(SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s)",
"(SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s) UNION (SELECT tpid FROM %s)",
utils.TBLTPTimings,
utils.TBLTPDestinations,
utils.TBLTPRates,
@@ -138,7 +137,6 @@ func (self *SQLStorage) GetTpIds(colName string) ([]string, error) {
utils.TBLTPActions,
utils.TBLTPActionTriggers,
utils.TBLTPAccountActions,
utils.TBLTPDerivedChargers,
utils.TBLTPResources,
utils.TBLTPStats,
utils.TBLTPThresholds,
@@ -237,8 +235,8 @@ func (self *SQLStorage) RemTpData(table, tpid string, args map[string]string) er
utils.TBLTPDestinationRates, utils.TBLTPRatingPlans, utils.TBLTPRateProfiles,
utils.TBLTPSharedGroups, utils.TBLTPActions, utils.TBLTPActionPlans,
utils.TBLTPActionTriggers, utils.TBLTPAccountActions,
utils.TBLTPDerivedChargers, utils.TBLTPResources,
utils.TBLTPStats, utils.TBLTPFilters, utils.TBLTPSuppliers, utils.TBLTPAttributes,
utils.TBLTPResources, utils.TBLTPStats, utils.TBLTPFilters,
utils.TBLTPSuppliers, utils.TBLTPAttributes,
utils.TBLTPChargers, utils.TBLTPDispatchers} {
if err := tx.Table(tblName).Where("tpid = ?", tpid).Delete(nil).Error; err != nil {
tx.Rollback()
@@ -428,39 +426,6 @@ func (self *SQLStorage) SetTPSharedGroups(sgs []*utils.TPSharedGroups) error {
return nil
}
func (self *SQLStorage) SetTPDerivedChargers(sgs []*utils.TPDerivedChargers) error {
if len(sgs) == 0 {
return nil //Nothing to set
}
m := make(map[string]bool)
tx := self.db.Begin()
for _, dCharger := range sgs {
dcKey := dCharger.GetDerivedChargersKey()
if found, _ := m[dcKey]; !found {
m[dcKey] = true
if err := tx.Where(TpDerivedCharger{
Tpid: dCharger.TPid,
Direction: dCharger.Direction,
Tenant: dCharger.Tenant,
Category: dCharger.Category,
Account: dCharger.Account,
Subject: dCharger.Subject,
}).Delete(TpDerivedCharger{}).Error; err != nil {
tx.Rollback()
return err
}
}
for _, d := range APItoModelDerivedCharger(dCharger) {
if err := tx.Save(&d).Error; err != nil {
tx.Rollback()
return err
}
}
}
tx.Commit()
return nil
}
func (self *SQLStorage) SetTPActions(acts []*utils.TPActions) error {
if len(acts) == 0 {
return nil //Nothing to set
@@ -1355,40 +1320,6 @@ func (self *SQLStorage) GetTPAccountActions(filter *utils.TPAccountActions) ([]*
}
}
func (self *SQLStorage) GetTPDerivedChargers(filter *utils.TPDerivedChargers) ([]*utils.TPDerivedChargers, error) {
var tpDerivedChargers TpDerivedChargers
q := self.db.Where("tpid = ?", filter.TPid)
if len(filter.Direction) != 0 {
q = q.Where("direction = ?", filter.Direction)
}
if len(filter.Tenant) != 0 {
q = q.Where("tenant = ?", filter.Tenant)
}
if len(filter.Account) != 0 {
q = q.Where("account = ?", filter.Account)
}
if len(filter.Category) != 0 {
q = q.Where("category = ?", filter.Category)
}
if len(filter.Subject) != 0 {
q = q.Where("subject = ?", filter.Subject)
}
if len(filter.LoadId) != 0 {
q = q.Where("loadid = ?", filter.LoadId)
}
if err := q.Find(&tpDerivedChargers).Error; err != nil {
return nil, err
}
if dcs, err := tpDerivedChargers.AsTPDerivedChargers(); err != nil {
return nil, err
} else {
if len(dcs) == 0 {
return dcs, utils.ErrNotFound
}
return dcs, nil
}
}
func (self *SQLStorage) GetTPResources(tpid, tenant, id string) ([]*utils.TPResource, error) {
var rls TpResources
q := self.db.Where("tpid = ?", tpid)