diff --git a/src/services/indicatorService.ts b/src/services/indicatorService.ts index 1b454dc..d4d2715 100644 --- a/src/services/indicatorService.ts +++ b/src/services/indicatorService.ts @@ -277,21 +277,25 @@ export class IndicatorService { candles: Candle[], eventHandler: EventHandler ) { - if (analysis.isTouch200 && analysis.emaDirection === "Bullish") { + if ((analysis.isTouch200 || analysis.isReverse200) && analysis.emaDirection === "Bullish") { const order = this.makeOrder(analysis, candles, "buy"); eventHandler.onBuy(order, "Follow trend EMA Touch 200"); + return; } - if (analysis.isTouch200 && analysis.emaDirection === "Bearish") { + if ((analysis.isTouch200 || analysis.isReverse200) && analysis.emaDirection === "Bearish") { const order = this.makeOrder(analysis, candles, "sell"); eventHandler.onSell(order, "Follow trend EMA Touch 200"); + return; } if (analysis.isMacdCrossUp && analysis.emaDirection === "Bullish") { const order = this.makeOrder(analysis, candles, "buy"); eventHandler.onBuy(order, "Follow trend MACD Cross Up"); + return; } if (analysis.isMacdCrossDown && analysis.emaDirection === "Bearish") { const order = this.makeOrder(analysis, candles, "sell"); eventHandler.onSell(order, "Follow trend MACD Cross Down"); + return; } if (