citadel/heater
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

code lint

Browse Source
This commit is contained in:
Nicolas Duhamel 2022-11-02 08:21:08 +01:00
parent ee87938c93
commit d101053188
2 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/device/device.go
View File

@ -25,7 +25,7 @@ type DeviceState struct {
Mode string `json:"mode"`
Setpoint int `json:"setpoint"`
Time time.Time `json:"time"`
Program_name string `json:"program_name"`
ProgramName string `json:"program_name"`
UntilTime time.Time `json:"until_time"`
}
@ -54,7 +54,7 @@ func (s *DeviceState) Equivalent(state DeviceState) bool {
return false
}
case "program":
if state.Program_name != s.Program_name {
if state.ProgramName != s.ProgramName {
return false
}
}
@ -81,8 +81,8 @@ func (d Device) ListenTopic() (string, error) {
func (d *Device) Program() (WeekProgram, error) {
// return current device program if specified or default one
prog_name := "default"
if d.State.Program_name != "" {
prog_name = d.State.Program_name
if d.State.ProgramName != "" {
prog_name = d.State.ProgramName
}
program, ok := d.Settings.Programs[prog_name]
@ -94,8 +94,8 @@ func (d *Device) Program() (WeekProgram, error) {
}
func (d *Device) ProgramName() string {
if d.State.Program_name != "" {
return d.State.Program_name
if d.State.ProgramName != "" {
return d.State.ProgramName
}
return "default"
}
@ -175,7 +175,7 @@ func (d *Device) update(log *zerolog.Logger, pubchan chan Message) (bool, error)
Int("current_setpoint", d.CurrentSetpoint).
Str("State.Mode", d.State.Mode).
Int("State.Setpoint", d.State.Setpoint).
Str("State.Program_name", d.State.Program_name).
Str("State.Program_name", d.State.ProgramName).
Logger()
log.Debug().Msg("check if setpoint need an update")
@ -247,7 +247,7 @@ func (d *Device) handle_reset_state(log *zerolog.Logger, pubchan chan Message) (
d.State = DeviceState{
Setpoint: value,
Mode: "program",
Program_name: d.ProgramName(),
ProgramName: d.ProgramName(),
Time: timeNow(),
}
@ -329,7 +329,7 @@ func (d *Device) handle_until_next(log *zerolog.Logger, pubchan chan Message) (b
}
func (d *Device) handle_program(log *zerolog.Logger, pubchan chan Message) (bool, error) {
*log = log.With().Str("program", d.State.Program_name).Logger()
*log = log.With().Str("program", d.State.ProgramName).Logger()
program, err := d.Program()
if err != nil {

40
pkg/device/device_test.go
View File

@ -51,7 +51,7 @@ var test_device = Device{
Mode: "program",
Setpoint: 14,
Time: test_time,
Program_name: "default",
ProgramName: "default",
},
}
@ -67,7 +67,7 @@ func TestStateEquivalent(t *testing.T) {
Mode: "program",
Setpoint: 14,
Time: test_time,
Program_name: "default",
ProgramName: "default",
},
DeviceState{
Mode: "always",
@ -81,13 +81,13 @@ func TestStateEquivalent(t *testing.T) {
Mode: "program",
Setpoint: 14,
Time: test_time,
Program_name: "default",
ProgramName: "default",
},
DeviceState{
Mode: "program",
Setpoint: 14,
Time: test_time.Add(1 * time.Minute),
Program_name: "default",
ProgramName: "default",
},
false,
},
@ -96,13 +96,13 @@ func TestStateEquivalent(t *testing.T) {
Mode: "program",
Setpoint: 14,
Time: test_time,
Program_name: "default",
ProgramName: "default",
},
DeviceState{
Mode: "program",
Setpoint: 13,
Time: test_time,
Program_name: "default",
ProgramName: "default",
},
true,
},
@ -111,13 +111,13 @@ func TestStateEquivalent(t *testing.T) {
Mode: "program",
Setpoint: 14,
Time: test_time,
Program_name: "default",
ProgramName: "default",
},
DeviceState{
Mode: "program",
Setpoint: 13,
Time: test_time,
Program_name: "other",
ProgramName: "other",
},
false,
},
@ -131,7 +131,7 @@ func TestStateEquivalent(t *testing.T) {
Mode: "always",
Setpoint: 14,
Time: test_time,
Program_name: "other",
ProgramName: "other",
UntilTime: test_time,
},
true,
@ -146,7 +146,7 @@ func TestStateEquivalent(t *testing.T) {
Mode: "always",
Setpoint: 15,
Time: test_time,
Program_name: "other",
ProgramName: "other",
UntilTime: test_time,
},
false,
@ -161,7 +161,7 @@ func TestStateEquivalent(t *testing.T) {
Mode: "until_next",
Setpoint: 14,
Time: test_time,
Program_name: "other",
ProgramName: "other",
UntilTime: test_time,
},
true,
@ -176,7 +176,7 @@ func TestStateEquivalent(t *testing.T) {
Mode: "until_next",
Setpoint: 13,
Time: test_time,
Program_name: "other",
ProgramName: "other",
UntilTime: test_time,
},
false,
@ -192,7 +192,7 @@ func TestStateEquivalent(t *testing.T) {
Mode: "until_time",
Setpoint: 14,
Time: test_time,
Program_name: "other",
ProgramName: "other",
UntilTime: test_time.Add(1 * time.Hour),
},
true,
@ -208,7 +208,7 @@ func TestStateEquivalent(t *testing.T) {
Mode: "until_time",
Setpoint: 13,
Time: test_time,
Program_name: "other",
ProgramName: "other",
UntilTime: test_time.Add(1 * time.Hour),
},
false,
@ -224,7 +224,7 @@ func TestStateEquivalent(t *testing.T) {
Mode: "until_time",
Setpoint: 14,
Time: test_time,
Program_name: "other",
ProgramName: "other",
UntilTime: test_time.Add(2 * time.Hour),
},
false,
@ -262,7 +262,7 @@ func TestListenTopic(t *testing.T) {
func TestProgram(t *testing.T) {
//case 1: no program set in state return default
case1_device := test_device
case1_device.State.Program_name = ""
case1_device.State.ProgramName = ""
//case 2: program set "confort" must return it
var test_confort_weekprogram = WeekProgram{
@ -279,11 +279,11 @@ func TestProgram(t *testing.T) {
"default": test_weekprogram,
"confort": test_confort_weekprogram,
}
case2_device.State.Program_name = "confort"
case2_device.State.ProgramName = "confort"
//case 3: program set "confort" but not exist
case3_device := test_device
case3_device.State.Program_name = "confort"
case3_device.State.ProgramName = "confort"
var tests = []struct {
name string
@ -327,12 +327,12 @@ func TestUpdate(t *testing.T) {
Mode: "program",
Setpoint: 0,
Time: test_time,
Program_name: "",
ProgramName: "",
}
device2 := test_device
device2.Name = "2"
device2.State.Program_name = "unknown"
device2.State.ProgramName = "unknown"
device3 := test_device
device3.Name = "3"