pagefix

Author: YunchuWang

src/ScheduledTasks/Client/IScheduledTaskClient.cs

@@ -28,7 +28,7 @@ public interface IScheduledTaskClient
     /// </summary>
     /// <param name="filter">Optional filter criteria for the schedules. If null, returns all schedules.</param>
     /// <returns>A pageable list of schedule descriptions.</returns>
-    Task<AsyncPageable<ScheduleDescription>> ListSchedulesAsync(ScheduleQuery? filter = null);
+    AsyncPageable<ScheduleDescription> ListSchedulesAsync(ScheduleQuery? filter = null);
 
     /// <summary>
     /// Creates a new schedule with the specified configuration.

src/ScheduledTasks/Client/ScheduledTaskClient.cs

@@ -124,70 +124,65 @@ public IScheduleHandle GetScheduleHandle(string scheduleId)
     /// <inheritdoc/>
     public AsyncPageable<ScheduleDescription> ListSchedulesAsync(ScheduleQuery? filter = null)
     {
-        // TODO: map to entity query last modified from/to filters
-        EntityQuery query = new EntityQuery
-        {
-            InstanceIdStartsWith = filter?.ScheduleIdPrefix ?? nameof(Schedule),
-            IncludeState = true,
-            PageSize = filter?.PageSize ?? ScheduleQuery.DefaultPageSize,
-            ContinuationToken = filter?.ContinuationToken,
-        };
-
         // Create an async pageable using the Pageable.Create helper
-        return Task.FromResult(Pageable.Create(async (continuationToken, pageSize, cancellation) =>
+        return Pageable.Create(async (continuationToken, pageSize, cancellation) =>
         {
             try
             {
-                List<ScheduleDescription> schedules = new List<ScheduleDescription>();
+                // TODO: map to entity query last modified from/to filters
+                EntityQuery query = new EntityQuery
+                {
+                    InstanceIdStartsWith = filter?.ScheduleIdPrefix ?? nameof(Schedule),
+                    IncludeState = true,
+                    PageSize = filter?.PageSize ?? ScheduleQuery.DefaultPageSize,
+                    ContinuationToken = continuationToken,
+                };
+
+                // Get one page of entities
+                IAsyncEnumerable<Page<EntityMetadata<ScheduleState>>> entityPages =
+                    this.durableTaskClient.Entities.GetAllEntitiesAsync<ScheduleState>(query).AsPages();
 
-                await foreach (EntityMetadata<ScheduleState> metadata in this.durableTaskClient.Entities.GetAllEntitiesAsync<ScheduleState>(query))
+                await foreach (Page<EntityMetadata<ScheduleState>> entityPage in entityPages)
                 {
-                    ScheduleState state = metadata.State;
-
-                    // Skip if status filter is specified and doesn't match
-                    if (filter?.Status.HasValue == true && state.Status != filter.Status.Value)
-                    {
-                        continue;
-                    }
-
-                    // Skip if created time filter is specified and doesn't match
-                    if (filter?.CreatedFrom.HasValue == true && state.ScheduleCreatedAt <= filter.CreatedFrom)
-                    {
-                        continue;
-                    }
-
-                    if (filter?.CreatedTo.HasValue == true && state.ScheduleCreatedAt >= filter.CreatedTo)
-                    {
-                        continue;
-                    }
-
-                    ScheduleConfiguration config = state.ScheduleConfiguration!;
-
-                    schedules.Add(new ScheduleDescription
-                    {
-                        ScheduleId = metadata.Id.Key,
-                        OrchestrationName = config.OrchestrationName,
-                        OrchestrationInput = config.OrchestrationInput,
-                        OrchestrationInstanceId = config.OrchestrationInstanceId,
-                        StartAt = config.StartAt,
-                        EndAt = config.EndAt,
-                        Interval = config.Interval,
-                        StartImmediatelyIfLate = config.StartImmediatelyIfLate,
-                        Status = state.Status,
-                        ExecutionToken = state.ExecutionToken,
-                        LastRunAt = state.LastRunAt,
-                        NextRunAt = state.NextRunAt,
-                    });
+                    List<ScheduleDescription> schedules = entityPage.Values
+                        .Where(metadata =>
+                            (!filter?.Status.HasValue ?? true || metadata.State.Status == filter.Status.Value) &&
+                            (filter?.CreatedFrom.HasValue != true || metadata.State.ScheduleCreatedAt > filter.CreatedFrom) &&
+                            (filter?.CreatedTo.HasValue != true || metadata.State.ScheduleCreatedAt < filter.CreatedTo))
+                        .Select(metadata =>
+                        {
+                            ScheduleState state = metadata.State;
+                            ScheduleConfiguration config = state.ScheduleConfiguration!;
+                            return new ScheduleDescription
+                            {
+                                ScheduleId = metadata.Id.Key,
+                                OrchestrationName = config.OrchestrationName,
+                                OrchestrationInput = config.OrchestrationInput,
+                                OrchestrationInstanceId = config.OrchestrationInstanceId,
+                                StartAt = config.StartAt,
+                                EndAt = config.EndAt,
+                                Interval = config.Interval,
+                                StartImmediatelyIfLate = config.StartImmediatelyIfLate,
+                                Status = state.Status,
+                                ExecutionToken = state.ExecutionToken,
+                                LastRunAt = state.LastRunAt,
+                                NextRunAt = state.NextRunAt,
+                            };
+                        })
+                        .ToList();
+
+                    return new Page<ScheduleDescription>(schedules, entityPage.ContinuationToken);
                 }
 
-                return new Page<ScheduleDescription>(schedules, continuationToken);
+                // Return empty page if no results
+                return new Page<ScheduleDescription>(new List<ScheduleDescription>(), null);
             }
             catch (OperationCanceledException e)
             {
                 throw new OperationCanceledException(
                     $"The {nameof(this.ListSchedulesAsync)} operation was canceled.", e, e.CancellationToken);
             }
-        }));
+        });
     }
 
     /// <summary>