Skip to content

Commit 849fbbf

Browse files
committed
#178: check for time diff >= 15minutes instead of > to also sync when diff is exactly 15min
1 parent 04b6fed commit 849fbbf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/main/java/de/doubleslash/keeptime/controller/HeimatController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,14 @@ public List<Mapping> getTableRows(final LocalDate currentReportDate, final List<
163163
projects.add(project);
164164
final long keepTimeSeconds = existingMapping.keeptimeSeconds() + projectWorkSeconds;
165165
final long heimatSeconds = existingMapping.heimatSeconds();
166-
final boolean shouldBeSynced = isMappedInHeimat && differenceGreater15Minutes(heimatSeconds, keepTimeSeconds);
166+
final boolean shouldBeSynced = isMappedInHeimat && differenceGreaterOrEqual15Minutes(heimatSeconds, keepTimeSeconds);
167167
final Mapping mapping = new Mapping(isMappedInHeimat ? optHeimatMapping.get().getExternalTaskId() : -1,
168168
isMappedInHeimat, shouldBeSynced, canBeSyncedMessage, existingMapping.existingTimes(), projects,
169169
existingMapping.heimatNotes(), existingMapping.keeptimeNotes() + ". " + keeptimeNotes, heimatSeconds, keepTimeSeconds);
170170
list.remove(existingMapping);
171171
list.add(mapping);
172172
} else {
173-
final boolean shouldBeSynced = isMappedInHeimat && differenceGreater15Minutes(heimatTimeSeconds, projectWorkSeconds);
173+
final boolean shouldBeSynced = isMappedInHeimat && differenceGreaterOrEqual15Minutes(heimatTimeSeconds, projectWorkSeconds);
174174
final List<Project> projects = Collections.singletonList(project);
175175
final Mapping mapping = new Mapping(isMappedInHeimat ? optHeimatMapping.get().getExternalTaskId() : -1,
176176
isMappedInHeimat, shouldBeSynced, canBeSyncedMessage, optionalAlreadyBookedTimes, projects,
@@ -233,8 +233,8 @@ public List<Mapping> getTableRows(final LocalDate currentReportDate, final List<
233233
return list;
234234
}
235235

236-
private static boolean differenceGreater15Minutes(final long heimatTimeSeconds, final long projectWorkSeconds) {
237-
return heimatTimeSeconds == 0L || Math.abs(heimatTimeSeconds - projectWorkSeconds) > 15 * 60L;
236+
private static boolean differenceGreaterOrEqual15Minutes(final long heimatTimeSeconds, final long projectWorkSeconds) {
237+
return heimatTimeSeconds == 0L || Math.abs(heimatTimeSeconds - projectWorkSeconds) >= 15 * 60L;
238238
}
239239

240240
private static long addHeimatTimes(final List<HeimatTime> optionalAlreadyBookedTimes) {

0 commit comments

Comments
 (0)