Round to "second" precision to avoid strange "1 second is missing" issues.

Author: Bytekeeper

src/main/java/org/stt/model/TimeTrackingItem.java

@@ -1,5 +1,7 @@
 package org.stt.model;
 
+import org.stt.time.DateTimes;
+
 import java.time.LocalDateTime;
 import java.util.Optional;
 
@@ -20,8 +22,8 @@ public final class TimeTrackingItem {
     public TimeTrackingItem(String activity, LocalDateTime start, LocalDateTime end) {
         this.activity = requireNonNull(activity);
         this.start = requireNonNull(start, "start must not be null");
-        this.end = Optional.of(end.withNano(0));
-        requireThat(!end.isBefore(start.withNano(0)),
+        this.end = Optional.of(DateTimes.preciseToSecond(end));
+        requireThat(!end.isBefore(DateTimes.preciseToSecond(start)),
                 "end must not be before start for item " + this.toString());
     }
 
@@ -31,7 +33,7 @@ public TimeTrackingItem(String activity, LocalDateTime start, LocalDateTime end)
      */
     public TimeTrackingItem(String activity, LocalDateTime start) {
         this.activity = requireNonNull(activity);
-        this.start = requireNonNull(start).withNano(0);
+        this.start = DateTimes.preciseToSecond(requireNonNull(start));
         this.end = Optional.empty();
     }
 

src/main/java/org/stt/query/WorkTimeQueries.java

@@ -2,6 +2,7 @@
 
 import org.stt.reporting.WorkingtimeItemProvider;
 import org.stt.text.ItemCategorizer;
+import org.stt.time.DateTimes;
 import org.stt.time.Interval;
 
 import javax.inject.Inject;
@@ -27,14 +28,14 @@ public WorkTimeQueries(WorkingtimeItemProvider workingtimeItemProvider, ItemCate
     }
 
     public Duration queryRemainingWorktimeToday() {
-        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime now = DateTimes.preciseToSecond(LocalDateTime.now());
         LocalDate today = now.toLocalDate();
         Duration workedTime = queryWorktime(Interval.ofDay(today).withEnd(now));
         return workingtimeItemProvider.getWorkingTimeFor(today).getMin().minus(workedTime);
     }
 
     public Duration queryWeekWorktime() {
-        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime now = DateTimes.preciseToSecond(LocalDateTime.now());
         LocalDate monday = now.toLocalDate().with(DayOfWeek.MONDAY);
         Interval currentWeek = Interval.between(monday.atStartOfDay(), now);
         return queryWorktime(currentWeek);

src/main/java/org/stt/time/DateTimes.java

@@ -86,4 +86,8 @@ public static String prettyPrintDuration(Duration duration) {
             return " " + FORMATTER_PERIOD_HHh_MMm_SSs.print(duration);
         }
     }
+
+    public static LocalDateTime preciseToSecond(LocalDateTime localDateTime) {
+        return localDateTime.withNano(0);
+    }
 }

src/test/java/org/stt/fun/HoursTrackedAchievementTest.java

@@ -9,9 +9,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.stt.model.TimeTrackingItem;
+import org.stt.time.DateTimes;
 
 import java.time.LocalDateTime;
 
+import static java.time.LocalDateTime.now;
 import static org.hamcrest.CoreMatchers.is;
 
 /**
@@ -21,7 +23,7 @@
 public class HoursTrackedAchievementTest extends AchievementTestBase {
 
 	private HoursTrackedAchievement sut;
-	private LocalDateTime base = LocalDateTime.now().withNano(0);
+	private LocalDateTime base = DateTimes.preciseToSecond(now());
 
 	@Before
 	public void setup() {

src/test/java/org/stt/model/TimeTrackingItemTest.java

@@ -1,10 +1,12 @@
 package org.stt.model;
 
 import org.junit.Test;
+import org.stt.time.DateTimes;
 
 import java.time.LocalDateTime;
 import java.util.Optional;
 
+import static java.time.LocalDateTime.now;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
@@ -50,7 +52,7 @@ public void withEndShouldCreateNewItem() {
         TimeTrackingItem sut = new TimeTrackingItem("", LocalDateTime.now());
 
 		// WHEN
-        LocalDateTime newEndTime = LocalDateTime.now().plusMinutes(2).withNano(0);
+        LocalDateTime newEndTime = DateTimes.preciseToSecond(now().plusMinutes(2));
         TimeTrackingItem newItem = sut.withEnd(newEndTime);
 
 		// THEN
@@ -65,7 +67,7 @@ public void withStartShouldCreateNewItem() {
         TimeTrackingItem sut = new TimeTrackingItem("", LocalDateTime.now());
 
         // WHEN
-        LocalDateTime newStartTime = LocalDateTime.now().plusMinutes(2).withNano(0);
+        LocalDateTime newStartTime = DateTimes.preciseToSecond(now().plusMinutes(2));
         TimeTrackingItem newItem = sut.withStart(newStartTime);
 
         // THEN