#11 Provides a price entry for every trade record

preslavrachev · Aug 26, 2017 · fec784c · fec784c
1 parent b405548
commit fec784c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/main/kotlin/com/preslavrachev/cryptotrader/CryptotraderApplication.kt b/src/main/kotlin/com/preslavrachev/cryptotrader/CryptotraderApplication.kt
@@ -63,10 +63,22 @@ class CryptotraderApplication {
         LOGGER.info("Candlestick Pattern Strategy Decision: $decision -- time period $start/$end")
 
         if (decision == TradingStrategyDecisionEnum.BUY) {
-            val trade = TradeRecord(amount = 0.00001f, quoteCurrency = "BTC", baseCurrency = "USDT", orderType = OrderTypeEnum.BUY)
+            val trade = TradeRecord(
+                    amount = 0.00001f,
+                    quoteCurrency = "BTC",
+                    baseCurrency = "USDT",
+                    baseCurrencyPrice = lastPair[0].content.estimateBuyingPrice(),
+                    orderType = OrderTypeEnum.BUY
+            )
             tradeRecordRepository.save(trade)
         } else if (decision == TradingStrategyDecisionEnum.SELL) {
-            val trade = TradeRecord(amount = 0.00001f, quoteCurrency = "BTC", baseCurrency = "USDT", orderType = OrderTypeEnum.SELL)
+            val trade = TradeRecord(
+                    amount = 0.00001f,
+                    quoteCurrency = "BTC",
+                    baseCurrency = "USDT",
+                    baseCurrencyPrice = lastPair[0].content.estimateSellingPrice(),
+                    orderType = OrderTypeEnum.SELL
+            )
             tradeRecordRepository.save(trade)
         }
     }

diff --git a/src/main/kotlin/com/preslavrachev/cryptotrader/mvc/model/TradeRecord.kt b/src/main/kotlin/com/preslavrachev/cryptotrader/mvc/model/TradeRecord.kt
@@ -8,6 +8,7 @@ data class TradeRecord(
         val amount: Float, /* always in relation to the quote currency */
         val quoteCurrency: String, /* e.g. BTC in BTC/USDT */
         val baseCurrency: String, /* e.g. USDT in BTC/USDT */
+        val baseCurrencyPrice: Float,
         val executionDateTime: LocalDateTime = LocalDateTime.now(),
         val orderType: OrderTypeEnum,
         val orderScope: OrderScopeEnum = OrderScopeEnum.DEMO

diff --git a/src/main/kotlin/com/preslavrachev/cryptotrader/trading/instrument/candlestick/Candlestick.kt b/src/main/kotlin/com/preslavrachev/cryptotrader/trading/instrument/candlestick/Candlestick.kt
@@ -43,4 +43,12 @@ data class Candlestick(
     fun isBodyTop(): Boolean {
         return bodyMidpoint() >= (MAX_HEIGHT_RATIO * shadowHeight())
     }
+
+    fun estimateBuyingPrice(): Float {
+        return Math.min(open, close)
+    }
+
+    fun estimateSellingPrice(): Float {
+        return Math.max(open, close)
+    }
 }