diff --git a/src/HomeAssistant/Controller/Bedroom.hs b/src/HomeAssistant/Controller/Bedroom.hs index aa1574a..7886390 100644 --- a/src/HomeAssistant/Controller/Bedroom.hs +++ b/src/HomeAssistant/Controller/Bedroom.hs @@ -28,6 +28,7 @@ createBedroomScene = Service , "snapshot_entities" .= [l | EntityId l <- bedroomLightTargets] ] , serviceTarget= [] + , serviceExclusions= [] } -- Bedroom presence @@ -89,14 +90,14 @@ bedroomPresenceController = lightsOff = arr (\(o, _, _, _) -> not o) >>> waitFor 300 - >>|| callService "Turn off lights" (light bedroomLightTargets Off) + >>|| callService "Turn off lights" (light bedroomLightTargets [] Off) anyLightsAreOn :: Foldable f => f LightObservation -> Bool anyLightsAreOn = any observedOn toLight :: Bool -> T.Text -> LightObservation -> [Service] - toLight _ entityId LightObservation{observedOn=False} = [light [EntityId entityId] Off] + toLight _ entityId LightObservation{observedOn=False} = [light [EntityId entityId] [] Off] toLight capped entityId LightObservation{observedOn=True, observedTemperature=t, observedBrightness=b} = - [ light [EntityId entityId] (On def + [ light [EntityId entityId] [] (On def {lightBrightness = fmap (\b' -> BrightnessAbsolute $ if capped then 140 `min` b' else b') b , lightColorTemperature = t }) @@ -130,10 +131,10 @@ bedroomButtonController = proc x -> do Event (Masse (OnButton LongClick)) -> do callService "scene.makuuhuone_kirkas" (activateScene "scene.makuuhuone_kirkas") -< () Event (Masse (OffButton LongClick)) -> do - callService "Lights off" (light [AreaId "makuuhuone"] Off) -< () - callService "Hallway lights off" (light [EntityId "light.hallway_lights"] Off) -< () + callService "Lights off" (light [AreaId "makuuhuone"] [] Off) -< () + callService "Hallway lights off" (light [EntityId "light.hallway_lights"] [] Off) -< () Event (Masse (OffButton _)) -> do - callService "Lights off" (light [AreaId "makuuhuone"] Off) -< () + callService "Lights off" (light [AreaId "makuuhuone"] [] Off) -< () Event (Enishen (OnButton ShortRelease)) -> do callService "scene.makuuhuone_jemina" (activateScene "scene.makuuhuone_jemina") -< () Event (Enishen (OnButton DoubleClick)) -> do @@ -141,10 +142,10 @@ bedroomButtonController = proc x -> do Event (Enishen (OnButton LongClick)) -> do callService "scene.makuuhuone_kirkas" (activateScene "scene.makuuhuone_kirkas") -< () Event (Enishen (OffButton LongClick)) -> do - callService "Lights off" (light [AreaId "makuuhuone"] Off) -< () - callService "Hallway lights off" (light [EntityId "light.hallway_lights"] Off) -< () + callService "Lights off" (light [AreaId "makuuhuone"] [] Off) -< () + callService "Hallway lights off" (light [EntityId "light.hallway_lights"] [] Off) -< () Event (Enishen (OffButton _)) -> do - callService "Lights off" (light [AreaId "makuuhuone"] Off) -< () + callService "Lights off" (light [AreaId "makuuhuone"] [] Off) -< () _ -> returnA -< () @@ -161,9 +162,9 @@ bedroomDrawerController = where entity = EntityId "switch.bedroom_drawer_light_masse" lightOff = filterEvent (== Closed) - >>|| callService "drawer light off" (switchService [entity] False) + >>|| callService "drawer light off" (switchService [entity] [] False) lightOn = filterEvent (== Open) - >>|| callService "drawer light on" (switchService [entity] True) + >>|| callService "drawer light on" (switchService [entity] [] True) door :: HASS (Event Value) (Event DoorState) door = entityBool "binary_sensor.makuuhuone_ovi_contact" @@ -191,4 +192,5 @@ humidifierController = proc x -> do , serviceName= bool "turn_off" "turn_on" state , serviceData= Nothing , serviceTarget= [EntityId "humidifier.makuuhuone_ilmankostutin"] + , serviceExclusions= [] } diff --git a/src/HomeAssistant/Controller/Children.hs b/src/HomeAssistant/Controller/Children.hs index 371769c..768f025 100644 --- a/src/HomeAssistant/Controller/Children.hs +++ b/src/HomeAssistant/Controller/Children.hs @@ -87,11 +87,11 @@ lightsOn :: HASS a () lightsOn = foldMap atTime timersOn >>> AFRP.onEvent (callService "Lights on" lights) where - lights = light [AreaId "lasten_makuuhuone"] (On def{lightBrightness=Just (BrightnessPercent 100), lightTransition = Just 5} ) + lights = light [AreaId "lasten_makuuhuone"] [] (On def{lightBrightness=Just (BrightnessPercent 100), lightTransition = Just 5} ) lightsOff :: HASS a () lightsOff = foldMap atTime timersOff - >>> AFRP.onEvent (callService "Lights off" (light [AreaId "lasten_makuuhuone"] Off)) + >>> AFRP.onEvent (callService "Lights off" (light [AreaId "lasten_makuuhuone"] [LabelId "decoration"] Off)) childrenBedroomButton :: HASS (Event Value) (Event (IkeaButton IkeaGesture)) @@ -104,7 +104,7 @@ childrenBedroomButtonController = proc x -> do Event (OnButton ShortRelease) -> callService "scene.lasten_nukkuvalmistelu" (activateScene "scene.lasten_nukkuvalmistelu") -< () Event (OnButton DoubleClick) -> callService "scene.lasten_luku" (activateScene "scene.lasten_luku") -< () Event (OnButton LongClick) -> callService "scene.lasten_kirkas" (activateScene "scene.lasten_kirkas") -< () - Event (OffButton _) -> callService "Lights off" (light [AreaId "lasten_makuuhuone"] Off) -< () + Event (OffButton _) -> callService "Lights off" (light [AreaId "lasten_makuuhuone"] [LabelId "decoration"] Off) -< () _ -> returnA -< () newtype PM25 = PM25 Float @@ -163,5 +163,6 @@ childrenAirFilterController = proc ev -> do { serviceDomain = "fan" , serviceName = "set_percentage" , serviceTarget = [EntityId "fan.children_fan"] + , serviceExclusions = [] , serviceData = Just $ toJSON percentage } diff --git a/src/HomeAssistant/Controller/Hallway.hs b/src/HomeAssistant/Controller/Hallway.hs index 2266af3..cbe71b4 100644 --- a/src/HomeAssistant/Controller/Hallway.hs +++ b/src/HomeAssistant/Controller/Hallway.hs @@ -70,8 +70,8 @@ modeC = modeTrigger >>> mconcat ] >>> arr (const ()) where - lightOff = callService "Lower light off" (light [EntityId "light.hallway_ceiling"] Off) - lightOn = callService "Lower light back on" (light [EntityId "light.hallway_ceiling"] (On def)) + lightOff = callService "Lower light off" (light [EntityId "light.hallway_ceiling"] [] Off) + lightOn = callService "Lower light back on" (light [EntityId "light.hallway_ceiling"] [] (On def)) onC :: HASS (Event Value) () onC = proc ev -> do @@ -84,7 +84,7 @@ onC = proc ev -> do Event _ -> lightsOn -< entities Tick -> returnA -< () where - lightsOn = callServiceDyn "Lights on" (\es -> light es (On def)) + lightsOn = callServiceDyn "Lights on" (\es -> light es [] (On def)) lightsOffTrigger :: HASS (Event Value) (Event ()) lightsOffTrigger = hallwayPresence >>> arr (== Unoccupied) >>> @@ -94,7 +94,7 @@ offC :: HASS (Event Value) () offC = (lightsOffTrigger AFRP.>>|| lightsOff) >>> arr (const ()) where - lightsOff = callService "Lights off" (light [EntityId "light.hallway_lights"] Off) + lightsOff = callService "Lights off" (light [EntityId "light.hallway_lights"] [] Off) hallwayLightsController :: HASS (Event Value) () hallwayLightsController = onC <> offC <> modeC diff --git a/src/HomeAssistant/Controller/Kitchen.hs b/src/HomeAssistant/Controller/Kitchen.hs index 7552ee9..ef68009 100644 --- a/src/HomeAssistant/Controller/Kitchen.hs +++ b/src/HomeAssistant/Controller/Kitchen.hs @@ -23,8 +23,8 @@ kitchenCeilingController = proc x -> do ev <- lightingModeEvents -< p traceEvent -< ev case ev of - Event LightingOn | lightsAllowed now -> callServiceDyn "light.kitchen_ceiling on" (light [EntityId "light.kitchen_ceiling"]) -< On def - Event LightingOff -> callServiceDyn "light.kitchen_ceiling off" (light [EntityId "light.kitchen_ceiling"]) -< Off + Event LightingOn | lightsAllowed now -> callServiceDyn "light.kitchen_ceiling on" (light [EntityId "light.kitchen_ceiling"] []) -< On def + Event LightingOff -> callServiceDyn "light.kitchen_ceiling off" (light [EntityId "light.kitchen_ceiling"] []) -< Off _ -> returnA -< () where lightsAllowed (LocalTime _ tod) = not (tod > TimeOfDay 1 45 0 && tod < TimeOfDay 5 0 0) @@ -53,7 +53,7 @@ dinnerTableController = lightsOn = AFRP.edge >>|| sleep "sleep off" False - >>> callService "Dining light on" (light [EntityId "light.kitchen_dining_large"] $ On def) + >>> callService "Dining light on" (light [EntityId "light.kitchen_dining_large"] [] $ On def) lightsSleep = arr not @@ -64,10 +64,10 @@ dinnerTableController = arr not >>> AFRP.waitFor 300 >>|| sleep "sleep off" False - >>> callService "Dining light on" (light [EntityId "light.kitchen_dining_large"] Off) + >>> callService "Dining light on" (light [EntityId "light.kitchen_dining_large"] [] Off) - sleep lbl b = callService lbl (switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] b) + sleep lbl b = callService lbl (switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] [] b) kitchenMotionController :: HASS (Event Value) () diff --git a/src/HomeAssistant/Controller/Light/Command.hs b/src/HomeAssistant/Controller/Light/Command.hs index 1853f80..0f50b81 100644 --- a/src/HomeAssistant/Controller/Light/Command.hs +++ b/src/HomeAssistant/Controller/Light/Command.hs @@ -47,16 +47,19 @@ data LightCommand = Off | On LightAttributes -light :: [Target] -> LightCommand -> Service -light targets (On settings) = Service - { serviceDomain="light" - , serviceName= "turn_on" - , serviceData= formatLightAttributes settings - , serviceTarget=targets - } -light targets Off = Service - { serviceDomain="light" - , serviceName= "turn_off" - , serviceData=Nothing - , serviceTarget=targets - } +light :: [Target] -> [Target] -> LightCommand -> Service +light targets exclusions = \case + (On settings) -> Service + { serviceDomain="light" + , serviceName= "turn_on" + , serviceData= formatLightAttributes settings + , serviceTarget=targets + , serviceExclusions = exclusions + } + Off -> Service + { serviceDomain="light" + , serviceName= "turn_off" + , serviceData=Nothing + , serviceTarget=targets + , serviceExclusions = exclusions + } diff --git a/src/HomeAssistant/Controller/Livingroom.hs b/src/HomeAssistant/Controller/Livingroom.hs index 1c24258..a64fddb 100644 --- a/src/HomeAssistant/Controller/Livingroom.hs +++ b/src/HomeAssistant/Controller/Livingroom.hs @@ -39,8 +39,8 @@ livingroomPresenceController = proc x -> do ev <- lightingModeEvents . livingroomPresence -< x traceEvent -< ev case ev of - AFRP.Event LightingOn -> callServiceDyn "Lights on" (light livingroomLightTargets) -< On def - AFRP.Event LightingOff -> callServiceDyn "Lights off" (light livingroomLightTargets) -< Off + AFRP.Event LightingOn -> callServiceDyn "Lights on" (light livingroomLightTargets []) -< On def + AFRP.Event LightingOff -> callServiceDyn "Lights off" (light livingroomLightTargets []) -< Off _ -> returnA -< () returnA -< () diff --git a/src/HomeAssistant/Controller/Scene.hs b/src/HomeAssistant/Controller/Scene.hs index 350bfd7..4b1a5b7 100644 --- a/src/HomeAssistant/Controller/Scene.hs +++ b/src/HomeAssistant/Controller/Scene.hs @@ -18,4 +18,5 @@ activateSceneWith sceneId d = Service , serviceName= "turn_on" , serviceTarget= [EntityId sceneId] , serviceData = d + , serviceExclusions = [] } diff --git a/src/HomeAssistant/Controller/Service.hs b/src/HomeAssistant/Controller/Service.hs index 92ce8f9..a636c0c 100644 --- a/src/HomeAssistant/Controller/Service.hs +++ b/src/HomeAssistant/Controller/Service.hs @@ -6,7 +6,10 @@ module HomeAssistant.Controller.Service import Data.Aeson (Value) import qualified Data.Text as T -data Target = EntityId !T.Text | AreaId !T.Text +data Target + = EntityId !T.Text + | AreaId !T.Text + | LabelId !T.Text deriving (Show,Eq,Ord) data Service = Service @@ -14,5 +17,6 @@ data Service = Service , serviceName :: T.Text , serviceData :: Maybe Value , serviceTarget :: [Target] + , serviceExclusions :: [Target] } deriving (Show, Eq) diff --git a/src/HomeAssistant/Controller/Switch.hs b/src/HomeAssistant/Controller/Switch.hs index 090b1f7..c9a3f6e 100644 --- a/src/HomeAssistant/Controller/Switch.hs +++ b/src/HomeAssistant/Controller/Switch.hs @@ -5,10 +5,11 @@ module HomeAssistant.Controller.Switch (switchService) where import Data.Bool (bool) import HomeAssistant.Controller.Service (Service (..), Target) -switchService :: [Target] -> Bool -> Service -switchService targets b = Service +switchService :: [Target] -> [Target] -> Bool -> Service +switchService targets exclusions b = Service { serviceDomain="switch" , serviceName= bool "turn_off" "turn_on" b , serviceData=Nothing , serviceTarget=targets + , serviceExclusions=exclusions } diff --git a/src/HomeAssistant/Runtime/Connection.hs b/src/HomeAssistant/Runtime/Connection.hs index f0403a7..4f35cf7 100644 --- a/src/HomeAssistant/Runtime/Connection.hs +++ b/src/HomeAssistant/Runtime/Connection.hs @@ -146,17 +146,21 @@ encodeService callId Service{..} = object $ , "type" .= ("call_service" :: T.Text) , "domain" .= serviceDomain , "service" .= serviceName - , "target" .= targetObject serviceTarget + , "target" .= targetObject serviceTarget serviceExclusions ] <> maybe [] (\d -> ["service_data" .= d]) serviceData -- | A single target encodes as a scalar; multiple encode as a list. Empty --- lists are omitted so Home Assistant receives only populated keys. -targetObject :: [Target] -> Value -targetObject targets = object $ entityPart <> areaPart +-- lists are omitted so Home Assistant receives only populated keys. Exclusions +-- nest under "exclude". +targetObject :: [Target] -> [Target] -> Value +targetObject targets exclusions = object $ + targetKeys targets + <> [ "exclude" .= object (targetKeys exclusions) | not (null exclusions) ] where - entityPart = emit "entity_id" [e | EntityId e <- targets] - areaPart = emit "area_id" [a | AreaId a <- targets] + targetKeys ts = emit "entity_id" [e | EntityId e <- ts] + <> emit "area_id" [a | AreaId a <- ts] + <> emit "label_id" [l | LabelId l <- ts] emit _ [] = [] emit k [x] = [k .= x] emit k many = [k .= many] diff --git a/test/BedroomSpec.hs b/test/BedroomSpec.hs index b7cacdd..a9b6697 100644 --- a/test/BedroomSpec.hs +++ b/test/BedroomSpec.hs @@ -85,18 +85,18 @@ drawerSpec = describe "bedroomDrawerController" $ do it "turns the drawer light on when the drawer opens" $ services (runHASS bedroomDrawerController [drawerState "on"]) - `shouldBe` [[switchService [entity] True]] + `shouldBe` [[switchService [entity] [] True]] it "turns the drawer light off when the drawer closes" $ services (runHASS bedroomDrawerController [drawerState "off"]) - `shouldBe` [[switchService [entity] False]] + `shouldBe` [[switchService [entity] [] False]] it "toggles the light as the drawer opens and closes" $ services (runHASS bedroomDrawerController [ drawerState "on", drawerState "off", drawerState "on" ]) - `shouldBe` [ [switchService [entity] True] - , [switchService [entity] False] - , [switchService [entity] True] + `shouldBe` [ [switchService [entity] [] True] + , [switchService [entity] [] False] + , [switchService [entity] [] True] ] it "ignores state events for other entities" $ @@ -146,12 +146,12 @@ presenceSpec = describe "bedroomPresenceController" $ do let later = 305 `addUTCTime` now services (runHASSTimed bedroomPresenceController [ (now, presenceSensor "on"), (now, presenceSensor "off"), (later, Tick) ]) - `shouldBe` [ [], [], [light bedroomLightTargets Off] ] + `shouldBe` [ [], [], [light bedroomLightTargets [] Off] ] it "restores the last snapshot when re-entering after sleep" $ do now <- getCurrentTime let later = 350 `addUTCTime` now - let masseRestored = light [EntityId "light.bedroom_masse"] (On def + let masseRestored = light [EntityId "light.bedroom_masse"] [] (On def { lightBrightness = Just (BrightnessAbsolute 140) , lightColorTemperature = Just 2700 }) @@ -167,9 +167,9 @@ presenceSpec = describe "bedroomPresenceController" $ do , [] , [sleepScene] , [] - , [ light [EntityId "light.bedroom_ceiling"] Off - , light [EntityId "light.bedroom_jemina"] Off - , light [EntityId "light.bedroom_led_switch"] Off + , [ light [EntityId "light.bedroom_ceiling"] [] Off + , light [EntityId "light.bedroom_jemina"] [] Off + , light [EntityId "light.bedroom_led_switch"] [] Off , masseRestored ] , [] @@ -193,15 +193,15 @@ buttonSpec = describe "bedroomButtonController" $ do it "Masse off click turns the bedroom lights off" $ concat (services (runHASS bedroomButtonController [masseButton "2_short_release"])) - `shouldContain` [light [area] Off] + `shouldContain` [light [area] [] Off] it "Masse long off click also turns the hallway lights off" $ concat (services (runHASS bedroomButtonController [masseButton "2_long_press"])) - `shouldContain` [light [EntityId "light.hallway_lights"] Off] + `shouldContain` [light [EntityId "light.hallway_lights"] [] Off] it "Masse short off click leaves the hallway lights alone" $ concat (services (runHASS bedroomButtonController [masseButton "2_short_release"])) - `shouldNotContain` [light [EntityId "light.hallway_lights"] Off] + `shouldNotContain` [light [EntityId "light.hallway_lights"] [] Off] it "Enishen single click turns on her nightstand scene (lowest)" $ concat (services (runHASS bedroomButtonController [enishenButton "1_short_release"])) @@ -217,11 +217,11 @@ buttonSpec = describe "bedroomButtonController" $ do it "Enishen off click turns the bedroom lights off" $ concat (services (runHASS bedroomButtonController [enishenButton "2_short_release"])) - `shouldContain` [light [area] Off] + `shouldContain` [light [area] [] Off] it "Enishen long off click also turns the hallway lights off" $ concat (services (runHASS bedroomButtonController [enishenButton "2_long_press"])) - `shouldContain` [light [EntityId "light.hallway_lights"] Off] + `shouldContain` [light [EntityId "light.hallway_lights"] [] Off] it "ignores the initial press (scene only fires on release)" $ services (runHASS bedroomButtonController [masseButton "1_initial_press"]) diff --git a/test/BusSpec.hs b/test/BusSpec.hs index f5b32fc..f00d21d 100644 --- a/test/BusSpec.hs +++ b/test/BusSpec.hs @@ -40,7 +40,7 @@ spec = describe "Bus" $ do it "channelHassEval writes CallService to the outbound channel" $ withTestBus $ \bus -> do let req = Request (UTCTime (toEnum 0) 0) utc nil "test" - svc = Service "light" "turn_on" Nothing [EntityId "light.bedroom_masse"] + svc = Service "light" "turn_on" Nothing [EntityId "light.bedroom_masse"] [] runKatipContextT (busLogEnv bus) () (Namespace ["test"]) $ channelHassEval bus (CallService req svc) (_, svc') <- atomically $ readTChan (busOutbound bus) @@ -50,7 +50,7 @@ spec = describe "Bus" $ do withTestFlagsBus $ \bus -> do setEnabled (busFlags bus) "test-handler" False let req = Request (UTCTime (toEnum 0) 0) utc nil "test-handler" - svc = Service "light" "turn_on" Nothing [EntityId "light.test"] + svc = Service "light" "turn_on" Nothing [EntityId "light.test"] [] runKatipContextT (busLogEnv bus) () (Namespace ["test"]) $ channelHassEval bus (CallService req svc) result <- timeout 1000000 $ atomically $ readTChan (busOutbound bus) diff --git a/test/ConnectionSpec.hs b/test/ConnectionSpec.hs index 06915f1..8dc4ac0 100644 --- a/test/ConnectionSpec.hs +++ b/test/ConnectionSpec.hs @@ -27,7 +27,7 @@ spec :: Spec spec = do describe "encodeService" $ do it "encodes a call_service message" $ - encodeService 7 (Service "light" "turn_on" Nothing [EntityId "light.bedroom_masse"]) + encodeService 7 (Service "light" "turn_on" Nothing [EntityId "light.bedroom_masse"] []) `shouldBe` object [ "id" .= (7 :: Int) , "type" .= ("call_service" :: Text) @@ -37,7 +37,7 @@ spec = do ] it "includes service_data when present" $ - encodeService 8 (Service "light" "turn_on" (Just (object ["brightness" .= (200 :: Int)])) [EntityId "light.bedroom_masse"]) + encodeService 8 (Service "light" "turn_on" (Just (object ["brightness" .= (200 :: Int)])) [EntityId "light.bedroom_masse"] []) `shouldBe` object [ "id" .= (8 :: Int) , "type" .= ("call_service" :: Text) @@ -47,6 +47,19 @@ spec = do , "service_data" .= object ["brightness" .= (200 :: Int)] ] + it "encodes target exclusions" $ + encodeService 9 (Service "light" "turn_off" Nothing [AreaId "lasten_makuuhuone"] [LabelId "decoration"]) + `shouldBe` object + [ "id" .= (9 :: Int) + , "type" .= ("call_service" :: Text) + , "domain" .= ("light" :: Text) + , "service" .= ("turn_off" :: Text) + , "target" .= object + [ "area_id" .= ("lasten_makuuhuone" :: Text) + , "exclude" .= object ["label_id" .= ("decoration" :: Text)] + ] + ] + describe "isTriggerEvent" $ do it "is true for event frames" $ isTriggerEvent (object ["type" .= ("event" :: Text)]) `shouldBe` True @@ -80,5 +93,5 @@ req n = Request (UTCTime (toEnum 0) (fromIntegral (0 :: Int))) utc uuid = "00000000-0000-0000-0000-" <> pad n lightOn :: [Target] -> Service -lightOn = Service "light" "turn_on" Nothing +lightOn targets = Service "light" "turn_on" Nothing targets [] diff --git a/test/HallwaySpec.hs b/test/HallwaySpec.hs index 368a9a2..e59e0dc 100644 --- a/test/HallwaySpec.hs +++ b/test/HallwaySpec.hs @@ -180,11 +180,11 @@ lightsSpec = do describe "hallwayLightsController" $ do it "turns the full lights on when someone enters during daytime" $ services (runHASSTimed hallwayLightsController [(day, motionSensor "on")]) - `shouldBe` [[light [EntityId "light.hallway_lights"] (On def)]] + `shouldBe` [[light [EntityId "light.hallway_lights"] [] (On def)]] it "turns the full lights on when someone enters during daytime preceding tick" $ services (runHASSTimed hallwayLightsController [(day, Tick), (day, motionSensor "on")]) - `shouldBe` [[], [light [EntityId "light.hallway_lights"] (On def)]] + `shouldBe` [[], [light [EntityId "light.hallway_lights"] [] (On def)]] it "turns the lights off when everyone leaves, without sleep mode" $ let later = 505 `addUTCTime` day @@ -195,9 +195,9 @@ lightsSpec = do , (later, Tick) ]) `shouldBe` [ [] - , [light [EntityId "light.hallway_lights"] (On def)] + , [light [EntityId "light.hallway_lights"] [] (On def)] , [] - , [light [EntityId "light.hallway_lights"] Off] + , [light [EntityId "light.hallway_lights"] [] Off] ] it "turns on only the ceiling light when entering during sleep hours with a door open" $ @@ -208,7 +208,7 @@ lightsSpec = do ]) `shouldBe` [ [] , [] - , [light [EntityId "light.hallway_ceiling_2"] (On def)] + , [light [EntityId "light.hallway_ceiling_2"] [] (On def)] ] it "leaves the lights unchanged when an empty bedroom door opens during sleep hours" $ @@ -220,7 +220,7 @@ lightsSpec = do ]) `shouldBe` [ [] , [] - , [light [EntityId "light.hallway_lights"] (On def)] + , [light [EntityId "light.hallway_lights"] [] (On def)] , [] ] @@ -233,7 +233,7 @@ lightsSpec = do , (night, motionSensor "on") ]) `shouldBe` [ [], [], [], [] - , [light [EntityId "light.hallway_lights"] (On def)] + , [light [EntityId "light.hallway_lights"] [] (On def)] ] it "protects an open bedroom door as soon as its light is dimmed down" $ @@ -246,8 +246,8 @@ lightsSpec = do , (night, bedroomLightEvent "light.bedroom_ceiling" 25) ]) `shouldBe` [ [], [], [], [] - , [light [EntityId "light.hallway_lights"] (On def)] - , [light [EntityId "light.hallway_ceiling"] Off] + , [light [EntityId "light.hallway_lights"] [] (On def)] + , [light [EntityId "light.hallway_ceiling"] [] Off] ] it "counts a barely lit bedroom as ready to sleep" $ @@ -260,8 +260,8 @@ lightsSpec = do , (night, masterDoor "on") -- opens for the cats, someone ready to sleep ]) `shouldBe` [ [], [], [], [] - , [light [EntityId "light.hallway_lights"] (On def)] - , [light [EntityId "light.hallway_ceiling"] Off] + , [light [EntityId "light.hallway_lights"] [] (On def)] + , [light [EntityId "light.hallway_ceiling"] [] Off] ] it "dims the lower light when an occupied bedroom door opens during sleep hours" $ @@ -273,8 +273,8 @@ lightsSpec = do , (night, masterDoor "on") -- opens for the cats, someone ready to sleep ]) `shouldBe` [ [], [], [] - , [light [EntityId "light.hallway_lights"] (On def)] - , [light [EntityId "light.hallway_ceiling"] Off] + , [light [EntityId "light.hallway_lights"] [] (On def)] + , [light [EntityId "light.hallway_ceiling"] [] Off] ] it "turns the lower hallway light on when the doors close while presence is active" $ @@ -285,7 +285,7 @@ lightsSpec = do , (night, childrenDoor "off") ]) `shouldBe` [ [] - , [light [EntityId "light.hallway_ceiling_2"] (On def)] + , [light [EntityId "light.hallway_ceiling_2"] [] (On def)] , [] - , [light [EntityId "light.hallway_ceiling"] (On def)] + , [light [EntityId "light.hallway_ceiling"] [] (On def)] ] diff --git a/test/KitchenSpec.hs b/test/KitchenSpec.hs index 695b1cb..ed65b33 100644 --- a/test/KitchenSpec.hs +++ b/test/KitchenSpec.hs @@ -36,18 +36,18 @@ dinnerTableSpec = describe "dinnerTableController" $ do it "turns lights on when presence is occupied and light level is low" $ do services (runHASS dinnerTableController [testDinnerLightLevel 10, testDinnerPresence "on"]) - `shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] True], [switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] False, light [EntityId "light.kitchen_dining_large"] (On def)]] + `shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] [] True], [switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] [] False, light [EntityId "light.kitchen_dining_large"] [] (On def)]] it "turns lights to sleep when presence is unoccupied" $ do now <- getCurrentTime services (runHASSTimed dinnerTableController [(now, testDinnerLightLevel 10), (now, testDinnerPresence "off")]) - `shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] True], []] + `shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] [] True], []] it "turns lights off when no presence for 300 seconds" $ do now <- getCurrentTime let later = 305 `addUTCTime` now services (runHASSTimed dinnerTableController [(now, testDinnerLightLevel 10), (now, testDinnerPresence "off"), (later, Tick)]) - `shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] True], [], [switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] False, light [EntityId "light.kitchen_dining_large"] Off]] + `shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] [] True], [], [switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] [] False, light [EntityId "light.kitchen_dining_large"] [] Off]] it "does nothing on Tick" $ do services (runHASS dinnerTableController [Tick]) - `shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] True]] + `shouldBe` [[switchService [EntityId "switch.adaptive_lighting_ruokapoydan_valot_sleep_mode"] [] True]]