Added query paramters as options

Author: kashifkhan0771

client/config.go

@@ -0,0 +1,7 @@
+package client
+
+// WeatherAPIConfig has the configurations required to call the APIs
+type WeatherAPIConfig struct {
+	// XApiKey can be obtained from: https://www.weatherapi.com/ after you log in
+	XApiKey string `json:"key"`
+}

client/helper.go

@@ -0,0 +1,22 @@
+package client
+
+import "net/http"
+
+func (c *WeatherAPIConfig) makeRequest(method, url string) (*http.Response, error) {
+	client := &http.Client{}
+
+	req, err := http.NewRequest(method, url, http.NoBody)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Set("key", c.XApiKey)
+
+	// Send request
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	return resp, nil
+}

client/options.go

@@ -0,0 +1,11 @@
+package client
+
+/*
+Options represent the query parameters of the APIs.
+
+For more details about each query parameters, please visit: https://www.weatherapi.com/docs/
+*/
+type Options struct {
+	// Query parameter based on which data is sent back (Required)
+	Query string `json:"q"`
+}

client/weather-api.go

@@ -9,32 +9,19 @@ import (
 	"github.com/kashifkhan0771/go-weather/models"
 )
 
-type WeatherAPIConfig struct {
-	XApiKey string `json:"key"`
-}
-
-func (c *WeatherAPIConfig) GetCurrentWeather(query string) (*models.WeatherResponse, error) {
-	if query == "" {
+// GetCurrentWeather return current weather response based on the option query
+func (c *WeatherAPIConfig) GetCurrentWeather(options Options) (*models.WeatherResponse, error) {
+	if options.Query == "" {
 		return nil, fmt.Errorf("query is empty")
 	}
 
-	url := fmt.Sprintf("%s%s?q=%s", config.BaseURL, config.CurrentWeatherJSON, query)
+	url := fmt.Sprintf("%s%s?q=%s", config.BaseURL, config.CurrentWeatherJSON, options.Query)
 
-	// Create HTTP client
-	client := http.Client{}
-
-	req, err := http.NewRequest(http.MethodGet, url, http.NoBody)
+	resp, err := c.makeRequest(http.MethodGet, url)
 	if err != nil {
 		return nil, err
 	}
 
-	req.Header.Set("key", c.XApiKey)
-
-	// Send request
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
 	defer resp.Body.Close()
 
 	// Check response status code