diff --git a/backend/pom.xml b/backend/pom.xml index fbb8cf18..33a5632d 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -137,11 +137,6 @@ 1.18.36 true - - org.ocpsoft.prettytime - prettytime - 5.0.9.Final - org.apache.commons commons-lang3 diff --git a/backend/src/main/java/ca/bc/gov/restapi/results/oracle/service/UserActionsService.java b/backend/src/main/java/ca/bc/gov/restapi/results/oracle/service/UserActionsService.java index 6f72d32c..04d5fdfd 100644 --- a/backend/src/main/java/ca/bc/gov/restapi/results/oracle/service/UserActionsService.java +++ b/backend/src/main/java/ca/bc/gov/restapi/results/oracle/service/UserActionsService.java @@ -7,7 +7,6 @@ import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.ocpsoft.prettytime.PrettyTime; import org.springframework.stereotype.Service; @Slf4j @@ -18,7 +17,6 @@ public class UserActionsService { private final ResultsAuditActivityRepository auditActivityRepository; private final LoggedUserService loggedUserService; private final SilvaConfiguration silvaConfiguration; - private final PrettyTime prettyTime = new PrettyTime(); public List getResultsAuditActivity() { String userId = loggedUserService.getLoggedUserId(); @@ -35,7 +33,6 @@ public List getResultsAuditActivity() { entity.getOpeningId(), entity.getCategoryCode(), entity.getCategoryCodeDescription(), - prettyTime.format(entity.getEntryTimestamp()), entity.getEntryTimestamp() ) ) diff --git a/backend/src/main/java/ca/bc/gov/restapi/results/postgres/dto/MyRecentActionsRequestsDto.java b/backend/src/main/java/ca/bc/gov/restapi/results/postgres/dto/MyRecentActionsRequestsDto.java index ffe64fea..4d835b41 100644 --- a/backend/src/main/java/ca/bc/gov/restapi/results/postgres/dto/MyRecentActionsRequestsDto.java +++ b/backend/src/main/java/ca/bc/gov/restapi/results/postgres/dto/MyRecentActionsRequestsDto.java @@ -14,7 +14,6 @@ public record MyRecentActionsRequestsDto( Long openingId, String statusCode, String statusDescription, - String lastUpdatedLabel, LocalDateTime lastUpdated ) { diff --git a/backend/src/main/java/ca/bc/gov/restapi/results/postgres/service/DashboardMetricsService.java b/backend/src/main/java/ca/bc/gov/restapi/results/postgres/service/DashboardMetricsService.java index 3b9ffa74..e0e26d5a 100644 --- a/backend/src/main/java/ca/bc/gov/restapi/results/postgres/service/DashboardMetricsService.java +++ b/backend/src/main/java/ca/bc/gov/restapi/results/postgres/service/DashboardMetricsService.java @@ -19,7 +19,6 @@ import java.util.Objects; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.ocpsoft.prettytime.PrettyTime; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; @@ -38,7 +37,6 @@ public class DashboardMetricsService { private final LoggedUserService loggedUserService; - private final PrettyTime prettyTime = new PrettyTime(); /** @@ -166,7 +164,6 @@ public List getUserRecentOpeningsActions() { entity.getOpeningId(), entity.getStatusCode(), entity.getStatusDesc(), - prettyTime.format(entity.getLastUpdated()), entity.getLastUpdated() ) ) diff --git a/backend/src/test/java/ca/bc/gov/restapi/results/postgres/service/DashboardMetricsServiceTest.java b/backend/src/test/java/ca/bc/gov/restapi/results/postgres/service/DashboardMetricsServiceTest.java index 31908848..abe8e987 100644 --- a/backend/src/test/java/ca/bc/gov/restapi/results/postgres/service/DashboardMetricsServiceTest.java +++ b/backend/src/test/java/ca/bc/gov/restapi/results/postgres/service/DashboardMetricsServiceTest.java @@ -263,7 +263,6 @@ void getUserRecentOpeningsActions_happyPath_shouldSucceed() { Assertions.assertEquals(112233L, dtoList.get(0).openingId()); Assertions.assertEquals("APP", dtoList.get(0).statusCode()); Assertions.assertEquals("Approved", dtoList.get(0).statusDescription()); - Assertions.assertEquals("2 hours ago", dtoList.get(0).lastUpdatedLabel()); } @Test