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

Updated ApierV1.SetActionTrigger

Browse Source
This commit is contained in:
Trial97
2019-11-28 14:35:57 +02:00
parent 924a0933f2
commit 550fe7eec7
4 changed files with 34 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apier/v1/apier_it_test.go
View File

@@ -1120,11 +1120,13 @@ func TestApierSetAccountActionTriggers(t *testing.T) {
}
var setReply string
setReq := AttrSetAccountActionTriggers{
Tenant: "cgrates.org",
Account: "dan2",
UniqueID: reply[0].UniqueID,
ActionTrigger: map[string]interface{}{
utils.ActivationDate: "2016-02-05T18:00:00Z",
Tenant: "cgrates.org",
Account: "dan2",
AttrSetActionTrigger: AttrSetActionTrigger{
UniqueID: reply[0].UniqueID,
ActionTrigger: map[string]interface{}{
utils.ActivationDate: "2016-02-05T18:00:00Z",
},
},
}
if err := rater.Call(utils.ApierV1ResetAccountActionTriggers, setReq, &setReply); err != nil {

127
apier/v1/triggers.go
View File

@@ -186,15 +186,18 @@ func (api *ApierV1) ResetAccountActionTriggers(attr AttrResetAccountActionTrigge
}
type AttrSetAccountActionTriggers struct {
Tenant string
Account string
Tenant string
Account string
AttrSetActionTrigger
}
type AttrSetActionTrigger struct {
GroupID string
UniqueID string
ActionTrigger map[string]interface{}
}
// UpdateActionTrigger updates the ActionTrigger if is matching
func (attr *AttrSetAccountActionTriggers) UpdateActionTrigger(at *engine.ActionTrigger, timezone string) (updated bool, err error) {
func (attr *AttrSetActionTrigger) UpdateActionTrigger(at *engine.ActionTrigger, timezone string) (updated bool, err error) {
if at == nil {
return false, errors.New("Empty ActionTrigger")
}
@@ -415,32 +418,8 @@ func (api *ApierV1) RemoveActionTrigger(attr AttrRemoveActionTrigger, reply *str
}
}
type AttrSetActionTrigger struct {
GroupID string
UniqueID string
ThresholdType *string
ThresholdValue *float64
Recurrent *bool
MinSleep *string
ExpirationDate *string
ActivationDate *string
BalanceID *string
BalanceType *string
BalanceDestinationIds *[]string
BalanceWeight *float64
BalanceExpirationDate *string
BalanceTimingTags *[]string
BalanceRatingSubject *string
BalanceCategories *[]string
BalanceSharedGroups *[]string
BalanceBlocker *bool
BalanceDisabled *bool
MinQueuedItems *int
ActionsID *string
}
// SetActionTrigger updates a ActionTrigger
func (api *ApierV1) SetActionTrigger(attr AttrSetActionTrigger, reply *string) (err error) {
if missing := utils.MissingStructFields(&attr, []string{"GroupID"}); len(missing) != 0 {
return utils.NewErrMandatoryIeMissing(missing...)
}
@@ -461,94 +440,16 @@ func (api *ApierV1) SetActionTrigger(attr AttrSetActionTrigger, reply *string) (
newAtr = &engine.ActionTrigger{}
atrs = append(atrs, newAtr)
}
if attr.UniqueID == utils.EmptyString {
attr.UniqueID = utils.GenUUID()
}
newAtr.ID = attr.GroupID
if attr.UniqueID != "" {
newAtr.UniqueID = attr.UniqueID
} else {
newAtr.UniqueID = utils.GenUUID()
newAtr.UniqueID = attr.UniqueID
if _, err = attr.UpdateActionTrigger(newAtr,
api.Config.GeneralCfg().DefaultTimezone); err != nil {
return
}
if attr.ThresholdType != nil {
newAtr.ThresholdType = *attr.ThresholdType
}
if attr.ThresholdValue != nil {
newAtr.ThresholdValue = *attr.ThresholdValue
}
if attr.Recurrent != nil {
newAtr.Recurrent = *attr.Recurrent
}
if attr.MinSleep != nil {
minSleep, err := utils.ParseDurationWithNanosecs(*attr.MinSleep)
if err != nil {
*reply = err.Error()
return err
}
newAtr.MinSleep = minSleep
}
if attr.ExpirationDate != nil {
expTime, err := utils.ParseTimeDetectLayout(*attr.ExpirationDate,
api.Config.GeneralCfg().DefaultTimezone)
if err != nil {
*reply = err.Error()
return err
}
newAtr.ExpirationDate = expTime
}
if attr.ActivationDate != nil {
actTime, err := utils.ParseTimeDetectLayout(*attr.ActivationDate,
api.Config.GeneralCfg().DefaultTimezone)
if err != nil {
*reply = err.Error()
return err
}
newAtr.ActivationDate = actTime
}
newAtr.Balance = &engine.BalanceFilter{}
if attr.BalanceID != nil {
newAtr.Balance.ID = attr.BalanceID
}
if attr.BalanceType != nil {
newAtr.Balance.Type = attr.BalanceType
}
if attr.BalanceDestinationIds != nil {
newAtr.Balance.DestinationIDs = utils.StringMapPointer(utils.NewStringMap(*attr.BalanceDestinationIds...))
}
if attr.BalanceWeight != nil {
newAtr.Balance.Weight = attr.BalanceWeight
}
if attr.BalanceExpirationDate != nil {
balanceExpTime, err := utils.ParseTimeDetectLayout(*attr.BalanceExpirationDate,
api.Config.GeneralCfg().DefaultTimezone)
if err != nil {
*reply = err.Error()
return err
}
newAtr.Balance.ExpirationDate = &balanceExpTime
}
if attr.BalanceTimingTags != nil {
newAtr.Balance.TimingIDs = utils.StringMapPointer(utils.NewStringMap(*attr.BalanceTimingTags...))
}
if attr.BalanceRatingSubject != nil {
newAtr.Balance.RatingSubject = attr.BalanceRatingSubject
}
if attr.BalanceCategories != nil {
newAtr.Balance.Categories = utils.StringMapPointer(utils.NewStringMap(*attr.BalanceCategories...))
}
if attr.BalanceSharedGroups != nil {
newAtr.Balance.SharedGroups = utils.StringMapPointer(utils.NewStringMap(*attr.BalanceSharedGroups...))
}
if attr.BalanceBlocker != nil {
newAtr.Balance.Blocker = attr.BalanceBlocker
}
if attr.BalanceDisabled != nil {
newAtr.Balance.Disabled = attr.BalanceDisabled
}
if attr.MinQueuedItems != nil {
newAtr.MinQueuedItems = *attr.MinQueuedItems
}
if attr.ActionsID != nil {
newAtr.ActionsID = *attr.ActionsID
}
if err = api.DataManager.SetActionTriggers(attr.GroupID, atrs, utils.NonTransactional); err != nil {
return
}

14
apier/v2/apierv2_it_test.go
View File

@@ -148,12 +148,14 @@ func TestApierV2itSetAccountActionTriggers(t *testing.T) {
attrs := v1.AttrSetAccountActionTriggers{
Tenant: "cgrates.org",
Account: "dan",
GroupID: "MONITOR_MAX_BALANCE",
ActionTrigger: map[string]interface{}{
utils.ThresholdType: utils.TRIGGER_MAX_BALANCE,
utils.ThresholdValue: 50,
utils.BalanceType: utils.MONETARY,
utils.ActionsID: "DISABLE_ACCOUNT",
AttrSetActionTrigger: v1.AttrSetActionTrigger{
GroupID: "MONITOR_MAX_BALANCE",
ActionTrigger: map[string]interface{}{
utils.ThresholdType: utils.TRIGGER_MAX_BALANCE,
utils.ThresholdValue: 50,
utils.BalanceType: utils.MONETARY,
utils.ActionsID: "DISABLE_ACCOUNT",
},
},
}
var reply string

8
general_tests/tp_it_test.go
View File

@@ -153,9 +153,11 @@ func testTpActionTriggers(t *testing.T) {
}
var reply string
if err := tpRPC.Call(utils.ApierV1SetActionTrigger, v1.AttrSetActionTrigger{
GroupID: "TestATR",
UniqueID: "Unique atr id",
BalanceID: utils.StringPointer("BID1"),
GroupID: "TestATR",
UniqueID: "Unique atr id",
ActionTrigger: map[string]interface{}{
utils.BalanceID: utils.StringPointer("BID1"),
},
}, &reply); err != nil {
t.Error(err)
} else if reply != utils.OK {