Apply the same endpoint filtering the min and max timeout-expiry-times (#113) (#114)

lailabougria · web-flow · commit 5c2f86cd0069 · 2020-06-26T16:12:56.000+02:00
(cherry picked from commit e4ecf31)
diff --git a/src/TimeoutMigrationTool.Raven.IntegrationTests/IRavenTestSuite.cs b/src/TimeoutMigrationTool.Raven.IntegrationTests/IRavenTestSuite.cs
@@ -24,6 +24,6 @@ public interface IRavenTestSuite
         Task TeardownDatabase();
         Task CreateLegacyTimeoutManagerIndex(bool waitForIndexToBeUpToDate);
         Task EnsureIndexIsNotStale();
-        Task InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId);
+        Task<InitiTimeoutsResult> InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId);
     }
 }
diff --git a/src/TimeoutMigrationTool.Raven.IntegrationTests/InitiTimeoutsResult.cs b/src/TimeoutMigrationTool.Raven.IntegrationTests/InitiTimeoutsResult.cs
@@ -0,0 +1,10 @@
+﻿namespace TimeoutMigrationTool.Raven.IntegrationTests
+{
+    using System;
+
+    public class InitiTimeoutsResult
+    {
+        public DateTime ShortestTimeout { get; set; }
+        public DateTime LongestTimeout { get; set; }
+    }
+}
diff --git a/src/TimeoutMigrationTool.Raven.IntegrationTests/Raven3/Raven3TestSuite.cs b/src/TimeoutMigrationTool.Raven.IntegrationTests/Raven3/Raven3TestSuite.cs
@@ -23,6 +23,7 @@ public string ServerName
         {
             get { return serverName; }
         }
+        static Random random = new Random();
 
         public async Task SetupDatabase()
         {
@@ -67,9 +68,13 @@ public async Task InitTimeouts(int nrOfTimeouts)
             }
         }
         
-        public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId)
+        public async Task<InitiTimeoutsResult> InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId)
         {
             var timeoutsPrefix = "TimeoutDatas";
+            var shortestTimeout = DateTime.MaxValue;
+            var longestTimeout = DateTime.MinValue;
+            var daysToTrigger = random.Next(2, 60); // randomize the Time property
+            
             for (var i = 0; i < nrOfTimeouts; i++)
             {
                 var insertTimeoutUrl = $"{serverName}/databases/{DatabaseName}/docs/{timeoutsPrefix}/{startFromId +i}";
@@ -81,7 +86,7 @@ public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startF
                     Destination = "WeDontCare.ThisShouldBeIgnored.BecauseItsJustForRouting",
                     SagaId = Guid.NewGuid(),
                     OwningTimeoutManager = endpointName,
-                    Time = i < nrOfTimeouts / 2 ? DateTime.Now.AddDays(7) : DateTime.Now.AddDays(14),
+                    Time = DateTime.Now.AddDays(daysToTrigger),
                     Headers = new Dictionary<string, string>(),
                     State = Encoding.ASCII.GetBytes("This is my state")
                 };
@@ -91,7 +96,16 @@ public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startF
 
                 var result = await httpClient.PutAsync(insertTimeoutUrl, httpContent);
                 Assert.That(result.StatusCode, Is.EqualTo(HttpStatusCode.Created));
+                if (shortestTimeout > timeoutData.Time) shortestTimeout = timeoutData.Time;
+                if (longestTimeout < timeoutData.Time) longestTimeout = timeoutData.Time;
             }
+            
+            return new InitiTimeoutsResult               
+            {
+               ShortestTimeout = shortestTimeout,
+               LongestTimeout = longestTimeout
+            };
+
         }
 
         public async Task<List<RavenBatch>> SetupExistingBatchInfoInDatabase()
diff --git a/src/TimeoutMigrationTool.Raven.IntegrationTests/Raven4/Raven4TestSuite.cs b/src/TimeoutMigrationTool.Raven.IntegrationTests/Raven4/Raven4TestSuite.cs
@@ -19,6 +19,7 @@ class Raven4TestSuite : IRavenTestSuite
     {
         public ICanTalkToRavenVersion RavenAdapter => new Raven4Adapter(ServerName, DatabaseName);
         public ILogger Logger => new ConsoleLogger(false);
+        static Random random = new Random();
 
         public string ServerName
         {
@@ -81,9 +82,13 @@ public async Task InitTimeouts(int nrOfTimeouts)
             }
         }
         
