Merge pull request AzureRT#21 from jemex/dev

CalendarSchedule-Adding Property bag for Monthly and WeeklySchedule Option Response

Author: jemex

src/ResourceManager/Automation/Commands.Automation/Cmdlet/NewAzureAutomationSchedule.cs

@@ -19,6 +19,7 @@
 using System.Security.Permissions;
 using Microsoft.Azure.Commands.Automation.Common;
 using Microsoft.Azure.Commands.Automation.Model;
+using DayOfWeek = Microsoft.Azure.Commands.Automation.Model.DayOfWeek;
 
 namespace Microsoft.Azure.Commands.Automation.Cmdlet
 {
@@ -63,7 +64,7 @@ public NewAzureAutomationSchedule()
         /// Gets or sets the schedule days of the week.
         /// </summary>
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByWeekly, Mandatory = false, HelpMessage = "The list of days of week for the weekly schedule.")]
-        public DayOfWeek[] DaysOfWeek { get; set; }
+        public System.DayOfWeek[] DaysOfWeek { get; set; }
 
         /// <summary>
         /// Gets or sets the schedule days of the month.
@@ -75,7 +76,7 @@ public NewAzureAutomationSchedule()
         /// Gets or sets the schedule day of the week.
         /// </summary>
         [Parameter(ParameterSetName = AutomationCmdletParameterSets.ByMonthlyDayOfWeek, Mandatory = false, HelpMessage = "The day of week for the monthly occurrence.")]
-        public DayOfWeek? DayOfWeek { get; set; }
+        public System.DayOfWeek? DayOfWeek { get; set; }
 
         /// <summary>
         /// Gets or sets the schedule day of the week.
@@ -202,14 +203,35 @@ private Schedule CreateMonthlyScheduleModel()
                 ExpiryTime = this.ExpiryTime,
                 Frequency = ScheduleFrequency.Month,
                 Interval = this.MonthInterval,
-                DaysOfMonth = this.DaysOfMonth,
-                DayOfWeekMonthlySchedule = dayOfWeek,
-                DayOfWeekOccurrence = this.DayOfWeekOccurrence == 0 ? null : this.DayOfWeekOccurrence.ToString()
+                MonthlyScheduleOptions = this.IsMonthlyScheduleNull() 
+                    ? null
+                    : new MonthlyScheduleOptions()
+                    {
+                        DaysOfMonth = this.DaysOfMonth,
+                        DayOfWeek = this.DayOfWeek == null && this.DayOfWeekOccurrence == 0
+                            ? null
+                            : new DayOfWeek()
+                            {
+                                Day = dayOfWeek,
+                                Occurrence = this.DayOfWeekOccurrence == 0 ? null : this.DayOfWeekOccurrence.ToString()
+                            }
+                    }
             };
 
             return newSchedule;
         }
 
+        /// <summary>
+        /// The is monthly schedule null.
+        /// </summary>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        private bool IsMonthlyScheduleNull()
+        {
+            return this.DaysOfMonth == null && this.DayOfWeek == null && this.DayOfWeekOccurrence == 0;
+        }
+
         /// <summary>
         /// The create weekly schedule model.
         /// </summary>
@@ -226,9 +248,12 @@ private Schedule CreateWeeklyScheduleModel()
                 ExpiryTime = this.ExpiryTime,
                 Frequency = ScheduleFrequency.Week,
                 Interval = this.WeekInterval,
-                DaysOfWeekWeeklySchedule = this.DaysOfWeek == null
+                WeeklyScheduleOptions = this.DaysOfWeek == null
                     ? null
-                    : this.DaysOfWeek.Select(day => day.ToString()).ToList()
+                    : new WeeklyScheduleOptions()
+                    {
+                       DaysOfWeek = this.DaysOfWeek.Select(day => day.ToString()).ToList()
+                    }
             };
 
             return newSchedule;

src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj

@@ -225,6 +225,7 @@
     <Compile Include="Model\ConfigurationContent.cs" />
     <Compile Include="Model\Connection.cs" />
     <Compile Include="Model\CredentialInfo.cs" />
+    <Compile Include="Model\DayOfWeek.cs" />
     <Compile Include="Model\DscNode.cs" />
     <Compile Include="Model\DscNodeReport.cs" />
     <Compile Include="Model\DscOnboardingMetaconfig.cs" />
@@ -233,13 +234,15 @@
     <Compile Include="Model\JobStreamRecord.cs" />
     <Compile Include="Model\JobStream.cs" />
     <Compile Include="Model\Module.cs" />
+    <Compile Include="Model\MonthlyScheduleOptions.cs" />
     <Compile Include="Model\NodeConfiguration.cs" />
     <Compile Include="Model\BaseProperties.cs" />
     <Compile Include="Model\Runbook.cs" />
     <Compile Include="Model\Schedule.cs" />
     <Compile Include="Model\ScheduleFrequency.cs" />
     <Compile Include="Model\Variable.cs" />
     <Compile Include="Model\Webhook.cs" />
