Reorganize data-fetching code / add tests

Makefile

@@ -0,0 +1,9 @@
+run:
+	go run main.go
+
+test:
+	go test ./...
+
+fmt:
+	find . -type f -name '*.go' | xargs gofmt -w
+

data/data.go

@@ -3,78 +3,34 @@ package data
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"sort"
 	"sync"
 	"time"
 )
 
-const apiTemplate = "https://api.meetup.com/%s/events?status=upcoming"
-
-var (
-	meetupNames = []string{
-		"Boulder-Gophers",
-		"Denver-Go-Language-User-Group",
-		"Denver-Go-Programming-Language-Meetup",
-	}
-)
-
-// Store contains data for the site.
-type Store struct {
-	pollingInterval time.Duration
-
-	mu             sync.Mutex
-	meetupSchedule *MeetupSchedule
+type Client interface {
+	Get(string) ([]byte, error)
 }
 
-// NewStore creates a new store initialized with a polling interval.
-func NewStore(i time.Duration) *Store {
-	return &Store{
-		pollingInterval: i,
-	}
-}
+type MeetupClient struct{}
 
-// Poll runs forever, polling the meetup API for event data and updating the
-// internal cache.
-func (s *Store) Poll() {
-	for {
-		events := s.poll()
-		s.updateCache(events)
-		time.Sleep(s.pollingInterval)
+func (c MeetupClient) Get(url string) (data []byte, err error) {
+	resp, err := http.Get(url)
+
+	if err != nil {
+		return data, err
 	}
-}
 
-func (s *Store) updateCache(schedule *MeetupSchedule) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.meetupSchedule = schedule
-}
+	defer resp.Body.Close()
 
-func (s *Store) poll() *MeetupSchedule {
-	schedule := NewMeetupSchedule()
-	for _, meetup := range meetupNames {
-		eds, err := events(meetup)
-		if err != nil {
-			log.Printf("error fetching events for %s: %s", meetup, err)
-			continue
-		}
-		sort.Slice(eds, func(i, j int) bool {
-			return eds[i].Time < eds[j].Time
-		})
-		schedule.Add(meetup, eds)
-	}
-	return schedule
-}
+	data, err = ioutil.ReadAll(resp.Body)
 
-// AllEvents returns the current meetup events in CO.
-func (s *Store) AllEvents() *MeetupSchedule {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return s.meetupSchedule
+	return data, err
 }
 
-// Event contains information about a meetup event.
 type Event struct {
 	ID   string `json:"id"`
 	Name string `json:"name"`
@@ -86,52 +42,86 @@ func (e Event) HumanTime() string {
 	return time.Unix(e.Time/1000, 0).Format(time.RFC1123)
 }
 
-func NewMeetupSchedule() *MeetupSchedule {
-	return &MeetupSchedule{
-		events: make(map[string][]Event),
-	}
-}
+type Schedule struct {
+	key string
 
-type MeetupSchedule struct {
-	events map[string][]Event
+	Label  string
+	Events []Event
 }
 
-func (m *MeetupSchedule) Add(name string, events []Event) {
-	m.events[name] = events
-}
+type Schedules []*Schedule
+
+func (s *Schedule) FetchEvents(client Client) (err error) {
+	url := fmt.Sprintf("https://api.meetup.com/%s/events?status=upcoming", s.key)
+
+	data, err := client.Get(url)
 
-func (m *MeetupSchedule) BoulderEvents() []Event {
-	return nextThree(m.events["Boulder-Gophers"])
+	if err != nil {
+		return err
+	}
+
+	err = json.Unmarshal(data, &s.Events)
+
+	if err != nil {
+		return err
+	}
+
+	sort.SliceStable(s.Events, func(i, j int) bool {
+		return s.Events[i].Time < s.Events[j].Time
+	})
+
+	return err
 }
 
-func (m *MeetupSchedule) DenverEvents() []Event {
-	return nextThree(m.events["Denver-Go-Language-User-Group"])
+func (s *Schedule) Next(count int) []Event {
+	if len(s.Events) > count {
+		return s.Events[0:count]
+	}
+
+	return s.Events
 }
 
-func (m *MeetupSchedule) DTCEvents() []Event {
-	return nextThree(m.events["Denver-Go-Programming-Language-Meetup"])
+// Store contains data for the site.
+type Store struct {
+	pollingInterval time.Duration
+	mu              sync.Mutex
+
+	Schedules Schedules
 }
 
-func nextThree(events []Event) []Event {
-	if len(events) < 3 {
-		return events
+// NewStore creates a new store initialized with a polling interval.
+func NewStore(i time.Duration) *Store {
+	return &Store{
+		pollingInterval: i,
+		Schedules: Schedules{
+			&Schedule{key: "Boulder-Gophers", Label: "Boulder"},
+			&Schedule{key: "Denver-Go-Language-User-Group", Label: "Denver"},
+			&Schedule{key: "Denver-Go-Programming-Language-Meetup", Label: "Denver Tech Center"},
+		},
 	}
-
-	return events[0:3]
 }
 
-func events(name string) ([]Event, error) {
-	resp, err := http.Get(fmt.Sprintf(apiTemplate, name))
-	if err != nil {
-		log.Fatal(err)
+// Poll runs forever, polling the meetup API for event data and updating the
+// internal cache.
+func (s *Store) Poll() {
+	for {
+		s.mu.Lock()
+		defer s.mu.Unlock()
+		s.refresh()
+
+		time.Sleep(s.pollingInterval)
 	}
-	defer resp.Body.Close()
+}
 
-	decoder := json.NewDecoder(resp.Body)
-	var data []Event
-	err = decoder.Decode(&data)
-	if err != nil {
-		return nil, err
+func (s *Store) refresh() {
+	client := MeetupClient{}
+
+	for _, s := range s.Schedules {
+		err := s.FetchEvents(client)
+
+		if err != nil {
+			log.Printf("error fetching events for %s: %s", s.key, err)
+			continue
+		}
 	}
-	return data, nil
 }

data/data_test.go

@@ -0,0 +1,132 @@
+package data
+
+import (
+	"errors"
+	"reflect"
+	"testing"
+)
+
+type TestClient struct {
+	*MeetupClient
+
+	data []byte
+	err  error
+}
+
+func NewClient(data string, err error) TestClient {
+	return TestClient{
+		data: []byte(data),
+		err:  err,
+	}
+}
+
+func (c TestClient) Get(key string) ([]byte, error) {
+	if c.err != nil {
+		return []byte{}, c.err
+	}
+
+	return c.data, c.err
+}
+
+func TestScheduleHasNoEvents(t *testing.T) {
+	s := Schedule{}
+	if len(s.Events) != 0 {
+		t.Fail()
+	}
+}
+
+func TestFetchEventsStoresEvents(t *testing.T) {
+	s := Schedule{key: "Boulder-Gophers"}
+
+	c := NewClient(`[{"id":"id","name":"Event","time":400}]`, nil)
+
+	s.FetchEvents(c)
+
+	expected := []Event{Event{ID: "id", Name: "Event", Time: 400}}
+
+	if !reflect.DeepEqual(s.Events, expected) {
+		t.Fail()
+	}
+}
+
+func TestFetchEventsReturnsErrorWhenRequestFails(t *testing.T) {
+	s := Schedule{key: "Boulder-Gophers"}
+	c := NewClient(``, errors.New("Failed to connect"))
+
+	err := s.FetchEvents(c)
+
+	if err == nil {
+		t.Fail()
+	}
+}
+
+func TestFetchEventsReturnsErrorWhenUnmarshalFails(t *testing.T) {
+	s := Schedule{key: "Boulder-Gophers"}
+	c := NewClient(`<>`, nil)
+
+	err := s.FetchEvents(c)
+
+	if err == nil {
+		t.Fail()
+	}
+}
+
+func TestFetchEventsReturnsEventsInOrderOfTime(t *testing.T) {
+	s := Schedule{key: "Boulder-Gophers"}
+	c := NewClient(`
+		[
+			{"id":"two","name":"Two","time":2},
+			{"id":"one","name":"One","time":1}
+		]
+	`, nil)
+
+	s.FetchEvents(c)
+
+	expected := []Event{
+		Event{ID: "one", Name: "One", Time: 1},
+		Event{ID: "two", Name: "Two", Time: 2},
+	}
+
+	if !reflect.DeepEqual(s.Events, expected) {
+		t.Fail()
+	}
+}
+
+func TestNextReturnsSubsetOfEvents(t *testing.T) {
+	s := Schedule{Events: []Event{
+		Event{ID: "one", Name: "One", Time: 1},
+		Event{ID: "two", Name: "Two", Time: 2},
+		Event{ID: "three", Name: "Three", Time: 3},
+	}}
+
+	expected := []Event{
+		Event{ID: "one", Name: "One", Time: 1},
+		Event{ID: "two", Name: "Two", Time: 2},
+	}
+
+	if !reflect.DeepEqual(s.Next(2), expected) {
+		t.Fail()
+	}
+}
+
+func TestNextReturnsAllWhenLimitGreaterThanLen(t *testing.T) {
+	s := Schedule{Events: []Event{
+		Event{ID: "one", Name: "One", Time: 1},
+	}}
+
+	expected := []Event{
+		Event{ID: "one", Name: "One", Time: 1},
+	}
+
+	if !reflect.DeepEqual(s.Next(2), expected) {
+		t.Fail()
+	}
+}
+
+func TestHumanTimeReturnsTimeInProperFormat(t *testing.T) {
+	e := Event{Time: 1533121600000}
+
+	if e.HumanTime() != "Wed, 01 Aug 2018 05:06:40 MDT" {
+		t.Fail()
+	}
+}

server/server.go

@@ -8,11 +8,11 @@ import (
 	"github.com/milehighgophers/website/ui"
 )
 
-type Store interface {
-	AllEvents() *data.MeetupSchedule
-}
+// type Store interface {
+// 	AllEvents() *data.MeetupSchedule
+// }
 
-func Start(addr string, s Store) error {
+func Start(addr string, s *data.Store) error {
 	log.Printf("listening on %s", addr)
 
 	mux := http.NewServeMux()
@@ -22,17 +22,18 @@ func Start(addr string, s Store) error {
 }
 
 type IndexHandler struct {
-	store Store
+	store data.Store
 }
 
-func NewIndexHandler(s Store) *IndexHandler {
+func NewIndexHandler(s *data.Store) *IndexHandler {
 	return &IndexHandler{
-		store: s,
+		store: *s,
 	}
 }
 
 func (h *IndexHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
-	html := ui.Render(h.store.AllEvents())
+	html := ui.Render(h.store.Schedules)
+
 	_, err := rw.Write(html)
 	if err != nil {
 		log.Print("error occured with /:", err)