-        public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId)
+        public async Task<InitiTimeoutsResult> InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId)
         {
             var timeoutsPrefix = "TimeoutDatas";
+            var shortestTimeout = DateTime.MaxValue;
+            var longestTimeout = DateTime.MinValue;
+            var daysToTrigger = random.Next(2, 60); // randomize the Time property
+            
             for (var i = 0; i < nrOfTimeouts; i++)
             {
                 var insertTimeoutUrl = $"{ServerName}/databases/{DatabaseName}/docs?id={timeoutsPrefix}/{startFromId + i}";
@@ -94,7 +99,7 @@ public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startF
                     Destination = "WeDontCare.ThisShouldBeIgnored.BecauseItsJustForRouting",
                     SagaId = Guid.NewGuid(),
                     OwningTimeoutManager = endpointName,
-                    Time = i < nrOfTimeouts / 2 ? DateTime.Now.AddDays(7) : DateTime.Now.AddDays(14),
+                    Time = DateTime.Now.AddDays(daysToTrigger),
                     Headers = new Dictionary<string, string>(),
                     State = Encoding.ASCII.GetBytes("This is my state")
                 };
@@ -104,7 +109,15 @@ public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startF
 
                 var result = await httpClient.PutAsync(insertTimeoutUrl, httpContent);
                 Assert.That(result.StatusCode, Is.EqualTo(HttpStatusCode.Created));
+                if (shortestTimeout > timeoutData.Time) shortestTimeout = timeoutData.Time;
+                if (longestTimeout < timeoutData.Time) longestTimeout = timeoutData.Time;
             }
+            
+            return new InitiTimeoutsResult               
+            {
+                ShortestTimeout = shortestTimeout,
+                LongestTimeout = longestTimeout
+            };
         }
 
         public RavenToolState SetupToolState(DateTime cutoffTime)
diff --git a/src/TimeoutMigrationTool.Raven.IntegrationTests/RavenListEndpoints.cs b/src/TimeoutMigrationTool.Raven.IntegrationTests/RavenListEndpoints.cs
@@ -43,20 +43,26 @@ public async Task WhenThereAreNoTimeoutsListEndpointsReturnsAnEmptyList()
         [Test]
         public async Task WhenThereTimeoutsListEndpointsReturnsEndpointsList()
         {
-            await testSuite.InitTimeouts(nrOfTimeouts, "EndpointA", 0);
-            await testSuite.InitTimeouts(500, "EndpointB", nrOfTimeouts);
+            var endpointATimes = await testSuite.InitTimeouts(nrOfTimeouts, "EndpointA", 0);
+            var endpointBTimes = await testSuite.InitTimeouts(500, "EndpointB", nrOfTimeouts);
 
             var sut = new RavenDBTimeoutStorage(testSuite.Logger,testSuite.ServerName, testSuite.DatabaseName, "TimeoutDatas", testSuite.RavenVersion, false);
             var endpoints = await sut.ListEndpoints(DateTime.Now);
 
             Assert.IsNotNull(endpoints);
             Assert.That(endpoints.Count, Is.EqualTo(2));
+            
             var endpointA = endpoints.FirstOrDefault(x => x.EndpointName == "EndpointA");
-            var endpointB = endpoints.FirstOrDefault(x => x.EndpointName == "EndpointB");
             Assert.IsNotNull(endpointA);
             Assert.That(endpointA.NrOfTimeouts, Is.EqualTo(nrOfTimeouts));
+            Assert.That(endpointA.ShortestTimeout, Is.EqualTo(endpointATimes.ShortestTimeout));
+            Assert.That(endpointA.LongestTimeout, Is.EqualTo(endpointATimes.LongestTimeout));
+            
+            var endpointB = endpoints.FirstOrDefault(x => x.EndpointName == "EndpointB");
             Assert.IsNotNull(endpointB);
             Assert.That(endpointB.NrOfTimeouts, Is.EqualTo(500));
+            Assert.That(endpointB.ShortestTimeout, Is.EqualTo(endpointBTimes.ShortestTimeout));
+            Assert.That(endpointB.LongestTimeout, Is.EqualTo(endpointBTimes.LongestTimeout));
         }
 
         [Test]
