1 files changed, 42 insertions, 33 deletions

diff --git a/api/market_config.go b/api/market_config.go
index c2248b3..81a92d1 100644
--- a/api/market_config.go
+++ b/api/market_config.go
@@ -5,11 +5,9 @@ import (
         "strings"
         "time"
 
-        "immae.eu/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Front/markets"
-
         "github.com/jloup/utils"
-        "github.com/shopspring/decimal"
         "immae.eu/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Front/db"
+        "immae.eu/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Front/markets"
 )
 
 type MarketConfigQuery struct {
@@ -56,45 +54,33 @@ func (q MarketConfigQuery) Run() (interface{}, *Error) {
         return config.Config, nil
 }
 
-type MarketBalanceQuery struct {
+type TestMarketCredentialsQuery struct {
         In struct {
-                User     db.User
-                Market   string
-                Currency string
+                User   db.User
+                Market string
         }
 }
 
-func (q MarketBalanceQuery) ValidateParams() *Error {
+func (q TestMarketCredentialsQuery) ValidateParams() *Error {
         if q.In.Market != "poloniex" {
                 return &Error{BadRequest, "invalid market name", fmt.Errorf("'%v' is not a valid market name", q.In.Market)}
         }
 
-        // TODO: we should request market for available currencies.
-        if q.In.Currency != "BTC" && q.In.Currency != "USDT" && q.In.Currency != "ETH" {
-                return &Error{BadRequest, "invalid currency, accept [BTC, USDT, ETH]", fmt.Errorf("'%v' is not a valid currency", q.In.Currency)}
-        }
-
         return nil
 }
 
-func (q MarketBalanceQuery) Run() (interface{}, *Error) {
+func (q TestMarketCredentialsQuery) Run() (interface{}, *Error) {
         config, err := db.GetUserMarketConfig(q.In.User.Id, q.In.Market)
         if err != nil {
                 return nil, NewInternalError(err)
         }
 
         if config.Config["key"] == "" || config.Config["secret"] == "" {
-                return nil, &Error{InvalidMarketCredentials, "your credentials for this market are not setup", fmt.Errorf("'%v' credentials are not setup", q.In.Market)}
+                return nil, &Error{InvalidMarketCredentials, "no market credentials", fmt.Errorf("market credentials are empty for marketId '%v'", q.In.Market)}
         }
 
-        result := struct {
-                Value         decimal.Decimal            `json:"value"`
-                ValueCurrency string                     `json:"valueCurrency"`
-                Balance       map[string]markets.Balance `json:"balance"`
-        }{}
-
         resultErr := CallExternalService(fmt.Sprintf("'%s' GetBalanceValue", q.In.Market), EXTERNAL_SERVICE_TIMEOUT_SECONDS*time.Second, func() *Error {
-                balance, err := Poloniex.GetBalance(config.Config["key"], config.Config["secret"])
+                err := Poloniex.TestCredentials(config.Config["key"], config.Config["secret"])
 
                 if utils.ErrIs(err, markets.InvalidCredentials) {
                         return &Error{InvalidMarketCredentials, "wrong market credentials", fmt.Errorf("wrong '%v' market credentials", q.In.Market)}
@@ -108,16 +94,6 @@ func (q MarketBalanceQuery) Run() (interface{}, *Error) {
                         return NewInternalError(err)
                 }
 
-                for currency, value := range balance.Balances {
-                        if value.BTCValue.Abs().LessThan(decimal.NewFromFloat(0.0001)) {
-                                delete(balance.Balances, currency)
-                        }
-                }
-
-                result.Balance = balance.Balances
-                result.ValueCurrency = "BTC"
-                result.Value = balance.BTCValue.Round(8)
-
                 return nil
         })
 
@@ -125,7 +101,7 @@ func (q MarketBalanceQuery) Run() (interface{}, *Error) {
                 return nil, resultErr
         }
 
-        return &result, nil
+        return nil, nil
 }
 
 type UpdateMarketConfigQuery struct {
@@ -164,3 +140,36 @@ func (q UpdateMarketConfigQuery) Run() (interface{}, *Error) {
 
         return nil, nil
 }
+
+type GetPortfolioQuery struct {
+        In struct {
+                User   db.User
+                Market string
+        }
+}
+
+func (q GetPortfolioQuery) ValidateParams() *Error {
+        if q.In.Market != "poloniex" {
+                return &Error{BadRequest, "invalid market name", fmt.Errorf("'%v' is not a valid market name", q.In.Market)}
+        }
+
+        return nil
+}
+
+func (q GetPortfolioQuery) Run() (interface{}, *Error) {
+        marketConfig, err := db.GetUserMarketConfig(q.In.User.Id, q.In.Market)
+        if err != nil {
+                return nil, NewInternalError(err)
+        }
+
+        report, err := GetWeekPortfolio(*marketConfig)
+        if ErrorIs(err, NotFound) {
+                return nil, err.(*Error)
+        }
+
+        if err != nil {
+                return nil, NewInternalError(err)
+        }
+
+        return report.Round(), nil
+}