fix: pass context

Jesse0Michael · Dec 14, 2022 · e41c904 · e41c904
1 parent e2d13a4
commit e41c904
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/internal/server/feed.go b/internal/server/feed.go
@@ -17,7 +17,7 @@ func (s *Server) feed() http.HandlerFunc {
 			return
 		}
 
-		feed, err := s.fetcher.Feeds(req)
+		feed, err := s.fetcher.Feeds(r.Context(), req)
 		if err != nil {
 			s.log.WithError(err).Error("failed to get feed")
 			writeError(w, http.StatusInternalServerError, err)

diff --git a/internal/server/feed_test.go b/internal/server/feed_test.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/http"
@@ -19,7 +20,7 @@ type MockFetcher struct {
 	err      error
 }
 
-func (m *MockFetcher) Feeds(req service.FetcherRequest) (*service.FeedItems, error) {
+func (m *MockFetcher) Feeds(ctx context.Context, req service.FetcherRequest) (*service.FeedItems, error) {
 	if req != m.expected {
 		return nil, fmt.Errorf("unexpected req")
 	}

diff --git a/internal/server/server.go b/internal/server/server.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 
@@ -11,7 +12,7 @@ import (
 )
 
 type Fetcher interface {
-	Feeds(service.FetcherRequest) (*service.FeedItems, error)
+	Feeds(ctx context.Context, req service.FetcherRequest) (*service.FeedItems, error)
 }
 
 type Config struct {

diff --git a/internal/service/fetcher.go b/internal/service/fetcher.go
@@ -1,6 +1,7 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"strconv"
@@ -20,6 +21,10 @@ import (
 	"github.com/tidwall/gjson"
 )
 
+type Feeder interface {
+	Feed(ctx context.Context, id string) ([]FeedItem, error)
+}
+
 type FetcherRequest struct {
 	TwitterID    string `query:"twitterID"`
 	InstagramID  string `query:"instagramID"`
@@ -53,8 +58,8 @@ func NewFetcher(log *logrus.Entry, cfg Config, twitterClient *twitter.Client, in
 	}
 }
 
-// GetFeed - Get feed
-func (f *Fetcher) Feeds(req FetcherRequest) (*FeedItems, error) {
+// Feeds retrieves the feed items based on the request parameters
+func (f *Fetcher) Feeds(ctx context.Context, req FetcherRequest) (*FeedItems, error) {
 	items := []FeedItem{}
 	var wg sync.WaitGroup