[inmemory] Add filterCritera ordering (openhab#16185)

Signed-off-by: Jan N. Klug <github@klug.nrw> Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
austvik · Mar 27, 2024 · 3bbdf2e · 3bbdf2e
1 parent ef5a8ea
commit 3bbdf2e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 6 deletions.
diff --git a/...y/src/main/java/org/openhab/persistence/inmemory/internal/InMemoryPersistenceService.java b/...y/src/main/java/org/openhab/persistence/inmemory/internal/InMemoryPersistenceService.java
@@ -173,9 +173,14 @@ public Iterable<HistoricItem> query(FilterCriteria filter) {
 
         Lock lock = persistItem.lock();
         lock.lock();
+
+        Comparator<PersistEntry> comparator = filter.getOrdering() == FilterCriteria.Ordering.ASCENDING
+                ? Comparator.comparing(PersistEntry::timestamp)
+                : Comparator.comparing(PersistEntry::timestamp).reversed();
+
         try {
-            return persistItem.database().stream().filter(e -> applies(e, filter)).map(e -> toHistoricItem(itemName, e))
-                    .toList();
+            return persistItem.database().stream().filter(e -> applies(e, filter)).sorted(comparator)
+                    .map(e -> toHistoricItem(itemName, e)).toList();
         } finally {
             lock.unlock();
         }

diff --git a/...ory/src/test/java/org/openhab/persistence/inmemory/internal/InMemoryPersistenceTests.java b/...ory/src/test/java/org/openhab/persistence/inmemory/internal/InMemoryPersistenceTests.java
@@ -13,15 +13,14 @@
 package org.openhab.persistence.inmemory.internal;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.closeTo;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
 import static org.mockito.Mockito.when;
 
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.List;
 import java.util.TreeSet;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -144,6 +143,38 @@ public void queryUnknownItemReturnsEmptyList() {
         assertThat(storedStates, is(empty()));
     }
 
+    @Test
+    public void querySupportsAscendingOrdering() {
+        ZonedDateTime start = ZonedDateTime.of(2020, 12, 1, 12, 0, 0, 0, ZoneId.systemDefault());
+        service.store(item, start, new DecimalType(1));
+        service.store(item, start.plusHours(1), new DecimalType(2));
+        service.store(item, start.plusHours(2), new DecimalType(3));
+
+        filterCriteria.setOrdering(FilterCriteria.Ordering.ASCENDING);
+        filterCriteria.setBeginDate(start);
+
+        List<Integer> resultSet = new ArrayList<>();
+        service.query(filterCriteria).forEach(h -> resultSet.add(((DecimalType) h.getState()).intValue()));
+
+        assertThat(resultSet, contains(1, 2, 3));
+    }
+
+    @Test
+    public void querySupportsDescendingOrdering() {
+        ZonedDateTime start = ZonedDateTime.of(2020, 12, 1, 12, 0, 0, 0, ZoneId.systemDefault());
+        service.store(item, start, new DecimalType(1));
+        service.store(item, start.plusHours(1), new DecimalType(2));
+        service.store(item, start.plusHours(2), new DecimalType(3));
+
+        filterCriteria.setOrdering(FilterCriteria.Ordering.DESCENDING);
+        filterCriteria.setBeginDate(start);
+
+        List<Integer> resultSet = new ArrayList<>();
+        service.query(filterCriteria).forEach(h -> resultSet.add(((DecimalType) h.getState()).intValue()));
+
+        assertThat(resultSet, contains(3, 2, 1));
+    }
+
     @Test
     public void removeBetweenTimes() {
         State historicState1 = new StringType("value1");