+    <Compile Include="Model\WeeklyScheduleOptions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>

src/ResourceManager/Automation/Commands.Automation/Model/DayOfWeek.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Commands.Automation.Model
+{
+    public class DayOfWeek
+    {
+        /// <summary>
+        /// Gets or sets the schedule day of the week occurrence.
+        /// </summary>
+        public string Occurrence { get; set; }
+
+        /// <summary>
+        /// Gets or sets the schedule day of the week.
+        /// </summary>
+        public string Day { get; set; }
+
+    }
+}

src/ResourceManager/Automation/Commands.Automation/Model/MonthlyScheduleOptions.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Azure.Commands.Automation.Cmdlet;
+
+namespace Microsoft.Azure.Commands.Automation.Model
+{
+    public class MonthlyScheduleOptions
+    {
+        /// <summary>
+        /// Gets or sets the schedule days of the month.
+        /// </summary>
+        public IList<DaysOfMonth> DaysOfMonth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the day of week.
+        /// </summary>
+        public DayOfWeek DayOfWeek { get; set; }
+    }
+}

src/ResourceManager/Automation/Commands.Automation/Model/Schedule.cs

@@ -57,18 +57,8 @@ public Schedule(string resourceGroupName, string automationAccountName, Azure.Ma
             this.NextRun = AdjustOffset(schedule.Properties.NextRun, schedule.Properties.NextRunOffsetMinutes);
             this.Interval = schedule.Properties.Interval ?? this.Interval;
             this.Frequency = (ScheduleFrequency)Enum.Parse(typeof(ScheduleFrequency), schedule.Properties.Frequency, true);
-            this.DaysOfWeekWeeklySchedule = schedule.Properties.AdvancedSchedule == null
-                ? null
-                : schedule.Properties.AdvancedSchedule.WeekDays;
-            this.DaysOfMonth = schedule.Properties.AdvancedSchedule == null
-                ? null
-                : this.GetDaysOfMonth(schedule.Properties.AdvancedSchedule.MonthDays);
-            this.DayOfWeekMonthlySchedule = this.IsMonthlyOccurrenceNull(schedule.Properties.AdvancedSchedule)
-                ? null
-                : schedule.Properties.AdvancedSchedule.MonthlyOccurrences.First().Day;
-            this.DayOfWeekOccurrence = this.IsMonthlyOccurrenceNull(schedule.Properties.AdvancedSchedule)
-                ? null
-                : this.GetDayOfWeekOccurrence(schedule.Properties.AdvancedSchedule.MonthlyOccurrences.First().Occurrence);
+            this.WeeklyScheduleOptions = this.CreateWeeklyScheduleOptions(schedule);
+            this.MonthlyScheduleOptions = this.CreateMonthlyScheduleOptions(schedule);
             this.TimeZone = schedule.Properties.TimeZone;
         }
 
@@ -112,24 +102,14 @@ public Schedule()
         public ScheduleFrequency Frequency { get; set; }
 
         /// <summary>
-        /// Gets or sets the schedule days of the week.
-        /// </summary>
-        public IList<string> DaysOfWeekWeeklySchedule { get; set; }
-
-        /// <summary>
-        /// Gets or sets the schedule days of the month.
+        /// Gets or sets the monthly schedule options.
         /// </summary>
-        public IList<DaysOfMonth> DaysOfMonth { get; set; }
+        public MonthlyScheduleOptions MonthlyScheduleOptions { get; set; }
 
         /// <summary>
-        /// Gets or sets the schedule day of the week.
+        /// Gets or sets the weekly schedule options.
         /// </summary>
-        public string DayOfWeekMonthlySchedule { get; set; }
-
-        /// <summary>
-        /// Gets or sets the schedule day of the week occurrence.
-        /// </summary>
-        public string DayOfWeekOccurrence { get; set; }
+        public WeeklyScheduleOptions WeeklyScheduleOptions { get; set; }
 
         /// <summary>
         /// The create advanced schedule.
@@ -146,23 +126,32 @@ public AdvancedSchedule GetAdvancedSchedule()
 
             var advancedSchedule = new AdvancedSchedule()
             {
-                WeekDays = this.DaysOfWeekWeeklySchedule,
-                MonthDays = this.DaysOfMonth == null ? null : this.DaysOfMonth.Select(v => Convert.ToInt32(v)).ToList(),
-                MonthlyOccurrences = string.IsNullOrWhiteSpace(this.DayOfWeekMonthlySchedule) && this.DayOfWeekOccurrence == null
+                WeekDays = this.WeeklyScheduleOptions == null ? null : this.WeeklyScheduleOptions.DaysOfWeek,
+                MonthDays = (this.MonthlyScheduleOptions == null || this.MonthlyScheduleOptions.DaysOfMonth == null) ? null : this.MonthlyScheduleOptions.DaysOfMonth.Select(v => Convert.ToInt32(v)).ToList(),
+                MonthlyOccurrences = (this.MonthlyScheduleOptions == null || this.MonthlyScheduleOptions.DayOfWeek == null)
                     ? null
                     : new AdvancedScheduleMonthlyOccurrence[]
                     {
                         new AdvancedScheduleMonthlyOccurrence()
                         {
-                            Day = this.DayOfWeekMonthlySchedule,
-                            Occurrence = this.GetDayOfWeekOccurrence(this.DayOfWeekOccurrence)
+                            Day = this.MonthlyScheduleOptions.DayOfWeek.Day,
+                            Occurrence = this.GetDayOfWeekOccurrence(this.MonthlyScheduleOptions.DayOfWeek.Occurrence)
                         }
                     }
             };
 
             return advancedSchedule;
         }
 