diff --git a/src/TimeoutMigrationTool/RavenDB/RavenDBTimeoutStorage.cs b/src/TimeoutMigrationTool/RavenDB/RavenDBTimeoutStorage.cs
@@ -151,13 +151,17 @@ static void ProcessTimeoutsIntoEndpointsFound(List<TimeoutData> timeouts, Dictio
             var endpointsFetched = eligibleTimeouts.GroupBy(
                 key => key.OwningTimeoutManager.Replace(RavenConstants.MigrationDonePrefix, "").Replace(RavenConstants.MigrationOngoingPrefix, ""),
                 elements => elements,
-                (endpointName, destinationTimeouts) => new EndpointInfo
+                (endpointName, destinationTimeouts) =>
                 {
-                    EndpointName = endpointName,
-                    NrOfTimeouts = eligibleTimeouts.Count(x => x.OwningTimeoutManager.Replace(RavenConstants.MigrationDonePrefix, "").Replace(RavenConstants.MigrationOngoingPrefix, "") == endpointName),
-                    ShortestTimeout = eligibleTimeouts.Min(x => x.Time),
-                    LongestTimeout = eligibleTimeouts.Max(x => x.Time),
-                    Destinations = eligibleTimeouts.GroupBy(x => x.Destination).Select(g => g.Key).ToList()
+                    var endpointTimeouts = eligibleTimeouts.Where(x => x.OwningTimeoutManager.Replace(RavenConstants.MigrationDonePrefix, "").Replace(RavenConstants.MigrationOngoingPrefix, "") == endpointName).ToList();
+                    return new EndpointInfo
+                    {
+                        EndpointName = endpointName,
+                        NrOfTimeouts = endpointTimeouts.Count(),
+                        ShortestTimeout = endpointTimeouts.Min(x => x.Time),
+                        LongestTimeout = endpointTimeouts.Max(x => x.Time),
+                        Destinations = eligibleTimeouts.GroupBy(x => x.Destination).Select(g => g.Key).ToList()
+                    };
                 }).ToList();
 
             endpointsFetched.ForEach(ep =>

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ public interface IRavenTestSuite`
`24`	`24`	`Task TeardownDatabase();`
`25`	`25`	`Task CreateLegacyTimeoutManagerIndex(bool waitForIndexToBeUpToDate);`
`26`	`26`	`Task EnsureIndexIsNotStale();`
`27`		`- Task InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId);`
	`27`	`+ Task<InitiTimeoutsResult> InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId);`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public string ServerName`
`23`	`23`	`{`
`24`	`24`	`get { return serverName; }`
`25`	`25`	`}`
	`26`	`+ static Random random = new Random();`
