fix(hass): 🐛 correct JSON marshaling

- fix marshaling event request type
- simplify setting request body for all request types

internal/hass/api/api.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/go-resty/resty/v2"
 
-	"github.com/joshuar/go-hass-agent/internal/hass/sensor"
 	"github.com/joshuar/go-hass-agent/internal/logging"
 )
 
@@ -78,7 +77,7 @@ func (e *ResponseError) Error() string {
 	return strings.Join(msg, ": ")
 }
 
-func Send[T any](ctx context.Context, url string, details any) (T, error) {
+func Send[T any](ctx context.Context, url string, details Request) (T, error) {
 	var response T
 
 	requestClient := client.R().SetContext(ctx)
@@ -96,17 +95,7 @@ func Send[T any](ctx context.Context, url string, details any) (T, error) {
 		}
 	}
 
-	// Explicitly set the request body based on the type. Not doing this with
-	// composable types may result in an unexpected body.
-	switch request := details.(type) {
-	case sensor.Entity:
-		requestClient.SetBody(request.RequestBody())
-	case sensor.State:
-		requestClient.SetBody(request.RequestBody())
-	case Request:
-		requestClient.SetBody(request.RequestBody())
-	}
-
+	requestClient.SetBody(details.RequestBody())
 	responseObj, err := requestClient.Post(url)
 
 	logging.FromContext(ctx).

internal/hass/client.go

@@ -84,7 +84,7 @@ func (c *Client) HassVersion(ctx context.Context) string {
 }
 
 func (c *Client) ProcessEvent(ctx context.Context, details event.Event) error {
-	resp, err := api.Send[response](ctx, c.url, details)
+	resp, err := api.Send[response](ctx, c.url, &details)
 	if err != nil {
 		return fmt.Errorf("failed to send event request: %w", err)
 	}
@@ -133,7 +133,7 @@ func (c *Client) ProcessSensor(ctx context.Context, details sensor.Entity) error
 	}
 
 	// Sensor registration.
-	resp, err := api.Send[registrationResponse](ctx, c.url, details)
+	resp, err := api.Send[registrationResponse](ctx, c.url, &details)
 	if err != nil {
 		return fmt.Errorf("failed to send sensor registration: %w", err)
 	}

internal/hass/config.go

@@ -53,10 +53,10 @@ func (c *Config) IsEntityDisabled(entity string) (bool, error) {
 
 type configRequest struct{}
 
-func (c *configRequest) RequestType() string {
-	return "get_config"
-}
-
-func (c *configRequest) RequestData() any {
-	return nil
+func (c *configRequest) RequestBody() any {
+	return struct {
+		Type string `json:"type"`
+	}{
+		Type: "get_config",
+	}
 }

internal/hass/event/event.go

@@ -28,10 +28,12 @@ func (e *Event) Validate() error {
 	return nil
 }
 
-func (e *Event) RequestType() string {
-	return requestTypeEvent
-}
-
-func (e *Event) RequestData() any {
-	return e
+func (e *Event) RequestBody() any {
+	return struct {
+		Data        any    `json:"data"`
+		RequestType string `json:"type"`
+	}{
+		RequestType: requestTypeEvent,
+		Data:        e,
+	}
 }

internal/hass/response.go

@@ -27,7 +27,7 @@ type response struct {
 }
 
 func (r *response) Status() (responseStatus, error) {
-	if r.IsSuccess {
+	if r.IsSuccess || r.ErrorDetails == nil {
 		return Updated, nil
 	}