demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[hue] Recognise grouped_motion and smart_scene resources (#17905)

Browse Source 
Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
This commit is contained in:
Andrew Fiddian-Green 2024-12-16 19:19:47 +00:00 committed by GitHub
parent 9544767641
commit 856fa74459
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/api/dto/clip2/enums/ResourceType.java
View File

@ -41,6 +41,7 @@ public enum ResourceType {
GEOFENCE_CLIENT, GEOFENCE_CLIENT,
GEOLOCATION, GEOLOCATION,
GROUPED_LIGHT, GROUPED_LIGHT,
GROUPED_MOTION,
HOMEKIT, HOMEKIT,
LIGHT, LIGHT,
LIGHT_LEVEL, LIGHT_LEVEL,

2
bundles/org.openhab.binding.hue/src/main/java/org/openhab/binding/hue/internal/handler/Clip2ThingHandler.java
View File

@ -765,7 +765,7 @@ public class Clip2ThingHandler extends BaseThingHandler {
* @param fullResources the full list of resources of the given type. * @param fullResources the full list of resources of the given type.
*/ */
public void onResourcesList(ResourceType resourceType, List<Resource> fullResources) { public void onResourcesList(ResourceType resourceType, List<Resource> fullResources) {
if (resourceType == ResourceType.SCENE) { if (SUPPORTED_SCENE_TYPES.contains(resourceType)) {
updateSceneContributors(fullResources); updateSceneContributors(fullResources);
} else { } else {
fullResources.stream().filter(r -> resourceId.equals(r.getId())).findAny() fullResources.stream().filter(r -> resourceId.equals(r.getId())).findAny()

17
bundles/org.openhab.binding.hue/src/test/java/org/openhab/binding/hue/internal/clip2/Clip2DtoTest.java
View File

@ -914,4 +914,21 @@ class Clip2DtoTest {
assertNotNull(list); assertNotNull(list);
assertEquals(2, list.size()); assertEquals(2, list.size());
} }
@Test
void testGroupedMotion() {
String json = load(ResourceType.GROUPED_MOTION.name().toLowerCase());
Resources resources = GSON.fromJson(json, Resources.class);
assertNotNull(resources);
List<Resource> list = resources.getResources();
assertNotNull(list);
assertEquals(1, list.size());
Resource item = list.get(0);
assertEquals(ResourceType.GROUPED_MOTION, item.getType());
Boolean enabled = item.getEnabled();
assertNotNull(enabled);
assertTrue(enabled);
assertEquals(OnOffType.ON, item.getMotionState());
assertEquals(new DateTimeType("2024-12-13T11:01:25.156Z"), item.getMotionLastUpdatedState(ZoneId.of("UTC")));
}
} }

21
bundles/org.openhab.binding.hue/src/test/resources/grouped_motion.json Normal file
View File

@ -0,0 +1,21 @@
{
"errors": [],
"data": [
{
"id": "aab07fb5-b0c1-400b-828f-a9e0a05394f9",
"id_v1": "/sensors/5",
"enabled": true,
"motion": {
"motion_report": {
"changed": "2024-12-13T11:01:25.156Z",
"motion": true
}
},
"owner": {
"rid": "bb9b4bb4-b0c8-4b6a-8dc0-85add8f77964",
"rtype": "bridge_home"
},
"type": "grouped_motion"
}
]
}