Skip to content

Bugfix 2227/fixing serialization of local date time #2327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjperry91 merged 4 commits into from
May 6, 2024
Merged

Bugfix 2227/fixing serialization of local date time #2327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f107e1f
2227 Fixing issue where jackson wasn't serializing dates in correct f…
mjperry91 May 3, 2024
b46f6e9
2227 Adding serialization tests
mjperry91 May 3, 2024
250ce38
Merge branch 'develop' of https://github.com/objectcomputing/check-in…
mjperry91 May 3, 2024
24dbe92
Merge branch 'develop' of https://github.com/objectcomputing/check-in…
mjperry91 May 6, 2024
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
9 changes: 9 additions & 0 deletions server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewPeriod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.objectcomputing.checkins.services.reviews;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.micronaut.core.annotation.Introspected;
import io.micronaut.core.annotation.Nullable;
import io.micronaut.data.annotation.AutoPopulated;
Expand Down Expand Up @@ -57,14 +60,20 @@ public class ReviewPeriod {

@Nullable
@Column(name = "launch_date")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime launchDate;

@Nullable
@Column(name = "self_review_close_date")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime selfReviewCloseDate;

@Nullable
@Column(name = "close_date")
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime closeDate;

public ReviewPeriod(String name, ReviewStatus reviewStatus, @Nullable UUID reviewTemplateId,
Expand Down
9 changes: 9 additions & 0 deletions ...er/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodCreateDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.objectcomputing.checkins.services.reviews;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.micronaut.core.annotation.Introspected;
import io.micronaut.core.annotation.Nullable;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down Expand Up @@ -32,12 +35,18 @@ public class ReviewPeriodCreateDTO {
private UUID selfReviewTemplateId;

@Nullable
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime launchDate;

@Nullable
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime selfReviewCloseDate;

@Nullable
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
private LocalDateTime closeDate;

public ReviewPeriod convertToEntity(){
Expand Down
76 changes: 73 additions & 3 deletions ...c/test/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.objectcomputing.checkins.services.reviews;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.objectcomputing.checkins.services.TestContainersSuite;
import com.objectcomputing.checkins.services.fixture.MemberProfileFixture;
import com.objectcomputing.checkins.services.fixture.ReviewPeriodFixture;
Expand All @@ -18,6 +21,7 @@
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
Expand Down Expand Up @@ -127,11 +131,45 @@ public void testPOSTCreateAReviewPeriod() {
assertEquals(String.format("%s/%s", request.getPath(), body.getId()), response.getHeaders().get("location"));
}

@Test
public void testReviewPeriodCreateDTOSerialization() throws JsonProcessingException {
ReviewPeriodCreateDTO reviewPeriodCreateDTO = new ReviewPeriodCreateDTO();
reviewPeriodCreateDTO.setName("reincarnation");
reviewPeriodCreateDTO.setReviewStatus(ReviewStatus.OPEN);
reviewPeriodCreateDTO.setLaunchDate(LocalDateTime.now());
reviewPeriodCreateDTO.setSelfReviewCloseDate(LocalDateTime.now());
reviewPeriodCreateDTO.setCloseDate(LocalDateTime.now());

final HttpRequest<ReviewPeriodCreateDTO> request = HttpRequest.
POST("/", reviewPeriodCreateDTO).basicAuth(MEMBER_ROLE, MEMBER_ROLE);
final HttpResponse<String> response = client.toBlocking().exchange(request, String.class);

assertNotNull(response);
var actualJson = response.body();
assertNotNull(actualJson);
assertEquals(HttpStatus.CREATED, response.getStatus());

ObjectMapper objectMapper = new ObjectMapper();
String expectedJson = objectMapper.writeValueAsString(reviewPeriodCreateDTO);

String expectedLaunchDateFormat = objectMapper.readTree(expectedJson).get("launchDate").asText();
String actualLaunchDateFormat = objectMapper.readTree(actualJson).get("launchDate").asText();
assertEquals(expectedLaunchDateFormat, actualLaunchDateFormat);

String expectedSelfReviewCloseDateFormat = objectMapper.readTree(expectedJson).get("selfReviewCloseDate").asText();
String actualSelfReviewCloseDateFormat = objectMapper.readTree(actualJson).get("selfReviewCloseDate").asText();
assertEquals(expectedSelfReviewCloseDateFormat, actualSelfReviewCloseDateFormat);

String expectedCloseDateFormat = objectMapper.readTree(expectedJson).get("closeDate").asText();
String actualCloseDateFormat = objectMapper.readTree(actualJson).get("closeDate").asText();
assertEquals(expectedCloseDateFormat, actualCloseDateFormat);
}

@Test
public void testPOSTCreateAReviewPeriodWithTimelines() {
LocalDateTime launchDate = LocalDateTime.now();
LocalDateTime selfReviewCloseDate = LocalDateTime.now().plusDays(1);
LocalDateTime closeDate = LocalDateTime.now().plusDays(2);
LocalDateTime launchDate = LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
LocalDateTime selfReviewCloseDate = LocalDateTime.now().plusDays(1).truncatedTo(ChronoUnit.MILLIS);
LocalDateTime closeDate = LocalDateTime.now().plusDays(2).truncatedTo(ChronoUnit.MILLIS);

ReviewPeriodCreateDTO reviewPeriodCreateDTO = new ReviewPeriodCreateDTO();
reviewPeriodCreateDTO.setName("reincarnation");
Expand Down Expand Up @@ -218,6 +256,38 @@ void testUpdateReviewPeriodAsAdmin() {
assertEquals(HttpStatus.OK, response.getStatus());
}

@Test
void testReviewPeriodSerialization() throws JsonProcessingException {
MemberProfile memberProfileOfAdmin = createAnUnrelatedUser();
createAndAssignAdminRole(memberProfileOfAdmin);

ReviewPeriod reviewPeriod = createADefaultReviewPeriod();
reviewPeriod.setReviewStatus(ReviewStatus.OPEN);

final HttpRequest<ReviewPeriod> request = HttpRequest.
PUT("/", reviewPeriod).basicAuth(memberProfileOfAdmin.getWorkEmail(), ADMIN_ROLE);

final HttpResponse<String> response = client.toBlocking().exchange(request, String.class);

String actualJson = response.body();
assertEquals(HttpStatus.OK, response.getStatus());

ObjectMapper objectMapper = new ObjectMapper();
String expectedJson = objectMapper.writeValueAsString(reviewPeriod);

String expectedLaunchDateFormat = objectMapper.readTree(expectedJson).get("launchDate").asText();
String actualLaunchDateFormat = objectMapper.readTree(actualJson).get("launchDate").asText();
assertEquals(expectedLaunchDateFormat, actualLaunchDateFormat);

String expectedSelfReviewCloseDateFormat = objectMapper.readTree(expectedJson).get("selfReviewCloseDate").asText();
String actualSelfReviewCloseDateFormat = objectMapper.readTree(actualJson).get("selfReviewCloseDate").asText();
assertEquals(expectedSelfReviewCloseDateFormat, actualSelfReviewCloseDateFormat);

String expectedCloseDateFormat = objectMapper.readTree(expectedJson).get("closeDate").asText();
String actualCloseDateFormat = objectMapper.readTree(actualJson).get("closeDate").asText();
assertEquals(expectedCloseDateFormat, actualCloseDateFormat);
}

@Test
public void testPUTUpdateReviewPeriodNonAdmin() {
ReviewPeriod reviewPeriod = createADefaultReviewPeriod();
Expand Down