svenvanheugten/night-light
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Give every light its own type

Browse source
This commit is contained in:
Sven van Heugten 2026-02-27 17:49:20 +01:00
parent dbb0389e61
commit 50c8a413a6
6 changed files with 72 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

16
NightLight.Core.Tests/FakeHome.fs
View file

@ -50,7 +50,7 @@ type FakeLight(light: Light) =
if hasPower then
brightness <- newBrightness
if light.Bulb = IkeaBulb then
if (lightProps light).Bulb = IkeaBulb then
state <- true
member _.SetColor(newColor: Color) =
@ -60,7 +60,7 @@ type FakeLight(light: Light) =
type FakeHome() =
let friendlyNameToFakeLight =
lights
|> Seq.map (fun light -> light.FriendlyName, FakeLight light)
|> Seq.map (fun light -> (lightProps light).FriendlyName, FakeLight light)
|> Map.ofSeq
let onEventPublished = new Event<Event>()
@ -113,17 +113,17 @@ type FakeHome() =
member _.Interact(interaction: Interaction) =
match interaction with
| HumanInteraction(LightPoweredOn light) ->
friendlyNameToFakeLight[light.FriendlyName].PowerOn()
friendlyNameToFakeLight[(lightProps light).FriendlyName].PowerOn()
{ Topic = "zigbee2mqtt/bridge/event"
Payload =
$@"{{
""type"": ""device_announce"",
""data"": {{ ""friendly_name"": ""{light.FriendlyName.Get}"" }}
""data"": {{ ""friendly_name"": ""{(lightProps light).FriendlyName.Get}"" }}
}}" }
|> ReceivedZigbeeEvent
|> onEventPublished.Trigger
| HumanInteraction(LightPoweredOff light) -> friendlyNameToFakeLight[light.FriendlyName].PowerOff()
| HumanInteraction(LightPoweredOff light) -> friendlyNameToFakeLight[(lightProps light).FriendlyName].PowerOff()
| RemoteInteraction RemotePressedOnButton ->
{ Topic = $"zigbee2mqtt/{remoteControlFriendlyName.Get}"
Payload = @"{ ""action"": ""on"" }" }
@ -149,15 +149,15 @@ type FakeHome with
member this.NonRemotelyControlledLightStates =
this.LightStates
|> Seq.filter (fst >> _.ControlledWithRemote >> (=) NonRemote)
|> Seq.filter (fst >> lightProps >> _.ControlledWithRemote >> (=) NonRemote)
|> Seq.toList
member this.RemotelyControlledLightStates =
this.LightStates
|> Seq.filter (fst >> _.ControlledWithRemote >> (<>) NonRemote)
|> Seq.filter (fst >> lightProps >> _.ControlledWithRemote >> (<>) NonRemote)
|> Seq.toList
member this.Label =
this.LightsThatAreOn
|> Seq.map (fun (light, state) -> $"{light.FriendlyName.Get}: {state}")
|> Seq.map (fun (light, state) -> $"{(lightProps light).FriendlyName.Get}: {state}")
|> String.concat ", "

8
NightLight.Core.Tests/LightArbitraries.fs
View file

@ -9,27 +9,27 @@ type ArbitraryLight =
type ArbitraryNonRemotelyControlledLight =
static member Light() =
lights
|> Seq.filter _.ControlledWithRemote.IsNonRemote
|> Seq.filter (fun light -> (lightProps light).ControlledWithRemote.IsNonRemote)
|> Gen.elements
|> Arb.fromGen
type ArbitraryLeftRemotelyControlledLight =
static member Light() =
lights
|> Seq.filter _.ControlledWithRemote.IsRemoteLeft
|> Seq.filter (fun light -> (lightProps light).ControlledWithRemote.IsRemoteLeft)
|> Gen.elements
|> Arb.fromGen
type ArbitraryRightRemotelyControlledLight =
static member Light() =
lights
|> Seq.filter _.ControlledWithRemote.IsRemoteRight
|> Seq.filter (fun light -> (lightProps light).ControlledWithRemote.IsRemoteRight)
|> Gen.elements
|> Arb.fromGen
type ArbitraryRemotelyControlledLight =
static member Light() =
lights
|> Seq.filter (not << _.ControlledWithRemote.IsNonRemote)
|> Seq.filter (fun light -> (lightProps light).ControlledWithRemote.IsNonRemote |> not)
|> Gen.elements
|> Arb.fromGen

18
NightLight.Core.Tests/NightLightTests.fs
View file

@ -52,7 +52,7 @@ type NightLightTests() =
&& time <= endOfAlarm
let scaledForAlarm light brightness =
if light.ControlledWithRemote <> NonRemote && alarm then
if (lightProps light).ControlledWithRemote <> NonRemote && alarm then
float brightness * ((time - startOfDay) / (endOfAlarm - startOfDay)) |> byte
else
brightness
@ -60,14 +60,14 @@ type NightLightTests() =
fakeHome.LightStates
|> Seq.forall (fun (light, state) ->
let maybeExpectedBrightness =
match light, state with
match (lightProps light).Bulb, state with
| _, Off -> None
| { Bulb = IkeaBulb }, On(_, White) -> Some 254uy
| { Bulb = IkeaBulb }, On(_, Yellow) -> Some 210uy
| { Bulb = IkeaBulb }, On(_, Red) -> Some 254uy
| { Bulb = PaulmannBulb }, On(_, White) -> Some 35uy
| { Bulb = PaulmannBulb }, On(_, Yellow) -> Some 35uy
| { Bulb = PaulmannBulb }, On(_, Red) -> Some 80uy
| IkeaBulb, On(_, White) -> Some 254uy
| IkeaBulb, On(_, Yellow) -> Some 210uy
| IkeaBulb, On(_, Red) -> Some 254uy
| PaulmannBulb, On(_, White) -> Some 35uy
| PaulmannBulb, On(_, Yellow) -> Some 35uy
| PaulmannBulb, On(_, Red) -> Some 80uy
|> Option.map (scaledForAlarm light)
let maybeActualBrightness =
@ -109,7 +109,7 @@ type NightLightTests() =
let allOff (ls: (Light * LightState) seq) = ls |> Seq.forall (snd >> _.IsOff)
let controlledBy remote ls =
ls |> Seq.filter (fst >> _.ControlledWithRemote >> (=) remote)
ls |> Seq.filter (fst >> lightProps >> _.ControlledWithRemote >> (=) remote)
let maybeLastRemoteInteraction = tryGetLastRemoteInteraction interactions