Merge pull request #23 from brminnick/Add-Time-Range

Fix Date Range Support
brminnick · Jan 4, 2021 · 729ce8b · 729ce8b
2 parents a6bb87f + 87b23ed
commit 729ce8b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/AzureAdvocates.Functions/AzureAdvocates.Functions.csproj b/AzureAdvocates.Functions/AzureAdvocates.Functions.csproj
@@ -20,5 +20,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>Never</CopyToPublishDirectory>
     </None>
+    <None Update="local.settings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/AzureAdvocates.Functions/Functions/GetMicrosoftLearnContributors.cs b/AzureAdvocates.Functions/Functions/GetMicrosoftLearnContributors.cs
@@ -37,10 +37,6 @@ public async Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous,
         {
             log.LogInformation($"{nameof(GetMicrosoftLearnContributors)} Started");
 
-            var timeSpan = to - from;
-            if (timeSpan.TotalDays > 365)
-                return new BadRequestObjectResult($"Invalid Timespan: {timeSpan.TotalDays} days. Timespan must be less than 365 days");
-
             var cancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(2));
             var gitHubApiStatus = await _gitHubApiStatusService.GetApiRateLimits(cancellationTokenSource.Token).ConfigureAwait(false);
             if (gitHubApiStatus.GraphQLApi.RemainingRequestCount < 4000)
@@ -71,7 +67,7 @@ public async Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous,
             var cloudAdvocateContributions = new List<GitHubContributorModel>();
             foreach (var cloudAdvocate in cloudAdvocateList)
             {
-                var cloudAdvocateContributorModel = new GitHubContributorModel(microsoftLearnPullRequests.Where(x => x.Author.Equals(cloudAdvocate.GitHubUserName, StringComparison.OrdinalIgnoreCase)), cloudAdvocate);
+                var cloudAdvocateContributorModel = new GitHubContributorModel(microsoftLearnPullRequests.Where(x => x.Author.Equals(cloudAdvocate.GitHubUserName, StringComparison.OrdinalIgnoreCase) && x.CreatedAt.IsWithinRange(from, to)), cloudAdvocate);
 
                 cloudAdvocateContributions.Add(cloudAdvocateContributorModel);
 
@@ -81,4 +77,9 @@ public async Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Anonymous,
             return new OkObjectResult(cloudAdvocateContributions);
         }
     }
+
+    static class DateTimeExtensions
+    {
+        public static bool IsWithinRange(this DateTimeOffset dateTimeOffset, DateTimeOffset start, DateTimeOffset end) => dateTimeOffset >= start && dateTimeOffset <= end;
+    }
 }
diff --git a/GitHubReadmeWebTrends.Common/Services/GitHubGraphQLApiService.cs b/GitHubReadmeWebTrends.Common/Services/GitHubGraphQLApiService.cs
@@ -10,12 +10,12 @@ public class GitHubGraphQLApiService
     {
         readonly static IReadOnlyList<(string Owner, string Repository)> _microsoftLearnRepositories = new[]
         {
-           ("microsoftdocs", "learn-bizapps-pr"),
+           ("microsoftdocs", "learnshared"),
            ("microsoftdocs", "learn-certs-pr"),
-           ("microsoftdocs", "learn-dynamics-pr"),
            ("microsoftdocs", "learn-m365-pr"),
+           ("microsoftdocs", "learn-bizapps-pr"),
+           ("microsoftdocs", "learn-dynamics-pr"),
            ("microsoftdocs", "learn-pr"),
-           ("microsoftdocs", "learnshared")
         };
 
         readonly IGitHubGraphQLApiClient _gitHubGraphQLApiClient;

diff --git a/GitHubReadmeWebTrends.Common/Services/StartupService.cs b/GitHubReadmeWebTrends.Common/Services/StartupService.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using GitHubApiStatus.Extensions;
 using Microsoft.Extensions.DependencyInjection;
-using Polly;
-using Polly.Extensions.Http;
 using Refit;
 
 namespace GitHubReadmeWebTrends.Common