test restore item state on timeseries update

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>

Author: mherwege

bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistenceManagerImpl.java

@@ -397,9 +397,9 @@ public void timeSeriesUpdated(Item item, TimeSeries timeSeries) {
                                     .sorted((e1, e2) -> e2.timestamp().compareTo(e1.timestamp())).findFirst()
                                     .ifPresent(s -> {
                                         ZonedDateTime lastStateUpdate = item.getLastStateUpdate();
-                                        if (lastStateUpdate == null || s.timestamp().atZone(ZoneId.systemDefault())
-                                                .isAfter(lastStateUpdate)) {
-                                            container.restoreItemState(item, ZonedDateTime.now(), s.state());
+                                        ZonedDateTime timestamp = s.timestamp().atZone(ZoneId.systemDefault());
+                                        if (lastStateUpdate == null || timestamp.isAfter(lastStateUpdate)) {
+                                            container.restoreItemState(item, timestamp, s.state());
                                         }
                                     });
                         }));
@@ -682,7 +682,7 @@ private void restoreItemState(Item item, ZonedDateTime timestamp, State state) {
 
                 @Override
                 public ZonedDateTime getTimestamp() {
-                    return ZonedDateTime.now();
+                    return timestamp;
                 }
 
                 @Override

bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/internal/PersistenceManagerTest.java

@@ -78,6 +78,7 @@
 import org.openhab.core.service.ReadyService;
 import org.openhab.core.types.State;
 import org.openhab.core.types.TimeSeries;
+import org.openhab.core.types.TimeSeries.Entry;
 import org.openhab.core.types.UnDefType;
 
 /**
@@ -414,6 +415,7 @@ public void storeTimeSeriesAndForecastsScheduled() {
         addConfiguration(TestModifiablePersistenceService.ID, List.of(new PersistenceAllConfig()),
                 PersistenceStrategy.Globals.FORECAST, null);
 
+        ZonedDateTime time0 = ZonedDateTime.now().minusSeconds(5000);
         Instant time1 = Instant.now().minusSeconds(1000);
         Instant time2 = Instant.now().plusSeconds(1000);
         Instant time3 = Instant.now().plusSeconds(2000);
@@ -425,6 +427,7 @@ public void storeTimeSeriesAndForecastsScheduled() {
         timeSeries.add(time2, new StringType("two"));
         timeSeries.add(time3, new StringType("three"));
         timeSeries.add(time4, new StringType("four"));
+        TEST_ITEM.setState(new StringType("zero"), null, time0, null, null);
 
         manager.timeSeriesUpdated(TEST_ITEM, timeSeries);
         InOrder inOrder = inOrder(service, schedulerMock);
@@ -437,6 +440,17 @@ public void storeTimeSeriesAndForecastsScheduled() {
         inOrder.verify(schedulerMock).at(any(SchedulerRunnable.class), eq(time2));
         inOrder.verifyNoMoreInteractions();
 
+        // check if timeseries element in the past updated item state
+        Entry firstEntry = timeSeries.getStates().findFirst().get();
+        assertThat(TEST_ITEM.getState(), is(firstEntry.state()));
+        assertThat(TEST_ITEM.getLastState(), is(new StringType("zero")));
+        ZonedDateTime lastStateUpdate = TEST_ITEM.getLastStateUpdate();
+        assertNotNull(lastStateUpdate);
+        assertThat(lastStateUpdate.toInstant(), is(firstEntry.timestamp()));
+        ZonedDateTime lastStateChange = TEST_ITEM.getLastStateChange();
+        assertNotNull(lastStateChange);
+        assertThat(lastStateChange.toInstant(), is(firstEntry.timestamp()));
+
         // replace elements
         TimeSeries timeSeries2 = new TimeSeries(TimeSeries.Policy.REPLACE);
         timeSeries2.add(time3, new StringType("three2"));