Set earliest date for error message.task-24580-2

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
index 41b7da4..97f7209 100644
--- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
@@ -3,6 +3,8 @@
 
 package org.torproject.metrics.exonerator;
 
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
+
 import org.apache.commons.lang3.StringEscapeUtils;
 
 import org.slf4j.Logger;
@@ -13,6 +15,7 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URL;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -192,10 +195,10 @@ public class ExoneraTorServlet extends HttpServlet {
 
         /* If the requested date is out of range, tell the user. */
       } else if (timestampOutOfRange) {
+        LocalDate dayBeforeYesterday = LocalDate.now().minusDays(2);
         this.writeSummaryTimestampOutsideRange(out, rb, requestedDate.asString,
-            firstDate.asString, lastDate.asString);
-        //                      ^^^^^^^^ TODO change to last accepted date
-        //                                    = min(lastDate, today - 2)
+            firstDate.asString, lastDate.date.isBefore(dayBeforeYesterday)
+            ? lastDate.asString : dayBeforeYesterday.format(ISO_LOCAL_DATE));
         this.writeFooter(out, rb, relayIp, requestedDate.asString);
 
       } else if (noRelevantConsensuses) {