Merge pull request #14 from polarsquad/Helpers

Helpers

helpers.go

@@ -0,0 +1,40 @@
+package harvest
+
+import (
+	"io/ioutil"
+	"net/http"
+	"net/url"
+
+	"github.com/google/go-querystring/query"
+)
+
+func addParamsToURL(baseURL string, opt interface{}) (string, error) {
+	url, err := url.Parse(baseURL)
+	if err != nil {
+		return baseURL, err
+	}
+
+	vs, err := query.Values(opt)
+	if err != nil {
+		return baseURL, err
+	}
+
+	url.RawQuery = vs.Encode()
+	return url.String(), nil
+}
+
+func (h *Harvest) getURL(method string, url string) ([]byte, error) {
+	Client := &http.Client{}
+
+	req, _ := http.NewRequest("GET", url, nil)
+	req.Header.Set("User-Agent", "Harvest Slack Bot")
+	req.Header.Set("Harvest-Account-ID", h.API.AccountID)
+	req.Header.Set("Authorization", "Bearer "+h.API.AuthToken)
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := Client.Do(req)
+	body, err := ioutil.ReadAll(resp.Body)
+	defer resp.Body.Close()
+
+	return body, err
+}

main.go

@@ -10,6 +10,16 @@ import (
 // VERSION v0.0.2
 const VERSION = "v0.0.2"
 
+// Harvest API URLs
+const (
+	timeEntriesURL   string = "https://api.harvestapp.com/v2/time_entries"
+	timeEntryByIDURL string = "https://api.harvestapp.com/v2/time_entries/"
+	userMeURL        string = "https://api.harvestapp.com/v2/users/me"
+	usersURL         string = "https://api.harvestapp.com/v2/users"
+	userByIDURL      string = "https://api.harvestapp.com/v2/users/"
+	projectsURL      string = "https://api.harvestapp.com/v2/projects"
+)
+
 // Harvest creates the struct for the API, User and Entries
 type Harvest struct {
 	API         *structs.API

time_entries.go

@@ -5,70 +5,12 @@ import (
 	"log"
 
 	"encoding/json"
-	"io/ioutil"
-	"net/http"
-	"net/url"
 	"time"
 
-	"github.com/google/go-querystring/query"
+	// "github.com/google/go-querystring/query"
 	"github.com/polarsquad/harvest/structs"
 )
 
-func addParamsToURL(baseURL string, opt interface{}) (string, error) { //TODO: Move to helpers.go
-	url, err := url.Parse(baseURL)
-	if err != nil {
-		return baseURL, err
-	}
-
-	vs, err := query.Values(opt)
-	if err != nil {
-		return baseURL, err
-	}
-
-	url.RawQuery = vs.Encode()
-	return url.String(), nil
-}
-
-// func (h *Harvest) getURL(method string, url string) ([]byte, error) {
-// 	Client := &http.Client{}
-
-// 	req, _ := http.NewRequest("GET", url, nil)
-// 	req.Header.Set("User-Agent", "Harvest Slack Bot")
-// 	req.Header.Set("Harvest-Account-ID", h.API.AccountID)
-// 	req.Header.Set("Authorization", "Bearer "+h.API.AuthToken)
-// 	req.Header.Set("Content-Type", "application/json")
-
-// 	resp, err := Client.Do(req)
-// 	body, err := ioutil.ReadAll(resp.Body)
-// 	defer resp.Body.Close()
-
-// 	// var jsonResponse map[string]interface{}
-
-// 	// json.Unmarshal(body, &jsonResponse)
-
-// 	return body, err
-// }
-
-func (h *Harvest) getURL(method string, url string) ([]byte, error) { //TODO: Move to heplers.go
-	Client := &http.Client{}
-
-	req, _ := http.NewRequest("GET", url, nil)
-	req.Header.Set("User-Agent", "Harvest Slack Bot")
-	req.Header.Set("Harvest-Account-ID", h.API.AccountID)
-	req.Header.Set("Authorization", "Bearer "+h.API.AuthToken)
-	req.Header.Set("Content-Type", "application/json")
-
-	resp, err := Client.Do(req)
-	body, err := ioutil.ReadAll(resp.Body)
-	defer resp.Body.Close()
-
-	// var jsonResponse map[string]interface{}
-
-	// json.Unmarshal(body, &jsonResponse)
-
-	return body, err
-}
-
 // GetEntries fetches all the TimeEntries with the provided timespan.
 // If from and/or to dates are not defined, it will fetch all the TimeEntries.
 //
@@ -77,9 +19,6 @@ func (h *Harvest) getURL(method string, url string) ([]byte, error) { //TODO: Mo
 // to: time.Time with format "2006-01-02"
 // u: User, specifies which users TimeEntries are fetched.
 func (h *Harvest) GetEntries(from time.Time, to time.Time, u User) *TimeEntries {
-	// Start with fetching the entries
-	url := "https://api.harvestapp.com/v2/time_entries"
-
 	// Let's build the URL with parameters.
 	params := GetTimeEntriesParams{
 		UserID:  int64(u.ID),
@@ -89,7 +28,7 @@ func (h *Harvest) GetEntries(from time.Time, to time.Time, u User) *TimeEntries
 		To: to.Format("2006-01-02"),
 	}
 
-	urlWithParams, _ := addParamsToURL(url, &params)
+	urlWithParams, _ := addParamsToURL(timeEntriesURL, &params)
 	body, err := h.getURL("GET", urlWithParams)
 	if err != nil {
 		log.Fatalln(err.Error())