fix: user sorting

Author: achannarasappa

internal/asset/asset.go

@@ -1,6 +1,8 @@
 package asset
 
 import (
+	"strings"
+
 	c "github.com/achannarasappa/ticker/v4/internal/common"
 )
 
@@ -26,8 +28,21 @@ func GetAssets(ctx c.Context, assetGroupQuote c.AssetGroupQuote) ([]c.Asset, Hol
 	var holdingSummary HoldingSummary
 	assets := make([]c.Asset, 0)
 	holdingsBySymbol := getLots(assetGroupQuote.AssetGroup.ConfigAssetGroup.Holdings)
+	orderIndex := make(map[string]int)
+
+	for i, symbol := range assetGroupQuote.AssetGroup.ConfigAssetGroup.Watchlist {
+		if _, exists := orderIndex[symbol]; !exists {
+			orderIndex[strings.ToLower(symbol)] = i
+		}
+	}
+
+	for i, symbol := range assetGroupQuote.AssetGroup.ConfigAssetGroup.Holdings {
+		if _, exists := orderIndex[symbol.Symbol]; !exists {
+			orderIndex[strings.ToLower(symbol.Symbol)] = i + len(assetGroupQuote.AssetGroup.ConfigAssetGroup.Watchlist) - 1
+		}
+	}
 
-	for i, assetQuote := range assetGroupQuote.AssetQuotes {
+	for _, assetQuote := range assetGroupQuote.AssetQuotes {
 
 		currencyRateByUse := getCurrencyRateByUse(ctx, assetQuote.Currency.FromCurrencyCode, assetQuote.Currency.ToCurrencyCode, assetQuote.Currency.Rate)
 
@@ -50,7 +65,7 @@ func GetAssets(ctx c.Context, assetGroupQuote c.AssetGroupQuote) ([]c.Asset, Hol
 			Exchange:      assetQuote.Exchange,
 			Meta: c.Meta{
 				IsVariablePrecision: assetQuote.Meta.IsVariablePrecision,
-				OrderIndex:          i,
+				OrderIndex:          orderIndex[strings.ToLower(assetQuote.Symbol)],
 			},
 		})
 

internal/sorter/sorter.go

@@ -23,31 +23,16 @@ func NewSorter(sort string) Sorter {
 	return sortByChange
 }
 
-func sortByUser(assetsIn []*c.Asset) []*c.Asset {
+func sortByUser(assets []*c.Asset) []*c.Asset {
 
-	assetCount := len(assetsIn)
+	assetCount := len(assets)
 
 	if assetCount <= 0 {
-		return assetsIn
+		return assets
 	}
 
-	assets := make([]*c.Asset, assetCount)
-	copy(assets, assetsIn)
-
 	sort.SliceStable(assets, func(i, j int) bool {
-
-		prevIndex := assetCount
-		nextIndex := assetCount
-
-		if assets[i].Holding != (c.Holding{}) {
-			prevIndex = assets[i].Meta.OrderIndex
-		}
-
-		if assets[j].Holding != (c.Holding{}) {
-			nextIndex = assets[j].Meta.OrderIndex
-		}
-
-		return nextIndex > prevIndex
+		return assets[j].Meta.OrderIndex > assets[i].Meta.OrderIndex
 	})
 
 	return assets

internal/sorter/sorter_test.go

@@ -44,6 +44,9 @@ var _ = Describe("Sorter", func() {
 				IsActive:                true,
 				IsRegularTradingSession: false,
 			},
+			Meta: c.Meta{
+				OrderIndex: 2,
+			},
 		}
 		googleQuote := c.Asset{
 			Symbol: "GOOG",
@@ -76,6 +79,9 @@ var _ = Describe("Sorter", func() {
 				IsActive:                false,
 				IsRegularTradingSession: false,
 			},
+			Meta: c.Meta{
+				OrderIndex: 3,
+			},
 		}
 		rblxQuote := c.Asset{
 			Symbol: "RBLX",
@@ -89,6 +95,9 @@ var _ = Describe("Sorter", func() {
 				IsActive:                false,
 				IsRegularTradingSession: false,
 			},
+			Meta: c.Meta{
+				OrderIndex: 4,
+			},
 		}
 		assets := []*c.Asset{
 			&bitcoinQuote,