ejr/weatherapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve current conditions condition code presentation

Browse Source
This commit is contained in:
Eric Rakestraw
2026-06-29 12:02:37 +00:00
parent 6f8e01729d
commit 86fd848a6f
4 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/adapters/inbound/httpapi/endpoints_test.go
View File

@@ -1361,6 +1361,9 @@ func TestCurrentConditionsMetricDefaultJSON(t *testing.T) {
if payload.Data["conditionText"] != "Rain" { if payload.Data["conditionText"] != "Rain" {
t.Fatalf("expected conditionText Rain, got %#v", payload.Data["conditionText"]) t.Fatalf("expected conditionText Rain, got %#v", payload.Data["conditionText"])
} }
if payload.Data["conditionCode"] != float64(63) {
t.Fatalf("expected conditionCode 63, got %#v", payload.Data["conditionCode"])
}
} }
func TestCurrentConditionsUSJSON(t *testing.T) { func TestCurrentConditionsUSJSON(t *testing.T) {
@@ -1426,6 +1429,9 @@ func TestCurrentConditionsXMLAndTextFormats(t *testing.T) {
if !strings.Contains(w.Body.String(), "temperatureF") { if !strings.Contains(w.Body.String(), "temperatureF") {
t.Fatalf("expected US field temperatureF in XML payload: %s", w.Body.String()) t.Fatalf("expected US field temperatureF in XML payload: %s", w.Body.String())
} }
if !strings.Contains(w.Body.String(), "<conditionCode>2</conditionCode>") {
t.Fatalf("expected conditionCode in XML payload: %s", w.Body.String())
}
w = httptest.NewRecorder() w = httptest.NewRecorder()
req = httptest.NewRequest(http.MethodGet, "/conditions/current?format=TEXT", nil) req = httptest.NewRequest(http.MethodGet, "/conditions/current?format=TEXT", nil)
@@ -1437,7 +1443,7 @@ func TestCurrentConditionsXMLAndTextFormats(t *testing.T) {
if !strings.Contains(w.Header().Get("Content-Type"), "text/plain") { if !strings.Contains(w.Header().Get("Content-Type"), "text/plain") {
t.Fatalf("expected text/plain content type, got %q", w.Header().Get("Content-Type")) t.Fatalf("expected text/plain content type, got %q", w.Header().Get("Content-Type"))
} }
if !strings.Contains(w.Body.String(), "Conditions text") { if !strings.Contains(w.Body.String(), "Condition Code: 2") {
t.Fatalf("expected rendered text template body, got %q", w.Body.String()) t.Fatalf("expected rendered text template body, got %q", w.Body.String())
} }
} }
@@ -2458,7 +2464,7 @@ func testRenderers(t *testing.T) *render.Registry {
"weatherstories.txt.tmpl": "Weather Stories", "weatherstories.txt.tmpl": "Weather Stories",
"weatherstories_latest.txt.tmpl": "Latest Weather Story", "weatherstories_latest.txt.tmpl": "Latest Weather Story",
"alerts_active.txt.tmpl": "{{if .Data}}Active Alerts\nAlerts: {{len .Data.Alerts}}{{range .Data.Alerts}}\n{{.ID}}{{if .Headline}}\nHeadline: {{.Headline}}{{end}}{{if .Ends}}\nEnds: {{.Ends}}{{end}}{{end}}{{else}}No active alerts data available.{{end}}", "alerts_active.txt.tmpl": "{{if .Data}}Active Alerts\nAlerts: {{len .Data.Alerts}}{{range .Data.Alerts}}\n{{.ID}}{{if .Headline}}\nHeadline: {{.Headline}}{{end}}{{if .Ends}}\nEnds: {{.Ends}}{{end}}{{end}}{{else}}No active alerts data available.{{end}}",
"conditions_current.txt.tmpl": "Conditions text", "conditions_current.txt.tmpl": "Condition Code: {{.Data.ConditionCode}}",
} { } {
tmpl, err := template.New(name).Parse(body) tmpl, err := template.New(name).Parse(body)
if err != nil { if err != nil {

29
internal/adapters/inbound/httpapi/presenter/conditions.go
View File

@@ -4,25 +4,27 @@ package presenter
import ( import (
"gitea.maximumdirect.net/ejr/weatherapi/internal/app" "gitea.maximumdirect.net/ejr/weatherapi/internal/app"
"gitea.maximumdirect.net/ejr/weatherfeeder/model"
"gitea.maximumdirect.net/ejr/weatherfeeder/standards" "gitea.maximumdirect.net/ejr/weatherfeeder/standards"
) )
// CurrentConditionsResponse is the response shape for /conditions/current. // CurrentConditionsResponse is the response shape for /conditions/current.
// Unit-bearing fields are populated according to the requested unit mode. // Unit-bearing fields are populated according to the requested unit mode.
type CurrentConditionsResponse struct { type CurrentConditionsResponse struct {
TemperatureC *float64 `json:"temperatureC,omitempty" xml:"temperatureC,omitempty"` TemperatureC *float64 `json:"temperatureC,omitempty" xml:"temperatureC,omitempty"`
ApparentTemperatureC *float64 `json:"apparentTemperatureC,omitempty" xml:"apparentTemperatureC,omitempty"` ApparentTemperatureC *float64 `json:"apparentTemperatureC,omitempty" xml:"apparentTemperatureC,omitempty"`
DewpointC *float64 `json:"dewpointC,omitempty" xml:"dewpointC,omitempty"` DewpointC *float64 `json:"dewpointC,omitempty" xml:"dewpointC,omitempty"`
WindSpeedKmh *float64 `json:"windSpeedKmh,omitempty" xml:"windSpeedKmh,omitempty"` WindSpeedKmh *float64 `json:"windSpeedKmh,omitempty" xml:"windSpeedKmh,omitempty"`
TemperatureF *float64 `json:"temperatureF,omitempty" xml:"temperatureF,omitempty"` TemperatureF *float64 `json:"temperatureF,omitempty" xml:"temperatureF,omitempty"`
ApparentTemperatureF *float64 `json:"apparentTemperatureF,omitempty" xml:"apparentTemperatureF,omitempty"` ApparentTemperatureF *float64 `json:"apparentTemperatureF,omitempty" xml:"apparentTemperatureF,omitempty"`
DewpointF *float64 `json:"dewpointF,omitempty" xml:"dewpointF,omitempty"` DewpointF *float64 `json:"dewpointF,omitempty" xml:"dewpointF,omitempty"`
WindSpeedMph *float64 `json:"windSpeedMph,omitempty" xml:"windSpeedMph,omitempty"` WindSpeedMph *float64 `json:"windSpeedMph,omitempty" xml:"windSpeedMph,omitempty"`
RelativeHumidityPercent *float64 `json:"relativeHumidityPercent,omitempty" xml:"relativeHumidityPercent,omitempty"` RelativeHumidityPercent *float64 `json:"relativeHumidityPercent,omitempty" xml:"relativeHumidityPercent,omitempty"`
WindDirectionDegrees *float64 `json:"windDirectionDegrees,omitempty" xml:"windDirectionDegrees,omitempty"` WindDirectionDegrees *float64 `json:"windDirectionDegrees,omitempty" xml:"windDirectionDegrees,omitempty"`
ConditionText string `json:"conditionText,omitempty" xml:"conditionText,omitempty"` ConditionCode model.WMOCode `json:"conditionCode" xml:"conditionCode"`
IsDay *bool `json:"isDay,omitempty" xml:"isDay,omitempty"` ConditionText string `json:"conditionText,omitempty" xml:"conditionText,omitempty"`
IsDayText string `json:"-" xml:"-"` IsDay *bool `json:"isDay,omitempty" xml:"isDay,omitempty"`
IsDayText string `json:"-" xml:"-"`
} }
func CurrentConditionsPayload(conditions *app.CurrentConditions, units Units, precision int) any { func CurrentConditionsPayload(conditions *app.CurrentConditions, units Units, precision int) any {
@@ -33,6 +35,7 @@ func CurrentConditionsPayload(conditions *app.CurrentConditions, units Units, pr
out := CurrentConditionsResponse{ out := CurrentConditionsResponse{
RelativeHumidityPercent: roundedPtr(copyFloat64Ptr(conditions.RelativeHumidityPercent), precision), RelativeHumidityPercent: roundedPtr(copyFloat64Ptr(conditions.RelativeHumidityPercent), precision),
WindDirectionDegrees: roundedPtr(copyFloat64Ptr(conditions.WindDirectionDegrees), precision), WindDirectionDegrees: roundedPtr(copyFloat64Ptr(conditions.WindDirectionDegrees), precision),
ConditionCode: conditions.ConditionCode,
ConditionText: standards.WMOText(conditions.ConditionCode, conditions.IsDay), ConditionText: standards.WMOText(conditions.ConditionCode, conditions.IsDay),
IsDay: copyBoolPtr(conditions.IsDay), IsDay: copyBoolPtr(conditions.IsDay),
IsDayText: boolText(conditions.IsDay), IsDayText: boolText(conditions.IsDay),

6
internal/adapters/inbound/httpapi/presenter/payload_test.go
View File

@@ -378,6 +378,9 @@ func TestCurrentConditionsPayloadMetricAndUS(t *testing.T) {
if metric.ConditionText != "Sunny" { if metric.ConditionText != "Sunny" {
t.Fatalf("expected condition text Sunny, got %q", metric.ConditionText) t.Fatalf("expected condition text Sunny, got %q", metric.ConditionText)
} }
if metric.ConditionCode != 0 {
t.Fatalf("expected condition code 0, got %d", metric.ConditionCode)
}
usPayload := CurrentConditionsPayload(conditions, UnitsUS, 2) usPayload := CurrentConditionsPayload(conditions, UnitsUS, 2)
us, ok := usPayload.(CurrentConditionsResponse) us, ok := usPayload.(CurrentConditionsResponse)
@@ -389,6 +392,9 @@ func TestCurrentConditionsPayloadMetricAndUS(t *testing.T) {
if us.TemperatureC != nil || us.WindSpeedKmh != nil { if us.TemperatureC != nil || us.WindSpeedKmh != nil {
t.Fatalf("expected metric fields omitted for US payload") t.Fatalf("expected metric fields omitted for US payload")
} }
if us.ConditionCode != 0 {
t.Fatalf("expected condition code 0, got %d", us.ConditionCode)
}
} }
func TestCurrentConditionsPayloadUsesNightConditionText(t *testing.T) { func TestCurrentConditionsPayloadUsesNightConditionText(t *testing.T) {

1
templates/conditions_current.txt.tmpl
View File

@@ -1,5 +1,6 @@
{{- if .Data -}} {{- if .Data -}}
Current Conditions Current Conditions
Condition Code: {{.Data.ConditionCode}}
{{- if .Data.ConditionText}} {{- if .Data.ConditionText}}
Condition: {{.Data.ConditionText}} Condition: {{.Data.ConditionText}}
{{- end}} {{- end}}