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

In case TimingID start without "*" query DB for Timing

Browse Source
This commit is contained in:
TeoV
2020-07-17 17:51:19 +03:00
committed by Dan Christian Bogos
parent da30f372a8
commit f05aaa2a0a
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apier/v1/apier.go
View File

@@ -678,15 +678,29 @@ func (apierSv1 *APIerSv1) SetActionPlan(attrs *AttrSetActionPlan, reply *string)
if dfltTiming, isDefault := checkDefaultTiming(apiAtm.Time); isDefault {
timing = dfltTiming
} else {
timing.ID = apiAtm.TimingID
timing.Years.Parse(apiAtm.Years, ";")
timing.Months.Parse(apiAtm.Months, ";")
timing.MonthDays.Parse(apiAtm.MonthDays, ";")
timing.WeekDays.Parse(apiAtm.WeekDays, ";")
if !verifyFormat(apiAtm.Time) {
return 0, fmt.Errorf("%s:%s", utils.ErrUnsupportedFormat.Error(), apiAtm.Time)
if !strings.HasPrefix(apiAtm.TimingID, utils.Meta) {
dbTiming, err := apierSv1.DataManager.GetTiming(apiAtm.TimingID, false, utils.NonTransactional)
if err != nil {
return 0, err
}
timing.ID = dbTiming.ID
timing.Years = dbTiming.Years
timing.Months = dbTiming.Months
timing.MonthDays = dbTiming.MonthDays
timing.WeekDays = dbTiming.WeekDays
timing.StartTime = dbTiming.StartTime
} else {
timing.ID = apiAtm.TimingID
timing.Years.Parse(apiAtm.Years, ";")
timing.Months.Parse(apiAtm.Months, ";")
timing.MonthDays.Parse(apiAtm.MonthDays, ";")
timing.WeekDays.Parse(apiAtm.WeekDays, ";")
if !verifyFormat(apiAtm.Time) {
return 0, fmt.Errorf("%s:%s", utils.ErrUnsupportedFormat.Error(), apiAtm.Time)
}
timing.StartTime = apiAtm.Time
}
timing.StartTime = apiAtm.Time
}
ap.ActionTimings = append(ap.ActionTimings, &engine.ActionTiming{