Enhance the way we retrieve the build history.

src/Soloplan.WhatsON.Jenkins.Tests/FakeJenkinsApi.cs

@@ -8,10 +8,12 @@
 namespace Soloplan.WhatsON.Jenkins.Tests
 {
   using System;
+  using System.Collections.Generic;
   using System.Threading;
   using System.Threading.Tasks;
   using Soloplan.WhatsON.Jenkins;
   using Soloplan.WhatsON.Jenkins.Model;
+  using Soloplan.WhatsON.Model;
 
   public class FakeJenkinsApi : IJenkinsApi
   {
@@ -52,6 +54,11 @@ public async Task<JenkinsBuild> GetJenkinsBuild(JenkinsConnector connector, int
 
       return eventArgs.Result;
     }
+
+    public Task<IList<JenkinsBuild>> GetBuilds(JenkinsConnector connector, CancellationToken token, int @from = 0, int to = Connector.MaxSnapshots)
+    {
+      throw new NotImplementedException();
+    }
   }
 
   public class FakeApiEventArgs : EventArgs

src/Soloplan.WhatsON.Jenkins/IJenkinsApi.cs

@@ -7,9 +7,11 @@
 
 namespace Soloplan.WhatsON.Jenkins
 {
+  using System.Collections.Generic;
   using System.Threading;
   using System.Threading.Tasks;
   using Soloplan.WhatsON.Jenkins.Model;
+  using Soloplan.WhatsON.Model;
 
   /// <summary>
   /// Interface defining API for Jenkins.
@@ -32,5 +34,7 @@ public interface IJenkinsApi
     /// <param name="token">Cancellation token.</param>
     /// <returns>Information about specific build. <seealso cref="JenkinsBuild"/>.</returns>
     Task<JenkinsBuild> GetJenkinsBuild(JenkinsConnector connector, int buildNumber, CancellationToken token);
+
+    Task<IList<JenkinsBuild>> GetBuilds(JenkinsConnector connector, CancellationToken token, int from = 0, int to = Connector.MaxSnapshots);
   }
 }

src/Soloplan.WhatsON.Jenkins/JenkinsAPI.cs

@@ -8,13 +8,16 @@
 namespace Soloplan.WhatsON.Jenkins
 {
   using System;
+  using System.Collections.Generic;
   using System.IO;
   using System.Net;
   using System.Threading;
   using System.Threading.Tasks;
+  using System.Web;
   using Newtonsoft.Json;
   using NLog;
   using Soloplan.WhatsON.Jenkins.Model;
+  using Soloplan.WhatsON.Model;
 
   public class JenkinsApi : IJenkinsApi
   {
@@ -55,5 +58,20 @@ public async Task<JenkinsBuild> GetJenkinsBuild(JenkinsConnector connector, int
       log.Trace("Querying build: {jobRequest}", buildRequest);
       return await SerializationHelper.GetJsonModel<JenkinsBuild>(buildRequest, token);
     }
+
+    public async Task<IList<JenkinsBuild>> GetBuilds(JenkinsConnector connector, CancellationToken token, int from = 0, int to = Connector.MaxSnapshots)
+    {
+      var address = connector.Address;
+      var projectName = connector.GetProject();
+
+      var buildsRequest = $"{address.Trim('/')}/job/{projectName.Trim('/')}/api/json?tree=builds[{JenkinsBuild.RequestProperties}]{{{from},{to}}}";
+      var builds = await SerializationHelper.GetJsonModel<JenkinsBuilds>(buildsRequest, token);
+      if (builds == null || builds.Builds == null)
+      {
+        return new List<JenkinsBuild>();
+      }
+
+      return builds.Builds;
+    }
   }
 }

src/Soloplan.WhatsON.Jenkins/JenkinsConnector.cs

@@ -57,8 +57,6 @@ public JenkinsConnector(ConnectorConfiguration configuration, IJenkinsApi api)
 
     public string Project => this.GetProject();
 
-    private JenkinsStatus PreviousCheckStatus { get; set; }
-
     /// <summary>
     /// Gets the project.
     /// </summary>
