diff --git a/src/AdminSite/Controllers/SchedulerController.cs b/src/AdminSite/Controllers/SchedulerController.cs
index c3249e06..3137468f 100644
--- a/src/AdminSite/Controllers/SchedulerController.cs
+++ b/src/AdminSite/Controllers/SchedulerController.cs
@@ -41,6 +41,11 @@ public class SchedulerController : BaseController
///
private SubscriptionService subscriptionService;
+ ///
+ /// the plan service
+ ///
+ private IPlansRepository plansRepository;
+
///
/// the user repository
///
@@ -74,7 +79,7 @@ public SchedulerController(
this.meteredRepository = meteredRepository;
this.schedulerService = new MeteredPlanSchedulerManagementService(frequencyRepository, schedulerRepository, schedulerViewRepository,subscriptionUsageLogsRepository,applicationConfigRepository);
this.subscriptionService = new SubscriptionService(subscriptionRepository,plansRepository);
-
+ this.plansRepository = plansRepository;
}
///
@@ -134,8 +139,6 @@ public IActionResult NewScheduler(string subscriptionId, string dimId, string qu
Value = item.Id.ToString(),
});
}
- // Create Plan Dropdown list
- List PlanList = new List();
List DimensionsList = new List();
schedulerUsageViewModel.DimensionsList = new SelectList(DimensionsList, "Value", "Text");
@@ -228,13 +231,18 @@ public IActionResult AddNewScheduledTrigger(SchedulerUsageViewModel schedulerUsa
{
try
{
- var selectedDimension = this.meteredRepository.Get(int.Parse(schedulerUsageViewModel.SelectedDimension));
+ //Get AMP Plan ID from Subscription Detail
+ var subscriptionDetail = this.subscriptionService.GetActiveSubscriptionsWithMeteredPlan().Where(s => s.Id == Convert.ToInt32(schedulerUsageViewModel.SelectedSubscription)).FirstOrDefault();
+ // Get Plan detail by AMP Plan ID
+ var selectedPlan = this.plansRepository.GetById(subscriptionDetail.AmpplanId);
+
+
MeteredPlanSchedulerManagementModel schedulerManagement = new MeteredPlanSchedulerManagementModel()
{
FrequencyId = Convert.ToInt32(schedulerUsageViewModel.SelectedSchedulerFrequency),
SchedulerName = Convert.ToString(schedulerUsageViewModel.SchedulerName),
SubscriptionId = Convert.ToInt32(schedulerUsageViewModel.SelectedSubscription),
- PlanId = Convert.ToInt32(selectedDimension.PlanId),
+ PlanId = Convert.ToInt32(selectedPlan.Id),
DimensionId = Convert.ToInt32(schedulerUsageViewModel.SelectedDimension),
Quantity = Convert.ToDouble(schedulerUsageViewModel.Quantity),
StartDate = schedulerUsageViewModel.FirstRunDate.AddHours(schedulerUsageViewModel.TimezoneOffset)