up

2026-04-20 22:51:41 +02:00
parent 89fc0119f3
commit 81eec53978
27 changed files with 1067 additions and 399 deletions
@@ -1,6 +1,7 @@
 package etoro

 import (
+	"fmt"
 	"log"
 	"sync"
 	"time"
@@ -18,10 +19,11 @@ type SyncStatus struct {
 }

 type Poller struct {
-	db     *db.DB
-	client *Client
-	ticker *time.Ticker
-	done   chan struct{}
+	db      *db.DB
+	client  *Client
+	getKeys func() (apiKey, userKey string, err error)
+	ticker  *time.Ticker
+	done    chan struct{}

 	mu        sync.Mutex
 	syncing   bool
@@ -31,19 +33,25 @@ type Poller struct {
 	lastError string
 }

-func NewPoller(database *db.DB) *Poller {
+func NewPoller(database *db.DB, getKeys func() (string, string, error)) *Poller {
 	return &Poller{
-		db:     database,
-		client: New(),
-		done:   make(chan struct{}),
+		db:      database,
+		client:  New(),
+		getKeys: getKeys,
+		done:    make(chan struct{}),
 	}
 }

 func (p *Poller) Start() {
 	p.ticker = time.NewTicker(24 * time.Hour)
 	go func() {
-		if err := p.Sync(); err != nil {
-			log.Printf("etoro poller: initial sync: %v", err)
+		// Sync uniquement si la DB est vide
+		if p.dbCount() == 0 {
+			if err := p.Sync(); err != nil {
+				log.Printf("etoro poller: initial sync: %v", err)
+			}
+		} else {
+			log.Printf("etoro: %d instruments déjà en DB, sync ignorée au démarrage", p.dbCount())
 		}
 		for {
 			select {
@@ -97,47 +105,70 @@ func (p *Poller) Sync() error {
 		p.mu.Unlock()
 	}()

-	log.Println("etoro: fetching instruments…")
-	stocks, err := p.client.FetchStocks()
-	if err != nil {
+	apiKey, userKey, err := p.getKeys()
+	if err != nil || apiKey == "" || userKey == "" {
 		p.mu.Lock()
-		p.lastError = err.Error()
+		p.lastError = "clés API eToro non configurées (Settings)"
 		p.mu.Unlock()
-		log.Printf("etoro: fetch error: %v", err)
-		return err
+		return fmt.Errorf("etoro: clés manquantes")
 	}
+	p.client.SetKeys(apiKey, userKey)

-	p.mu.Lock()
-	p.total = len(stocks)
-	p.mu.Unlock()
-
-	log.Printf("etoro: %d stocks à synchroniser", len(stocks))
+	log.Println("etoro: fetching instruments…")

+	const pageSize = 500
 	inserted := 0
-	for i, s := range stocks {
-		_, err := p.db.Exec(`
-			INSERT INTO instruments (instrument_id, ticker, name, exchange_id, asset_class_id, synced_at)
-			VALUES (?, ?, ?, ?, ?, CURRENT_TIMESTAMP)
-			ON CONFLICT(instrument_id) DO UPDATE SET
-				ticker      = excluded.ticker,
-				name        = excluded.name,
-				exchange_id = excluded.exchange_id,
-				synced_at   = CURRENT_TIMESTAMP
-		`, s.InstrumentID, s.SymbolFull, s.InstrumentDisplayName,
-			s.StockExchangeID, s.InstrumentTypeID)
-		if err == nil {
-			inserted++
+	fetched := 0
+
+	for page := 1; ; page++ {
+		sr, err := p.client.fetchPage(5, pageSize, page)
+		if err != nil {
+			p.mu.Lock()
+			p.lastError = err.Error()
+			p.mu.Unlock()
+			log.Printf("etoro: fetch error page %d: %v", page, err)
+			return err
 		}

-		if (i+1)%100 == 0 || i+1 == len(stocks) {
+		// On connaît le total dès la première page
+		if page == 1 {
 			p.mu.Lock()
-			p.progress = i + 1
+			p.total = sr.TotalItems
 			p.mu.Unlock()
-			log.Printf("etoro: %d/%d instruments traités", i+1, len(stocks))
+			log.Printf("etoro: %d stocks à synchroniser", sr.TotalItems)
+		}
+
+		for _, s := range sr.Items {
+			if s.IsHidden || s.IsDelisted || !s.IsBuyEnabled {
+				continue
+			}
+			_, err := p.db.Exec(`
+				INSERT INTO instruments (instrument_id, ticker, name, exchange_id, asset_class_id, synced_at)
+				VALUES (?, ?, ?, ?, ?, CURRENT_TIMESTAMP)
+				ON CONFLICT(instrument_id) DO UPDATE SET
+					ticker      = excluded.ticker,
+					name        = excluded.name,
+					exchange_id = excluded.exchange_id,
+					synced_at   = CURRENT_TIMESTAMP
+			`, s.InstrumentID, s.SymbolFull, s.InstrumentDisplayName,
+				s.ExchangeID, s.AssetClassID)
+			if err == nil {
+				inserted++
+			}
+			fetched++
+		}
+
+		p.mu.Lock()
+		p.progress = fetched
+		p.mu.Unlock()
+		log.Printf("etoro: page %d — %d/%d traités", page, fetched, sr.TotalItems)
+
+		if page*pageSize >= sr.TotalItems {
+			break
 		}
 	}

-	log.Printf("etoro: sync terminée — %d/%d instruments en DB", inserted, len(stocks))
+	log.Printf("etoro: sync terminée — %d instruments en DB", inserted)
 	return nil
 }