1680 - updated ape/terms api. Added updated_at field and start/end da…

…te query params
opendatadiscovery · Jun 5, 2024 · 7d5cc1b · 7d5cc1b
1 parent 78905ff
commit 7d5cc1b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 20 deletions.
diff --git a/...atform-api/src/main/java/org/opendatadiscovery/oddplatform/controller/TermController.java b/...atform-api/src/main/java/org/opendatadiscovery/oddplatform/controller/TermController.java
@@ -1,6 +1,6 @@
 package org.opendatadiscovery.oddplatform.controller;
 
-import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.opendatadiscovery.oddplatform.api.contract.api.TermApi;
@@ -51,8 +51,8 @@ public class TermController implements TermApi {
     @Override
     public Mono<ResponseEntity<TermRefList>> getTermsList(final Integer page, final Integer size,
                                                           final String query,
-                                                          final LocalDate updatedAtRangeStartDateTime,
-                                                          final LocalDate updatedAtRangeEndDateTime,
+                                                          final OffsetDateTime updatedAtRangeStartDateTime,
+                                                          final OffsetDateTime updatedAtRangeEndDateTime,
                                                           final ServerWebExchange exchange) {
         return termService.getTerms(page, size, query, updatedAtRangeStartDateTime, updatedAtRangeEndDateTime)
             .map(ResponseEntity::ok);

diff --git a/...in/java/org/opendatadiscovery/oddplatform/repository/reactive/ReactiveTermRepository.java b/...in/java/org/opendatadiscovery/oddplatform/repository/reactive/ReactiveTermRepository.java
@@ -1,6 +1,6 @@
 package org.opendatadiscovery.oddplatform.repository.reactive;
 
-import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.List;
 import org.opendatadiscovery.oddplatform.dto.FacetStateDto;
 import org.opendatadiscovery.oddplatform.dto.term.LinkedTermDto;
@@ -16,8 +16,8 @@
 public interface ReactiveTermRepository extends ReactiveCRUDRepository<TermPojo> {
 
     Mono<Page<TermRefDto>> listTermRefDtos(final int page, final int size, final String query,
-                                           final LocalDate updatedAtRangeStartDateTime,
-                                           final LocalDate updatedAtRangeEndDateTime);
+                                           final OffsetDateTime updatedAtRangeStartDateTime,
+                                           final OffsetDateTime updatedAtRangeEndDateTime);
 
     Mono<Boolean> existsByNamespace(final Long namespaceId);
 

diff --git a/...ava/org/opendatadiscovery/oddplatform/repository/reactive/ReactiveTermRepositoryImpl.java b/...ava/org/opendatadiscovery/oddplatform/repository/reactive/ReactiveTermRepositoryImpl.java
@@ -1,6 +1,6 @@
 package org.opendatadiscovery.oddplatform.repository.reactive;
 
-import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -45,6 +45,7 @@
 import org.opendatadiscovery.oddplatform.repository.util.JooqReactiveOperations;
 import org.opendatadiscovery.oddplatform.repository.util.JooqRecordHelper;
 import org.opendatadiscovery.oddplatform.repository.util.OrderByField;
+import org.opendatadiscovery.oddplatform.service.ingestion.util.DateTimeUtil;
 import org.opendatadiscovery.oddplatform.utils.Page;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
@@ -106,8 +107,8 @@ public ReactiveTermRepositoryImpl(final JooqReactiveOperations jooqReactiveOpera
 
     @Override
     public Mono<Page<TermRefDto>> listTermRefDtos(final int page, final int size, final String nameQuery,
-                                                  final LocalDate updatedAtRangeStartDateTime,
-                                                  final LocalDate updatedAtRangeEndDateTime) {
+                                                  final OffsetDateTime updatedAtRangeStartDateTime,
+                                                  final OffsetDateTime updatedAtRangeEndDateTime) {
         final Select<TermRecord> homogeneousQuery = DSL.selectFrom(TERM)
             .where(ListUtils.union(listCondition(nameQuery),
                 dateConditions(updatedAtRangeStartDateTime, updatedAtRangeEndDateTime)));
@@ -634,20 +635,20 @@ private List<LinkedTermDto> extractTerms(final Record record) {
             .toList();
     }
 
-    private List<Condition> dateConditions(final LocalDate updatedAtRangeStartDateTime,
-                                           final LocalDate updatedAtRangeEndDateTime) {
+    private List<Condition> dateConditions(final OffsetDateTime updatedAtRangeStartDateTime,
+                                           final OffsetDateTime updatedAtRangeEndDateTime) {
         if (updatedAtRangeStartDateTime == null && updatedAtRangeEndDateTime == null) {
             return Collections.emptyList();
         }
 
         final List<Condition> conditions = new ArrayList<>();
 
         if (updatedAtRangeStartDateTime != null) {
-            conditions.add(TERM.UPDATED_AT.greaterOrEqual(updatedAtRangeStartDateTime.atStartOfDay()));
+            conditions.add(TERM.UPDATED_AT.greaterOrEqual(DateTimeUtil.mapUTCDateTime(updatedAtRangeStartDateTime)));
         }
 
         if (updatedAtRangeEndDateTime != null) {
-            conditions.add(TERM.UPDATED_AT.lessThan(updatedAtRangeEndDateTime.atStartOfDay()));
+            conditions.add(TERM.UPDATED_AT.lessThan(DateTimeUtil.mapUTCDateTime(updatedAtRangeEndDateTime)));
         }
 
         return conditions;

diff --git a/...latform-api/src/main/java/org/opendatadiscovery/oddplatform/service/term/TermService.java b/...latform-api/src/main/java/org/opendatadiscovery/oddplatform/service/term/TermService.java
@@ -1,6 +1,6 @@
 package org.opendatadiscovery.oddplatform.service.term;
 
-import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.List;
 import org.opendatadiscovery.oddplatform.api.contract.model.LinkedTerm;
 import org.opendatadiscovery.oddplatform.api.contract.model.LinkedTermList;
@@ -16,7 +16,8 @@
 
 public interface TermService {
     Mono<TermRefList> getTerms(final Integer page, final Integer size, final String query,
-                               final LocalDate updatedAtRangeStartDateTime, final LocalDate updatedAtRangeEndDateTime);
+                               final OffsetDateTime updatedAtRangeStartDateTime,
+                               final OffsetDateTime updatedAtRangeEndDateTime);
 
     Mono<TermRef> getTermByNamespaceAndName(final String namespaceName, final String name);
 

diff --git a/...orm-api/src/main/java/org/opendatadiscovery/oddplatform/service/term/TermServiceImpl.java b/...orm-api/src/main/java/org/opendatadiscovery/oddplatform/service/term/TermServiceImpl.java
@@ -1,6 +1,6 @@
 package org.opendatadiscovery.oddplatform.service.term;
 
-import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -82,8 +82,8 @@ public class TermServiceImpl implements TermService {
 
     @Override
     public Mono<TermRefList> getTerms(final Integer page, final Integer size, final String query,
-                                      final LocalDate updatedAtRangeStartDateTime,
-                                      final LocalDate updatedAtRangeEndDateTime) {
+                                      final OffsetDateTime updatedAtRangeStartDateTime,
+                                      final OffsetDateTime updatedAtRangeEndDateTime) {
         return termRepository.listTermRefDtos(page, size, query, updatedAtRangeStartDateTime, updatedAtRangeEndDateTime)
             .map(termMapper::mapToRefPage);
     }

diff --git a/odd-platform-specification/openapi.yaml b/odd-platform-specification/openapi.yaml
@@ -2730,13 +2730,13 @@ paths:
           required: false
           schema:
             type: string
-            format: date
+            format: date-time
         - name: updated_at_range_end_date_time
           in: query
           required: false
           schema:
             type: string
-            format: date
+            format: date-time
       responses:
         '200':
           description: OK