remove HTML rendering interface

Author: ezh0v

internal/server/services/core/core.go

@@ -1,15 +1,19 @@
 package core
 
-import "github.com/TuanKiri/weather-mcp-server/internal/server/services"
+import (
+	"html/template"
+
+	"github.com/TuanKiri/weather-mcp-server/internal/server/services"
+)
 
 type CoreServices struct {
-	renderer   services.TemplateRenderer
+	renderer   *template.Template
 	weatherAPI services.WeatherAPIProvider
 
 	weatherService *WeatherService
 }
 
-func New(renderer services.TemplateRenderer, weatherAPI services.WeatherAPIProvider) *CoreServices {
+func New(renderer *template.Template, weatherAPI services.WeatherAPIProvider) *CoreServices {
 	return &CoreServices{
 		renderer:   renderer,
 		weatherAPI: weatherAPI,

internal/server/services/core/weather.go

@@ -3,8 +3,7 @@ package core
 import (
 	"bytes"
 	"context"
-
-	"github.com/TuanKiri/weather-mcp-server/internal/server/view/models"
+	"fmt"
 )
 
 type WeatherService struct {
@@ -17,11 +16,16 @@ func (ws *WeatherService) Current(ctx context.Context, city string) (string, err
 		return "", err
 	}
 
-	var current models.CurrentWeather
-	current.FromWeatherAPI(data)
-
 	var buf bytes.Buffer
-	if err := ws.renderer.ExecuteTemplate(&buf, "weather.html", current); err != nil {
+
+	if err := ws.renderer.ExecuteTemplate(&buf, "weather.html", map[string]string{
+		"Location":    fmt.Sprintf("%s, %s", data.Location.Name, data.Location.Country),
+		"Icon":        "https:" + data.Current.Condition.Icon,
+		"Condition":   data.Current.Condition.Text,
+		"Temperature": fmt.Sprintf("%.0f", data.Current.TempC),
+		"Humidity":    fmt.Sprintf("%d", data.Current.Humidity),
+		"WindSpeed":   fmt.Sprintf("%.0f", data.Current.WindKph),
+	}); err != nil {
 		return "", err
 	}
 

internal/server/services/core/weather_test.go

@@ -3,11 +3,11 @@ package core
 import (
 	"context"
 	"errors"
-	"fmt"
-	"io"
+	"html/template"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 
 	"github.com/TuanKiri/weather-mcp-server/internal/server/services/mock"
@@ -20,7 +20,6 @@ func TestCurrentWeather(t *testing.T) {
 		errString       string
 		wait            string
 		setupWeatherAPI func(weatherAPI *mock.MockWeatherAPIProvider)
-		setupRenderer   func(renderer *mock.MockTemplateRenderer)
 	}{
 		"city_not_found": {
 			city:      "Tokyo",
@@ -33,12 +32,8 @@ func TestCurrentWeather(t *testing.T) {
 		},
 		"successful_result": {
 			city: "London",
-			wait: "{Location:London, United Kingdom " +
-				"Icon:https://cdn.weatherapi.com/weather/64x64/day/113.png " +
-				"Condition:Sunny " +
-				"Temperature:18 " +
-				"Humidity:45 " +
-				"WindSpeed:4}",
+			wait: "London, United Kingdom Sunny 18 45 4 " +
+				"https://cdn.weatherapi.com/weather/64x64/day/113.png",
 			setupWeatherAPI: func(weatherAPI *mock.MockWeatherAPIProvider) {
 				weatherAPI.EXPECT().
 					Current(context.Background(), "London").
@@ -49,7 +44,7 @@ func TestCurrentWeather(t *testing.T) {
 						},
 						Current: models.Current{
 							TempC:    18.4,
-							WindKph:  4,
+							WindKph:  4.2,
 							Humidity: 45,
 							Condition: models.Condition{
 								Text: "Sunny",
@@ -58,22 +53,17 @@ func TestCurrentWeather(t *testing.T) {
 						},
 					}, nil)
 			},
-			setupRenderer: func(renderer *mock.MockTemplateRenderer) {
-				renderer.EXPECT().
-					ExecuteTemplate(gomock.Any(), "weather.html", gomock.Any()).
-					Do(func(wr io.Writer, _ string, data any) {
-						if wr != nil {
-							wr.Write(fmt.Appendf([]byte{}, "%+v", data))
-						}
-					})
-			},
 		},
 	}
 
+	renderer, err := template.New("weather.html").Parse(
+		"{{ .Location }} {{ .Condition }} {{ .Temperature }} " +
+			"{{ .Humidity }} {{ .WindSpeed }} {{ .Icon }}")
+	require.NoError(t, err)
+
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	renderer := mock.NewMockTemplateRenderer(ctrl)
 	weatherAPI := mock.NewMockWeatherAPIProvider(ctrl)
 
 	svc := New(renderer, weatherAPI)
@@ -84,10 +74,6 @@ func TestCurrentWeather(t *testing.T) {
 				tc.setupWeatherAPI(weatherAPI)
 			}
 
-			if tc.setupRenderer != nil {
-				tc.setupRenderer(renderer)
-			}
-
 			data, err := svc.Weather().Current(context.Background(), tc.city)
 			if err != nil {
 				assert.EqualError(t, err, tc.errString)

internal/server/services/services.go

@@ -2,15 +2,10 @@ package services
 
 import (
 	"context"
-	"io"
 
 	"github.com/TuanKiri/weather-mcp-server/pkg/weatherapi/models"
 )
 
-type TemplateRenderer interface {
-	ExecuteTemplate(wr io.Writer, name string, data any) error
-}
-
 type WeatherAPIProvider interface {
 	Current(ctx context.Context, city string) (*models.CurrentResponse, error)
 }