@@ -78,64 +76,22 @@ protected override async Task ExecuteQuery(CancellationToken cancellationToken,
 
       var latestBuild = await this.api.GetJenkinsBuild(this, job.LastBuild.Number, cancellationToken);
       this.CurrentStatus = CreateStatus(latestBuild);
-      if (this.Snapshots.Count == 0 && job.FirstBuild.Number < job.LastBuild.Number)
+      if (this.Snapshots.Count == 0 && job.LastBuild.Number > 1)
       {
-        var startBuildNumber = latestBuild.Building ? latestBuild.Number - 1 : latestBuild.Number;
-        var lastHistoryBuild = Math.Max(startBuildNumber - MaxSnapshots + 1, 0);
-        lastHistoryBuild = Math.Max(lastHistoryBuild, job.FirstBuild.Number);
-        log.Debug("Retrieving history from the server for builds {builds}", new { StartBuild = lastHistoryBuild, EndBuild = startBuildNumber - 1 });
-
-        JenkinsStatus buildStatus = null;
-        for (int i = lastHistoryBuild; i <= startBuildNumber; i++)
+        foreach (var build in await this.api.GetBuilds(this, cancellationToken, 1, MaxSnapshots + 1))
         {
-          buildStatus = CreateStatus(await this.api.GetJenkinsBuild(this, i, cancellationToken));
-          log.Debug("Retrieved status {buildStatus}", buildStatus);
+          var buildStatus = CreateStatus(build);
           this.AddSnapshot(buildStatus);
         }
-
-        this.PreviousCheckStatus = buildStatus;
       }
 
-      if (this.PreviousCheckStatus != null && this.CurrentStatus is JenkinsStatus currentStatus)
+      // push current state to the snapshots because it's done building
+      if (this.ShouldTakeSnapshot(this.CurrentStatus))
       {
-        if (currentStatus.BuildNumber - this.PreviousCheckStatus.BuildNumber > 1)
-        {
-          var start = this.PreviousCheckStatus.BuildNumber + 1;
-          for (int i = start; i < currentStatus.BuildNumber; i++)
-          {
-            var buildStatus = CreateStatus(await this.api.GetJenkinsBuild(this, i, cancellationToken));
-            if (this.ShouldTakeSnapshot(buildStatus))
-            {
-              this.AddSnapshot(buildStatus);
-            }
-          }
-        }
+        this.AddSnapshot(this.CurrentStatus);
       }
     }
 
-    protected override bool ShouldTakeSnapshot(Status status)
-    {
-      log.Trace("Checking if snapshot should be taken...");
-      if (status is JenkinsStatus currentStatus)
-      {
-        if (this.PreviousCheckStatus != null)
-        {
-          if (status.State != ObservationState.Running && (status.State != this.PreviousCheckStatus.State || this.PreviousCheckStatus.BuildNumber != currentStatus.BuildNumber))
-          {
-            log.Debug("Snapshot should be taken. {stat}", new { this.PreviousCheckStatus, CurrentStatus = currentStatus });
-            this.PreviousCheckStatus = currentStatus;
-            return true;
-          }
-        }
-        else
-        {
-          this.PreviousCheckStatus = currentStatus;
-        }
-      }
-
-      return false;
-    }
-
     private static JenkinsStatus CreateStatus(JenkinsBuild latestBuild)
     {
       var newStatus = new JenkinsStatus(GetState(latestBuild))

src/Soloplan.WhatsON.Jenkins/Model/JenkinsBuilds.cs

@@ -0,0 +1,16 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="JenkinsBuilds.cs" company="Soloplan GmbH">
+// Copyright (c) Soloplan GmbH. All rights reserved.
+// Licensed under the MIT License. See License-file in the project root for license information.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace Soloplan.WhatsON.Jenkins.Model
+{
+  using System.Collections.Generic;
+
+  public class JenkinsBuilds
+  {
+    public IList<JenkinsBuild> Builds { get; set; }
+  }
+}

src/Soloplan.WhatsON/Model/Connector.cs

@@ -102,7 +102,7 @@ public void AddSnapshot(Status status)
       while (this.Snapshots.Count >= MaxSnapshots)
       {
         log.Debug("Max number of snapshots exceeded. Dequeuing snapshot.", new { Name = this.ConnectorConfiguration.Name, CurrentStatus = this.CurrentStatus });
-        this.Snapshots.RemoveAt(0);
+        this.Snapshots.RemoveAt(this.Snapshots.Count - 1); // remove the end of the list because we're sortring by age
       }
 
       this.Snapshots.Add(new Snapshot(status));
@@ -131,6 +131,14 @@ public override string ToString()
 
     protected virtual bool ShouldTakeSnapshot(Status status)
     {
+      log.Trace("Checking if snapshot should be taken...");
+
+      if (status.State != ObservationState.Running && this.Snapshots.All(x => x.Status.BuildNumber != status.BuildNumber))
+      {
+        log.Debug("Snapshot should be taken. {stat}", new { CurrentStatus = status });
+        return true;
+      }
+
       return false;
     }
   }