Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/com/deloitte/elrr/services/dto/GoalDto.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.deloitte.elrr.services.dto;

import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.Set;
import java.util.UUID;

Expand Down Expand Up @@ -36,11 +36,11 @@ public class GoalDto extends ExtensibleDto {
@Size(max = 65535)
private String description;

private LocalDateTime startDate;
private ZonedDateTime startDate;

private LocalDateTime achievedByDate;
private ZonedDateTime achievedByDate;

private LocalDateTime expirationDate;
private ZonedDateTime expirationDate;

private Set<UUID> competencyIds;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;

import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.HashSet;
Expand Down Expand Up @@ -373,8 +372,8 @@ private GoalDto getGoalDto() {
goalDto.setName("Test Goal");
goalDto.setDescription("Test Description");
goalDto.setType(GoalType.SELF);
goalDto.setStartDate(LocalDateTime.now());
goalDto.setAchievedByDate(LocalDateTime.now().plusMonths(6));
goalDto.setStartDate(ZonedDateTime.now());
goalDto.setAchievedByDate(ZonedDateTime.now().plusMonths(6));
goalDto.setCompetencyIds(new HashSet<>(List.of(UUID.randomUUID())));
goalDto.setCredentialIds(new HashSet<>(List.of(UUID.randomUUID())));
goalDto.setLearningResourceIds(
Expand Down
Loading