nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1902: fix wrong time conversion

This commit is contained in:
ryzheboka 2022-06-14 11:50:19 +02:00 committed by Elena Mokeeva
parent 27ad739667
commit a9936f243d
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/taskana-common/src/main/java/pro/taskana/common/api/WorkingDaysToDaysConverter.java
View File

@ -7,7 +7,7 @@ import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneOffset;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -85,8 +85,7 @@ public class WorkingDaysToDaysConverter {
} }
public boolean isWorkingDay(Instant referenceDate) { public boolean isWorkingDay(Instant referenceDate) {
LocalDate dateToCheck = LocalDate dateToCheck = LocalDateTime.ofInstant(referenceDate, ZoneOffset.UTC).toLocalDate();
LocalDateTime.ofInstant(referenceDate, ZoneId.systemDefault()).toLocalDate();
return !isWeekend(dateToCheck) && !isHoliday(dateToCheck); return !isWeekend(dateToCheck) && !isHoliday(dateToCheck);
} }

12
lib/taskana-core/src/test/java/acceptance/task/update/UpdateTaskAccTest.java
View File

@ -258,6 +258,18 @@ class UpdateTaskAccTest extends AbstractAccTest {
assertThat(updatedTask).isNotNull(); assertThat(updatedTask).isNotNull();
} }
@WithAccessId(user = "user-1-1")
@Test
void should_SetPlannedCorrectly_When_PlannedSetToALateTime() throws Exception {
Task task = taskService.getTask("TKI:000000000000000000000000000000000000");
Instant planned = Instant.parse("2022-06-17T23:14:31.0Z");
task.setPlanned(planned);
Task updatedTask = taskService.updateTask(task);
updatedTask = taskService.getTask(updatedTask.getId());
assertThat(updatedTask.getPlanned()).isEqualTo(planned);
}
@WithAccessId(user = "user-1-1") @WithAccessId(user = "user-1-1")
@Test @Test
void should_ThrowException_When_ModificationOfWorkbasketKeyIsAttempted() throws Exception { void should_ThrowException_When_ModificationOfWorkbasketKeyIsAttempted() throws Exception {