fix: user order regression

achannarasappa · achannarasappa · commit 3edbfa067c60 · 2025-09-08T21:02:20.000-04:00
diff --git a/internal/asset/asset.go b/internal/asset/asset.go
@@ -30,15 +30,15 @@ func GetAssets(ctx c.Context, assetGroupQuote c.AssetGroupQuote) ([]c.Asset, Hol
 	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
 		}
 	}
 
-	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, symbol := range assetGroupQuote.AssetGroup.ConfigAssetGroup.Watchlist {
+		if _, exists := orderIndex[symbol]; !exists {
+			orderIndex[strings.ToLower(symbol)] = i + len(assetGroupQuote.AssetGroup.ConfigAssetGroup.Holdings)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,15 @@ func GetAssets(ctx c.Context, assetGroupQuote c.AssetGroupQuote) ([]c.Asset, Hol`
`30`	`30`	`holdingsBySymbol := getLots(assetGroupQuote.AssetGroup.ConfigAssetGroup.Holdings)`
`31`	`31`	`orderIndex := make(map[string]int)`
`32`	`32`
`33`		`- for i, symbol := range assetGroupQuote.AssetGroup.ConfigAssetGroup.Watchlist {`
`34`		`- if _, exists := orderIndex[symbol]; !exists {`
`35`		`- orderIndex[strings.ToLower(symbol)] = i`
	`33`	`+ for i, symbol := range assetGroupQuote.AssetGroup.ConfigAssetGroup.Holdings {`
	`34`	`+ if _, exists := orderIndex[symbol.Symbol]; !exists {`
	`35`	`+ orderIndex[strings.ToLower(symbol.Symbol)] = i`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- for i, symbol := range assetGroupQuote.AssetGroup.ConfigAssetGroup.Holdings {`
`40`		`- if _, exists := orderIndex[symbol.Symbol]; !exists {`
`41`		`- orderIndex[strings.ToLower(symbol.Symbol)] = i + len(assetGroupQuote.AssetGroup.ConfigAssetGroup.Watchlist) - 1`
	`39`	`+ for i, symbol := range assetGroupQuote.AssetGroup.ConfigAssetGroup.Watchlist {`
	`40`	`+ if _, exists := orderIndex[symbol]; !exists {`
	`41`	`+ orderIndex[strings.ToLower(symbol)] = i + len(assetGroupQuote.AssetGroup.ConfigAssetGroup.Holdings)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`