From 68d0ec05db000526f20c4277f2f7cd5157de436c Mon Sep 17 00:00:00 2001 From: Bennett Wetters Date: Sat, 3 Aug 2024 19:48:33 +0200 Subject: [PATCH] feat: Add support for PUT/DELETE state.message Fix #33 --- handlers/state.go | 34 ++++++++++++++++++++++++++++++++++ main.go | 6 ++++++ persistence/persistentState.go | 7 ++++--- types/v14.go | 10 ++++++---- 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/handlers/state.go b/handlers/state.go index f965db4..d1ab9d9 100644 --- a/handlers/state.go +++ b/handlers/state.go @@ -34,3 +34,37 @@ func StateOpen( resp.LastChange = time.Now().Unix() } } + +func StateMessagePUT( + authDB config.HTTPBACredentials, validCredentials []config.HTTPBACredentialID, + resp *types.SpaceState, +) func(http.ResponseWriter, *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + body, err := updateEndpointValidator(authDB, validCredentials, w, r) + if err != nil { + log.Println(err) + return + } + + // Set SpaceAPI response values + resp.Message = string(body) + resp.LastChange = time.Now().Unix() + } +} + +func StateMessageDELETE( + authDB config.HTTPBACredentials, validCredentials []config.HTTPBACredentialID, + resp *types.SpaceState, +) func(http.ResponseWriter, *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + _, err := updateEndpointValidator(authDB, validCredentials, w, r) + if err != nil { + log.Println(err) + return + } + + // Set SpaceAPI response values + resp.Message = "" + resp.LastChange = time.Now().Unix() + } +} diff --git a/main.go b/main.go index 4e16106..2581e17 100644 --- a/main.go +++ b/main.go @@ -57,6 +57,12 @@ func main() { http.HandleFunc("PUT /state/open", handlers.StateOpen(conf.Credentials, conf.Dynamic.State.Open.AllowedCredentials, &conf.Response.State), ) + http.HandleFunc("PUT /state/message", + handlers.StateMessagePUT(conf.Credentials, conf.Dynamic.State.Open.AllowedCredentials, &conf.Response.State), + ) + http.HandleFunc("DELETE /state/message", + handlers.StateMessageDELETE(conf.Credentials, conf.Dynamic.State.Open.AllowedCredentials, &conf.Response.State), + ) // Register handler for environmental sensors for sensorType, envSensorConfigs := range conf.Dynamic.Sensors { for i, envSensorConfig := range envSensorConfigs { diff --git a/persistence/persistentState.go b/persistence/persistentState.go index 01e1912..74fbdb2 100644 --- a/persistence/persistentState.go +++ b/persistence/persistentState.go @@ -89,9 +89,10 @@ func SaveCurrentState(response types.SpaceAPIResponseV14) { // Create persistent state persistentStateV14 := types.PersistentStateV14{ State: struct { - Open bool `json:"open"` - LastChange int64 `json:"lastchange"` - }{Open: response.State.Open, LastChange: response.State.LastChange}, + Open bool `json:"open"` + LastChange int64 `json:"lastchange"` + Message string `json:"message,omitempty"` + }{Open: response.State.Open, LastChange: response.State.LastChange, Message: response.State.Message}, } // Save sensor state persistentStateV14.Sensors = make(map[string][]types.PersistentEnvironmentSensor) diff --git a/types/v14.go b/types/v14.go index 2492639..3763fe4 100644 --- a/types/v14.go +++ b/types/v14.go @@ -38,8 +38,9 @@ type SpaceAPIResponseV14 struct { } type SpaceState struct { - Open bool `json:"open"` - LastChange int64 `json:"lastchange"` + Open bool `json:"open"` + LastChange int64 `json:"lastchange"` + Message string `json:"message,omitempty"` } type EnvironmentSensor struct { @@ -53,8 +54,9 @@ type EnvironmentSensor struct { type PersistentStateV14 struct { State struct { - Open bool `json:"open"` - LastChange int64 `json:"lastchange"` + Open bool `json:"open"` + LastChange int64 `json:"lastchange"` + Message string `json:"message,omitempty"` } `json:"state"` Sensors map[string][]PersistentEnvironmentSensor `json:"sensors,omitempty"` }