feat: added sync call for getting quotes from all monitors

Author: achannarasappa

internal/monitor/monitor.go

@@ -7,8 +7,6 @@ import (
 	c "github.com/achannarasappa/ticker/v4/internal/common"
 	monitorCoinbase "github.com/achannarasappa/ticker/v4/internal/monitor/coinbase"
 	monitorYahoo "github.com/achannarasappa/ticker/v4/internal/monitor/yahoo"
-	"github.com/go-resty/resty/v2"
-	"github.com/gorilla/websocket"
 )
 
 // Monitor represents an overall monitor which manages API specific monitors
@@ -19,10 +17,8 @@ type Monitor struct {
 
 // ConfigMonitor represents the configuration for the main monitor
 type ConfigMonitor struct {
-	ClientHttp      *resty.Client
-	ClientWebsocket *websocket.Conn
-	Reference       c.Reference
-	Config          c.Config
+	Reference c.Reference
+	Config    c.Config
 }
 
 // ConfigUpdateFns represents the callback functions for when asset quotes are updated
@@ -93,14 +89,27 @@ func (m *Monitor) SetOnUpdate(config ConfigUpdateFns) error {
 	return nil
 }
 
-// GetMonitor returns the monitor for a given source
-func (m *Monitor) GetMonitor(source c.QuoteSource) c.Monitor {
-	return m.monitors[source]
-}
-
 // Start starts all monitors
 func (m *Monitor) Start() {
 	for _, monitor := range m.monitors {
 		monitor.Start()
 	}
 }
+
+// GetAssetGroupQuote synchronously gets price quotes a group of assets across all sources
+func (m *Monitor) GetAssetGroupQuote(assetGroup c.AssetGroup) c.AssetGroupQuote {
+
+	assetQuotesFromAllSources := make([]c.AssetQuote, 0)
+
+	for _, symbolBySource := range assetGroup.SymbolsBySource {
+
+		assetQuotes, _ := m.monitors[symbolBySource.Source].GetAssetQuotes(true)
+		assetQuotesFromAllSources = append(assetQuotesFromAllSources, assetQuotes...)
+
+	}
+
+	return c.AssetGroupQuote{
+		AssetQuotes: assetQuotesFromAllSources,
+		AssetGroup:  assetGroup,
+	}
+}

internal/print/print.go

@@ -9,7 +9,6 @@ import (
 	"github.com/achannarasappa/ticker/v4/internal/asset"
 	c "github.com/achannarasappa/ticker/v4/internal/common"
 	mon "github.com/achannarasappa/ticker/v4/internal/monitor"
-	quote "github.com/achannarasappa/ticker/v4/internal/quote"
 	"github.com/achannarasappa/ticker/v4/internal/ui/util"
 
 	"github.com/spf13/cobra"
@@ -143,11 +142,10 @@ func Run(dep *c.Dependencies, ctx *c.Context, options *Options) func(*cobra.Comm
 	return func(_ *cobra.Command, _ []string) {
 
 		monitors, _ := mon.NewMonitor(mon.ConfigMonitor{
-			ClientHttp: dep.HttpClients.Default,
-			Config:     ctx.Config,
-			Reference:  ctx.Reference,
+			Config:    ctx.Config,
+			Reference: ctx.Reference,
 		})
-		assetGroupQuote := quote.GetAssetGroupQuote(monitors, dep)(ctx.Groups[0])
+		assetGroupQuote := monitors.GetAssetGroupQuote(ctx.Groups[0])
 		assets, _ := asset.GetAssets(*ctx, assetGroupQuote)
 
 		if options.Format == "csv" {
@@ -165,11 +163,10 @@ func RunSummary(dep *c.Dependencies, ctx *c.Context, options *Options) func(cmd
 	return func(_ *cobra.Command, _ []string) {
 
 		monitors, _ := mon.NewMonitor(mon.ConfigMonitor{
-			ClientHttp: dep.HttpClients.Default,
-			Config:     ctx.Config,
-			Reference:  ctx.Reference,
+			Config:    ctx.Config,
+			Reference: ctx.Reference,
 		})
-		assetGroupQuote := quote.GetAssetGroupQuote(monitors, dep)(ctx.Groups[0])
+		assetGroupQuote := monitors.GetAssetGroupQuote(ctx.Groups[0])
 		_, holdingSummary := asset.GetAssets(*ctx, assetGroupQuote)
 
 		if options.Format == "csv" {

internal/quote/quote.go

@@ -24,12 +24,6 @@ func getQuoteBySource(monitors *mon.Monitor, dep *c.Dependencies, symbolBySource
 		return quoteCoincap.GetAssetQuotes(*dep.HttpClients.Default, symbolBySource.Symbols)
 	}
 
-	if symbolBySource.Source == c.QuoteSourceCoinbase {
-		// (*monitors.Coinbase).SetSymbols(symbolBySource.Symbols) this will force a refresh
-		x, _ := monitors.GetMonitor(c.QuoteSourceCoinbase).GetAssetQuotes()
-		return x
-	}
-
 	return []c.AssetQuote{}
 }
 

internal/ui/start.go

@@ -11,9 +11,8 @@ func Start(dep *c.Dependencies, ctx *c.Context) func() error {
 	return func() error {
 
 		monitors, _ := mon.NewMonitor(mon.ConfigMonitor{
-			ClientHttp: dep.HttpClients.Default,
-			Reference:  ctx.Reference,
-			Config:     ctx.Config,
+			Reference: ctx.Reference,
+			Config:    ctx.Config,
 		})
 
 		p := tea.NewProgram(

internal/ui/ui.go

@@ -9,7 +9,6 @@ import (
 	"github.com/achannarasappa/ticker/v4/internal/asset"
 	c "github.com/achannarasappa/ticker/v4/internal/common"
 	mon "github.com/achannarasappa/ticker/v4/internal/monitor"
-	quote "github.com/achannarasappa/ticker/v4/internal/quote"
 	"github.com/achannarasappa/ticker/v4/internal/ui/component/summary"
 	"github.com/achannarasappa/ticker/v4/internal/ui/component/watchlist"
 
@@ -35,7 +34,6 @@ type Model struct {
 	ctx                c.Context
 	ready              bool
 	headerHeight       int
-	getQuotes          func(c.AssetGroup) c.AssetGroupQuote
 	nonce              int
 	requestInterval    int
 	assets             []c.Asset
@@ -80,7 +78,6 @@ func NewModel(dep c.Dependencies, ctx c.Context, monitors *mon.Monitor) *Model {
 		headerHeight:       getVerticalMargin(ctx.Config),
 		ready:              false,
 		requestInterval:    ctx.Config.RefreshInterval,
-		getQuotes:          quote.GetAssetGroupQuote(monitors, &dep),
 		nonce:              0,
 		assets:             make([]c.Asset, 0),
 		assetQuotes:        make([]c.AssetQuote, 0),
@@ -293,9 +290,9 @@ func getVerticalMargin(config c.Config) int {
 	return 0
 }
 
-// Send a new tick message with the nonce 100ms from now
+// Send a new tick message with the nonce 200ms from now
 func tick(nonce int) tea.Cmd {
-	return tea.Tick(time.Second/10, func(time.Time) tea.Msg {
+	return tea.Tick(time.Second/5, func(time.Time) tea.Msg {
 		return tickMsg{
 			nonce: nonce,
 		}