refactor: renamed currency conversion code field names

achannarasappa · Aug 21, 2021 · 85d2ce2 · 85d2ce2
1 parent bb3804c
commit 85d2ce2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/internal/adapter/yahoo/yahoo.go b/internal/adapter/yahoo/yahoo.go
@@ -65,7 +65,7 @@ func transformResponseQuote(responseQuote ResponseQuote) c.AssetQuote {
 		Symbol: responseQuote.Symbol,
 		Class:  assetClass,
 		Currency: c.Currency{
-			Code: responseQuote.Currency,
+			FromCurrencyCode: responseQuote.Currency,
 		},
 		QuotePrice: c.QuotePrice{
 			Price:          responseQuote.RegularMarketPrice,

diff --git a/internal/asset/asset.go b/internal/asset/asset.go
@@ -1,7 +1,6 @@
 package asset
 
 import (
-	q "github.com/achannarasappa/ticker/internal/adapter/yahoo"
 	c "github.com/achannarasappa/ticker/internal/common"
 	"github.com/achannarasappa/ticker/internal/currency"
 )
@@ -21,18 +20,15 @@ type HoldingSummary struct {
 	DayChange   c.HoldingChange
 }
 
-func GetAssets(dep c.Dependencies, ctx c.Context) ([]c.Asset, HoldingSummary) {
+func GetAssets(ctx c.Context, assetQuotes []c.AssetQuote) ([]c.Asset, HoldingSummary) {
 
 	var holdingSummary HoldingSummary
 	assets := getAssetsFixed(ctx)
-	symbols := getSymbols(ctx.Config)
-	assetQuotes := q.GetAssetQuotes(*dep.HttpClient, symbols)
 	lotsBySymbol := getLots(ctx.Config.Lots)
 
 	for i, assetQuote := range assetQuotes {
 
-		currencyRateByUse := currency.GetCurrencyRateFromContext(ctx, assetQuote.Currency.Code)
-		currencyCode := currencyRateByUse.ToCurrencyCode
+		currencyRateByUse := currency.GetCurrencyRateFromContext(ctx, assetQuote.Currency.FromCurrencyCode)
 
 		holding := getHolding(assetQuote, lotsBySymbol)
 		holdingSummary = addHoldingToHoldingSummary(holdingSummary, holding, currencyRateByUse)
@@ -42,8 +38,8 @@ func GetAssets(dep c.Dependencies, ctx c.Context) ([]c.Asset, HoldingSummary) {
 			Symbol: assetQuote.Symbol,
 			Class:  assetQuote.Class,
 			Currency: c.Currency{
-				Code:          assetQuote.Currency.Code,
-				CodeConverted: currencyCode,
+				FromCurrencyCode: assetQuote.Currency.FromCurrencyCode,
+				ToCurrencyCode:   currencyRateByUse.ToCurrencyCode,
 			},
 			Holding:       convertAssetHoldingCurrency(currencyRateByUse, holding),
 			QuotePrice:    convertAssetQuotePriceCurrency(currencyRateByUse, assetQuote.QuotePrice),
@@ -133,7 +129,8 @@ func getHolding(assetQuote c.AssetQuote, lotsBySymbol map[string]AggregatedLot)
 
 }
 
-func getSymbols(config c.Config) []string {
+// GetSymbols retrieves a unique slice of symbols from the watchlist and lots sections of the config
+func GetSymbols(config c.Config) []string {
 
 	symbols := make(map[string]bool)
 	symbolsUnique := make([]string, 0)

diff --git a/internal/asset/assetFixed.go b/internal/asset/assetFixed.go
@@ -28,7 +28,7 @@ func getAssetsFixed(ctx c.Context) []c.Asset {
 		return []c.Asset{}
 	}
 
-	// Add currency convert
+	// TODO: Add currency convert
 	assetsFixed := make([]c.Asset, 0)
 
 	for _, configHolding := range ctx.Config.Holdings {
@@ -43,8 +43,8 @@ func getAssetsFixed(ctx c.Context) []c.Asset {
 			Symbol: configHolding.Symbol,
 			Class:  getAssetFixedClass(configHolding.Class),
 			Currency: c.Currency{
-				Code:          configHolding.Currency,
-				CodeConverted: currencyCode,
+				FromCurrencyCode: configHolding.Currency,
+				ToCurrencyCode:   currencyCode,
 			},
 			Holding: c.Holding{
 				Value:     value,

diff --git a/internal/common/common.go b/internal/common/common.go
@@ -119,9 +119,9 @@ type Holding struct {
 // Currency is the original and converted currency if applicable
 type Currency struct {
 	// Code is the original currency code of the asset
-	Code string
+	FromCurrencyCode string
 	// CodeConverted is the currency code that pricing and values have been converted into
-	CodeConverted string
+	ToCurrencyCode string
 }
 
 type QuotePrice struct {