Updated how estimatedNextRunTime is set from the WebApi GetJobsHandler

Author: danielluo-msft

Service/GroupMembershipManagement/Hosts/WebApi/Services.WebApi/GetJobsHandler.cs

@@ -76,14 +76,32 @@ protected override async Task<GetJobsResponse> ExecuteCoreAsync(GetJobsRequest r
             foreach (var job in jobs)
             {
                 var type = job.Destination.Contains("GroupMembership") ? "Group" : "Channel";
+                var currentTime = DateTime.UtcNow;
+                var jobStartsInFuture = currentTime < job.StartDate;
+                var jobScheduledForFuture = currentTime < job.ScheduledDate;
+
+                DateTime estimatedNextRunTime;
+                if (!jobStartsInFuture && !jobScheduledForFuture)
+                {
+                    estimatedNextRunTime = job.LastRunTime.AddHours(job.Period);
+                }
+                else if (jobStartsInFuture)
+                {
+                    estimatedNextRunTime = job.StartDate;
+                }
+                else
+                {
+                    estimatedNextRunTime = job.ScheduledDate;
+                }
+
                 var dto = new SyncJobDTO
                 (
                     job.Id,
                     job.TargetOfficeGroupId,
                     job.Status,
                     job.Period,
                     job.LastSuccessfulRunTime,
-                    job.StartDate > job.ScheduledDate ? job.StartDate : job.ScheduledDate
+                    estimatedNextRunTime
                 )
                 {
                     TargetGroupName = targetGroups.ContainsKey(job.TargetOfficeGroupId) ? targetGroups[job.TargetOfficeGroupId].Name : null,