From 53a6efa13eac75cff18697a458a969fa874852c6 Mon Sep 17 00:00:00 2001
From: Ryan Cavicchioni <ryan@cavi.cc>
Date: Sun, 28 Aug 2022 18:34:14 -0500
Subject: [PATCH] weather: Use variables for error messages

---
 lib/weather/weather.go | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/weather/weather.go b/lib/weather/weather.go
index 9a9d990..af4980d 100644
--- a/lib/weather/weather.go
+++ b/lib/weather/weather.go
@@ -2,6 +2,7 @@ package weather
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -22,7 +23,11 @@ const (
 )
 
 var (
-	EndpointWeather = lib.BuildURI(OpenWeatherMapURI, "/data/2.5/weather")
+	EndpointWeather        = lib.BuildURI(OpenWeatherMapURI, "/data/2.5/weather")
+	ErrUnmarshal           = errors.New("unmarshaling JSON failed")
+	ErrReadingResponse     = errors.New("reading HTTP response failed")
+	ErrRequestFailed       = errors.New("HTTP request failed")
+	ErrCreateRequestFailed = errors.New("failed to create new HTTP request")
 )
 
 func NewClient(token string) *WeatherClient {
@@ -30,13 +35,11 @@ func NewClient(token string) *WeatherClient {
 }
 
 func (c *WeatherClient) Get(loc string) (w Weather, err error) {
-	var (
-		werr WeatherError
-	)
+	var werr WeatherError
 
 	req, err := http.NewRequest("GET", EndpointWeather, nil)
 	if err != nil {
-		err = fmt.Errorf("failed to create new request: %s", err)
+		err = fmt.Errorf("%s: %s", ErrCreateRequestFailed, err)
 		return
 	}
 
@@ -47,22 +50,22 @@ func (c *WeatherClient) Get(loc string) (w Weather, err error) {
 
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		err = fmt.Errorf("HTTP request failed: %s", err)
+		err = fmt.Errorf("%s: %s", ErrRequestFailed, err)
 		return
 	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		err = fmt.Errorf("reading HTTP response failed: %s", err)
+		err = fmt.Errorf("%s: %s", ErrReadingResponse, err)
 		return
 	}
 
-	if resp.StatusCode != 200 {
+	if resp.StatusCode != http.StatusOK {
 		err = json.Unmarshal(body, &werr)
 		if err != nil {
 			log.Debugf("%s", body)
-			err = fmt.Errorf("unmarshaling JSON failed: %s", err)
+			err = fmt.Errorf("%s: %s", ErrUnmarshal, err)
 			return
 		}
 
@@ -73,7 +76,7 @@ func (c *WeatherClient) Get(loc string) (w Weather, err error) {
 	err = json.Unmarshal(body, &w)
 	if err != nil {
 		log.Debugf("%s", body)
-		log.Errorf("unmarshaling JSON failed: %s", err)
+		err = fmt.Errorf("%s: %s", ErrUnmarshal, err)
 		return
 	}