demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 21:31:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Add countStateChangesSince/countStateChangesBetween to persistence extensions (#3211)

Browse Source 
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng 2022-12-11 21:55:42 +10:00 committed by GitHub
parent 08d7d13c9b
commit 979e2c2d3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 107 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/extensions/PersistenceExtensions.java
View File

@ -1150,6 +1150,76 @@ public class PersistenceExtensions {
}
}
/**
* Gets the number of changes in historic data points of a given {@link Item} from a point in time until now.
* The default {@link PersistenceService} is used.
*
* @param item the {@link Item} to query
* @param begin the beginning point in time
* @return the number of state changes for this item
*/
public static long countStateChangesSince(Item item, ZonedDateTime begin) {
return countStateChangesSince(item, begin, getDefaultServiceId());
}
/**
* Gets the number of changes in historic data points of a given {@link Item} from a point in time until now.
* The {@link PersistenceService} identified by the <code>serviceId</code> is used.
*
* @param item the {@link Item} to query
* @param begin the beginning point in time
* @param serviceId the name of the {@link PersistenceService} to use
* @return the number of state changes for this item
*/
public static long countStateChangesSince(Item item, ZonedDateTime begin, String serviceId) {
return countStateChangesBetween(item, begin, null, serviceId);
}
/**
* Gets the number of changes in historic data points of a given {@link Item} between two points in time.
* The default {@link PersistenceService} is used.
*
* @param item the {@link Item} to query
* @param begin the beginning point in time
* @param end the end point in time
* @return the number of state changes for this item
*/
public static long countStateChangesBetween(Item item, ZonedDateTime begin, @Nullable ZonedDateTime end) {
return countStateChangesBetween(item, begin, end, getDefaultServiceId());
}
/**
* Gets the number of changes in historic data points of a given {@link Item} between two points in time.
* The {@link PersistenceService} identified by the <code>serviceId</code> is used.
*
* @param item the {@link Item} to query
* @param begin the beginning point in time
* @param end the end point in time
* @param serviceId the name of the {@link PersistenceService} to use
* @return the number of state changes for this item
*/
public static long countStateChangesBetween(Item item, ZonedDateTime begin, @Nullable ZonedDateTime end,
String serviceId) {
Iterable<HistoricItem> result = getAllStatesBetween(item, begin, end, serviceId);
Iterator<HistoricItem> it = result.iterator();
if (!it.hasNext()) {
return 0;
}
long count = 0;
State previousState = it.next().getState();
while (it.hasNext()) {
HistoricItem historicItem = it.next();
State state = historicItem.getState();
if (!state.equals(previousState)) {
previousState = state;
count++;
}
}
return count;
}
private static @Nullable PersistenceService getService(String serviceId) {
PersistenceService service = null;
if (registry != null) {

37
bundles/org.openhab.core.persistence/src/test/java/org/openhab/core/persistence/extensions/PersistenceExtensionsTest.java
View File

@ -951,4 +951,41 @@ public class PersistenceExtensionsTest {
ZonedDateTime.of(2000, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()));
assertEquals(0, counts);
}
@Test
public void testCountStateChangesSince() {
long counts = PersistenceExtensions.countStateChangesSince(numberItem,
ZonedDateTime.of(1980, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()), TestPersistenceService.ID);
assertEquals(32, counts);
counts = PersistenceExtensions.countStateChangesSince(numberItem,
ZonedDateTime.of(2007, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()), TestPersistenceService.ID);
assertEquals(5, counts);
counts = PersistenceExtensions.countStateChangesSince(numberItem,
ZonedDateTime.of(2020, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()), TestPersistenceService.ID);
assertEquals(0, counts);
counts = PersistenceExtensions.countStateChangesSince(numberItem,
ZonedDateTime.of(2000, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()));
assertEquals(0, counts);
}
@Test
public void testCountStateChangesBetween() {
long counts = PersistenceExtensions.countStateChangesBetween(numberItem,
ZonedDateTime.of(1940, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()),
ZonedDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()), TestPersistenceService.ID);
assertEquals(0, counts);
counts = PersistenceExtensions.countStateChangesBetween(numberItem,
ZonedDateTime.of(2005, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()),
ZonedDateTime.of(2011, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()), TestPersistenceService.ID);
assertEquals(6, counts);
counts = PersistenceExtensions.countStateChangesBetween(numberItem,
ZonedDateTime.of(2005, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()),
ZonedDateTime.of(2011, 1, 1, 0, 0, 0, 0, ZoneId.systemDefault()));
assertEquals(0, counts);
}
}