finalize go types and CurrentWeatherFromCity function

Author: lossycache

openweathermap.go

@@ -1,81 +1,137 @@
 package openweathermap
 
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"time"
+	"io/ioutil"
+	"encoding/json"
+)
+
 /*
 Define API response fields
  */
 type OpenWeatherMap struct {
 	API_KEY string
 }
 
-type coord struct {
-	lon int
-	lat int
+type City struct {
+	Id int `json:"id"`
+	Name string `json:"name"`
+}
+
+type Coord struct {
+	Lon float64 `json:"lon"`
+	Lat float64 `json:"lat"`
 }
 
-type weather struct {
-	id int
-	main string
-	description string
+type Weather struct {
+	Id int `json:"id"`
+	Main string `json:"main"`
+	Description string `json:"description"`
 }
 
-type wind struct {
-	speed float64
-	deg float64
+type Wind struct {
+	Speed float64 `json:"speed"`
+	Deg float64 `json:"deg"`
 }
 
-type clouds struct {
-	all int
+type Clouds struct {
+	All int `json:"all"`
 }
 
-type rain struct {
-	threehr int `json:"3h"`
+type Rain struct {
+	Threehr int `json:"3h"`
 }
 
-type visibility string
+type Visibility string
+
+type Dt int
+
+type Id int
+
+type Name string
 
-type dt int
+type Country string
 
-type id int
+type Main struct {
+	Temp float64 `json:"temp"`
+	Pressure int `json:"pressure"`
+	Humidity int `json:"humidity"`
+	Temp_min float64 `json:"temp_min"`
+	Temp_max float64 `json:"temp_max"`
+}
+
+/*
+Define API response objects (compose of the above fields)
+ */
 
-type name string
+type CurrentWeatherResponse struct {
+	Coord `json:"coord"`
+	Weather []Weather `json:"weather"`
+	Main `json:"main"`
+	Wind `json:"wind"`
+	Rain `json:"rain"`
+	Clouds `json:"clouds"`
+	Dt `json:"dt"`
+	Id `json:"id"`
+	Name `json:"name"`
+}
 
-type main struct {
-	temp float64
-	pressure int
-	humidity int
-	temp_min float64
-	temp_max float64
+type ForecastResponse struct {
+	City `json:"city"`
+	Coord `json:"coord"`
+	Country `json:"country"`
+	List [] struct {
+		Dt `json:"dt"`
+		Main `json:"main"`
+		Weather `json:"weather"`
+		Clouds `json:"clouds"`
+		Wind `json:"wind"`
+	} `json:"list"`
 }
 
-type forecastResponse struct {
-	city struct {
-		id int
-		name string
+const (
+	API_URL string = "api.openweathermap.org"
+)
+
+func (owm *OpenWeatherMap) CurrentWeatherFromCity(city string) (*CurrentWeatherResponse, error) {
+	if (owm.API_KEY == "") {
+		// No API keys present, return error
+		return nil, errors.New("No API keys present")
 	}
-	coord
-
-	country string
-	cnt int
-	list [] struct {
-		dt string
-		main struct {
-			temp float64
-			temp_min float64
-			temp_max float64
-			humidity float64
-		}
-		weather []weather
-
-		clouds struct {
-			all int
-		}
-		wind struct {
-			speed float64
-			deg float64
-		}
+	url := fmt.Sprintf("http://%s/data/2.5/weather?q=%s&units=imperial&APPID=%s", API_URL, city, owm.API_KEY)
+
+	// Build an http client so we can have control over timeout
+	client := &http.Client{
+		Timeout: time.Second * 2,
 	}
-}
 
-func (owm *OpenWeatherMap) currentWeather() {
+	res, getErr := client.Get(url)
+	if getErr != nil {
+		return nil, getErr
+	}
+
+	// defer the closing of the res body
+	defer res.Body.Close()
+
+	// read the http response body into a byte stream
+	body, readErr := ioutil.ReadAll(res.Body)
+	if readErr != nil {
+		return nil, readErr
+	}
 
+	fmt.Println(string(body))
+
+	var cwr CurrentWeatherResponse
+
+	// unmarshal the byte stream into a Go data type
+	jsonErr := json.Unmarshal(body, &cwr)
+	if jsonErr != nil {
+		return nil, jsonErr
+	}
+
+	return &cwr, nil
 }
+