+        /// <summary>
+        /// Gets or sets the schedule time zone.
+        /// </summary>
+        public string TimeZone { get; set; }
+
+        #endregion Public Properties
+
+        #region Private Methods
+
         /// <summary>
         /// The is null or empty list.
         /// </summary>
@@ -204,10 +193,8 @@ private bool IsMonthlyOccurrenceNull(Azure.Management.Automation.Models.Advanced
         /// </returns>
         private bool AdvancedScheduleIsNull(Schedule schedule)
         {
-            return (schedule.DaysOfWeekWeeklySchedule == null
-                && schedule.DaysOfMonth == null
-                && string.IsNullOrWhiteSpace(schedule.DayOfWeekMonthlySchedule)
-                && schedule.DayOfWeekOccurrence == null);
+            return schedule.WeeklyScheduleOptions == null
+                && schedule.MonthlyScheduleOptions == null;
         }
 
         /// <summary>
@@ -229,6 +216,53 @@ private bool AdvancedScheduleIsNull(Schedule schedule)
             return Convert.ToInt32(Enum.Parse(typeof(DayOfWeekOccurrence), dayOfWeekOccurrence));
         }
 
+        /// <summary>
+        /// The create weekly schedule options.
+        /// </summary>
+        /// <param name="schedule">
+        /// The schedule.
+        /// </param>
+        /// <returns>
+        /// The <see cref="WeeklyScheduleOptions"/>.
+        /// </returns>
+        private WeeklyScheduleOptions CreateWeeklyScheduleOptions(Microsoft.Azure.Management.Automation.Models.Schedule schedule)
+        {
+            return schedule.Properties.AdvancedSchedule == null
+                ? null
+                : new WeeklyScheduleOptions()
+                {
+                    DaysOfWeek = schedule.Properties.AdvancedSchedule.WeekDays
+                };
+        }
+
+        /// <summary>
+        /// The create monthly schedule options.
+        /// </summary>
+        /// <param name="schedule">
+        /// The schedule.
+        /// </param>
+        /// <returns>
+        /// The <see cref="MonthlyScheduleOptions"/>.
+        /// </returns>
+        private MonthlyScheduleOptions CreateMonthlyScheduleOptions(
+            Microsoft.Azure.Management.Automation.Models.Schedule schedule)
+        {
+            return schedule.Properties.AdvancedSchedule == null
+                || (schedule.Properties.AdvancedSchedule.MonthDays == null && schedule.Properties.AdvancedSchedule.MonthlyOccurrences == null)
+                ? null
+                : new MonthlyScheduleOptions()
+                {
+                    DaysOfMonth = this.GetDaysOfMonth(schedule.Properties.AdvancedSchedule.MonthDays),
+                    DayOfWeek = this.IsMonthlyOccurrenceNull(schedule.Properties.AdvancedSchedule)
+                        ? null
+                        : new DayOfWeek()
+                        {
+                            Day = schedule.Properties.AdvancedSchedule.MonthlyOccurrences.First().Day,
+                            Occurrence = this.GetDayOfWeekOccurrence(schedule.Properties.AdvancedSchedule.MonthlyOccurrences.First().Occurrence)
+                        }
+                };
+        }
+
         /// <summary>
         /// The get day of week occurrence.
         /// </summary>
@@ -258,14 +292,6 @@ private IList<DaysOfMonth> GetDaysOfMonth(IList<int> daysOfMonth)
         {
             return daysOfMonth.Select(value => (DaysOfMonth)value).ToList();
         }
-        /// <summary>
-        /// Gets or sets the schedule time zone.
-        /// </summary>
-        public string TimeZone { get; set; }
-
-        #endregion Public Properties
-
-        #region Private Methods
 
         private static DateTimeOffset? AdjustOffset(DateTimeOffset? dateTimeOffset, double offsetMinutes)
         {

src/ResourceManager/Automation/Commands.Automation/Model/WeeklyScheduleOptions.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Commands.Automation.Model
+{
+    public class WeeklyScheduleOptions
+    {
+        /// <summary>
+        /// Gets or sets the schedule days of the week.
+        /// </summary>
+        public IList<string> DaysOfWeek { get; set; }
+    }
+}