Balance DestinationId now take multiple destinations

This commit is contained in:
Radu Ioan Fericean
2015-05-16 00:01:30 +03:00
parent 1e5e025cc3
commit d2b4df69ca
26 changed files with 387 additions and 335 deletions

View File

@@ -520,7 +520,7 @@ func (self *SQLStorage) SetTPActions(tpid string, acts map[string][]*utils.TPAct
Units: ac.Units,
ExpiryTime: ac.ExpiryTime,
TimingTags: ac.TimingTags,
DestinationTag: ac.DestinationId,
DestinationTags: ac.DestinationIds,
RatingSubject: ac.RatingSubject,
Category: ac.Category,
SharedGroup: ac.SharedGroup,
@@ -553,7 +553,7 @@ func (self *SQLStorage) GetTPActions(tpid, actsId string) (*utils.TPActions, err
Units: tpAct.Units,
ExpiryTime: tpAct.ExpiryTime,
TimingTags: tpAct.TimingTags,
DestinationId: tpAct.DestinationTag,
DestinationIds: tpAct.DestinationTags,
RatingSubject: tpAct.RatingSubject,
Category: tpAct.Category,
BalanceWeight: tpAct.BalanceWeight,
@@ -622,27 +622,27 @@ func (self *SQLStorage) SetTPActionTriggers(tpid string, ats map[string][]*utils
id = utils.GenUUID()
}
saved := tx.Save(&TpActionTrigger{
Tpid: tpid,
UniqueId: id,
Tag: atId,
ThresholdType: at.ThresholdType,
ThresholdValue: at.ThresholdValue,
Recurrent: at.Recurrent,
MinSleep: at.MinSleep,
BalanceTag: at.BalanceId,
BalanceType: at.BalanceType,
BalanceDirection: at.BalanceDirection,
BalanceDestinationTag: at.BalanceDestinationId,
BalanceWeight: at.BalanceWeight,
BalanceExpiryTime: at.BalanceExpirationDate,
BalanceTimingTags: at.BalanceTimingTags,
BalanceRatingSubject: at.BalanceRatingSubject,
BalanceCategory: at.BalanceCategory,
BalanceSharedGroup: at.BalanceSharedGroup,
MinQueuedItems: at.MinQueuedItems,
ActionsTag: at.ActionsId,
Weight: at.Weight,
CreatedAt: time.Now(),
Tpid: tpid,
UniqueId: id,
Tag: atId,
ThresholdType: at.ThresholdType,
ThresholdValue: at.ThresholdValue,
Recurrent: at.Recurrent,
MinSleep: at.MinSleep,
BalanceTag: at.BalanceId,
BalanceType: at.BalanceType,
BalanceDirection: at.BalanceDirection,
BalanceDestinationTags: at.BalanceDestinationIds,
BalanceWeight: at.BalanceWeight,
BalanceExpiryTime: at.BalanceExpirationDate,
BalanceTimingTags: at.BalanceTimingTags,
BalanceRatingSubject: at.BalanceRatingSubject,
BalanceCategory: at.BalanceCategory,
BalanceSharedGroup: at.BalanceSharedGroup,
MinQueuedItems: at.MinQueuedItems,
ActionsTag: at.ActionsId,
Weight: at.Weight,
CreatedAt: time.Now(),
})
if saved.Error != nil {
tx.Rollback()
@@ -1583,7 +1583,7 @@ func (self *SQLStorage) GetTpActions(tpid, tag string) (map[string][]*utils.TPAc
Units: tpAc.Units,
ExpiryTime: tpAc.ExpiryTime,
TimingTags: tpAc.TimingTags,
DestinationId: tpAc.DestinationTag,
DestinationIds: tpAc.DestinationTags,
RatingSubject: tpAc.RatingSubject,
Category: tpAc.Category,
SharedGroup: tpAc.SharedGroup,
@@ -1612,7 +1612,7 @@ func (self *SQLStorage) GetTpActionTriggers(tpid, tag string) (map[string][]*uti
BalanceId: tpAt.BalanceTag,
BalanceType: tpAt.BalanceType,
BalanceDirection: tpAt.BalanceDirection,
BalanceDestinationId: tpAt.BalanceDestinationTag,
BalanceDestinationIds: tpAt.BalanceDestinationTags,
BalanceWeight: tpAt.BalanceWeight,
BalanceExpirationDate: tpAt.BalanceExpiryTime,
BalanceTimingTags: tpAt.BalanceTimingTags,