Get PlanID from Plan Repo

Azure · Jan 10, 2025 · 21c219b · 21c219b
1 parent 8333403
commit 21c219b
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/AdminSite/Controllers/SchedulerController.cs b/src/AdminSite/Controllers/SchedulerController.cs
@@ -41,6 +41,11 @@ public class SchedulerController : BaseController
     /// </summary>
     private SubscriptionService subscriptionService;
 
+    /// <summary>
+    /// the plan service
+    /// </summary>
+    private IPlansRepository plansRepository;
+
     /// <summary>
     /// the user repository
     /// </summary>
@@ -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;
     }
 
     /// <summary>
@@ -134,8 +139,6 @@ public IActionResult NewScheduler(string subscriptionId, string dimId, string qu
                     Value = item.Id.ToString(),
                 });
             }
-            // Create Plan Dropdown list
-            List<SelectListItem> PlanList = new List<SelectListItem>();
             List<SelectListItem> DimensionsList = new List<SelectListItem>();
 
             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)