`26`	`27`
`27`	`28`	`public async Task SetupDatabase()`
`28`	`29`	`{`
`@@ -67,9 +68,13 @@ public async Task InitTimeouts(int nrOfTimeouts)`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`
`70`		`- public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId)`
	`71`	`+ public async Task<InitiTimeoutsResult> InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId)`
`71`	`72`	`{`
`72`	`73`	`var timeoutsPrefix = "TimeoutDatas";`
	`74`	`+ var shortestTimeout = DateTime.MaxValue;`
	`75`	`+ var longestTimeout = DateTime.MinValue;`
	`76`	`+ var daysToTrigger = random.Next(2, 60); // randomize the Time property`
	`77`	`+`
`73`	`78`	`for (var i = 0; i < nrOfTimeouts; i++)`
`74`	`79`	`{`
`75`	`80`	`var insertTimeoutUrl = $"{serverName}/databases/{DatabaseName}/docs/{timeoutsPrefix}/{startFromId +i}";`
`@@ -81,7 +86,7 @@ public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startF`
`81`	`86`	`Destination = "WeDontCare.ThisShouldBeIgnored.BecauseItsJustForRouting",`
`82`	`87`	`SagaId = Guid.NewGuid(),`
`83`	`88`	`OwningTimeoutManager = endpointName,`
`84`		`- Time = i < nrOfTimeouts / 2 ? DateTime.Now.AddDays(7) : DateTime.Now.AddDays(14),`
	`89`	`+ Time = DateTime.Now.AddDays(daysToTrigger),`
`85`	`90`	`Headers = new Dictionary<string, string>(),`
`86`	`91`	`State = Encoding.ASCII.GetBytes("This is my state")`
`87`	`92`	`};`
`@@ -91,7 +96,16 @@ public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startF`
`91`	`96`
`92`	`97`	`var result = await httpClient.PutAsync(insertTimeoutUrl, httpContent);`
`93`	`98`	`Assert.That(result.StatusCode, Is.EqualTo(HttpStatusCode.Created));`
	`99`	`+ if (shortestTimeout > timeoutData.Time) shortestTimeout = timeoutData.Time;`
	`100`	`+ if (longestTimeout < timeoutData.Time) longestTimeout = timeoutData.Time;`
`94`	`101`	`}`
	`102`	`+`
	`103`	`+ return new InitiTimeoutsResult`
	`104`	`+ {`
	`105`	`+ ShortestTimeout = shortestTimeout,`
	`106`	`+ LongestTimeout = longestTimeout`
	`107`	`+ };`
	`108`	`+`
`95`	`109`	`}`
`96`	`110`
`97`	`111`	`public async Task<List<RavenBatch>> SetupExistingBatchInfoInDatabase()`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ class Raven4TestSuite : IRavenTestSuite`
`19`	`19`	`{`
`20`	`20`	`public ICanTalkToRavenVersion RavenAdapter => new Raven4Adapter(ServerName, DatabaseName);`
`21`	`21`	`public ILogger Logger => new ConsoleLogger(false);`
	`22`	`+ static Random random = new Random();`
`22`	`23`
`23`	`24`	`public string ServerName`
`24`	`25`	`{`
`@@ -81,9 +82,13 @@ public async Task InitTimeouts(int nrOfTimeouts)`
`81`	`82`	`}`
`82`	`83`	`}`
`83`	`84`
`84`		`- public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId)`
	`85`	`+ public async Task<InitiTimeoutsResult> InitTimeouts(int nrOfTimeouts, string endpointName, int startFromId)`
`85`	`86`	`{`
`86`	`87`	`var timeoutsPrefix = "TimeoutDatas";`
	`88`	`+ var shortestTimeout = DateTime.MaxValue;`
	`89`	`+ var longestTimeout = DateTime.MinValue;`
	`90`	`+ var daysToTrigger = random.Next(2, 60); // randomize the Time property`
	`91`	`+`
`87`	`92`	`for (var i = 0; i < nrOfTimeouts; i++)`
`88`	`93`	`{`
`89`	`94`	`var insertTimeoutUrl = $"{ServerName}/databases/{DatabaseName}/docs?id={timeoutsPrefix}/{startFromId + i}";`
`@@ -94,7 +99,7 @@ public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startF`
`94`	`99`	`Destination = "WeDontCare.ThisShouldBeIgnored.BecauseItsJustForRouting",`
`95`	`100`	`SagaId = Guid.NewGuid(),`
`96`	`101`	`OwningTimeoutManager = endpointName,`
`97`		`- Time = i < nrOfTimeouts / 2 ? DateTime.Now.AddDays(7) : DateTime.Now.AddDays(14),`
	`102`	`+ Time = DateTime.Now.AddDays(daysToTrigger),`
`98`	`103`	`Headers = new Dictionary<string, string>(),`
`99`	`104`	`State = Encoding.ASCII.GetBytes("This is my state")`
`100`	`105`	`};`
`@@ -104,7 +109,15 @@ public async Task InitTimeouts(int nrOfTimeouts, string endpointName, int startF`
`104`	`109`
`105`	`110`	`var result = await httpClient.PutAsync(insertTimeoutUrl, httpContent);`
`106`	`111`	`Assert.That(result.StatusCode, Is.EqualTo(HttpStatusCode.Created));`
	`112`	`+ if (shortestTimeout > timeoutData.Time) shortestTimeout = timeoutData.Time;`
	`113`	`+ if (longestTimeout < timeoutData.Time) longestTimeout = timeoutData.Time;`
`107`	`114`	`}`
	`115`	`+`
	`116`	`+ return new InitiTimeoutsResult`
	`117`	`+ {`
	`118`	`+ ShortestTimeout = shortestTimeout,`
	`119`	`+ LongestTimeout = longestTimeout`
	`120`	`+ };`
`108`	`121`	`}`
`109`	`122`
`110`	`123`	`public RavenToolState SetupToolState(DateTime cutoffTime)`