Fixed swingtrade finder

Author: Artimatic

src/app/autopilot/autopilot.component.ts

@@ -221,7 +221,6 @@ export class AutopilotComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroy$))
       .subscribe(async () => {
         const startStopTime = this.getStartStopTime();
-        console.log(new Date().toString());
         if (moment().isAfter(moment(startStopTime.endDateTime).subtract(5, 'minutes')) &&
           moment().isBefore(moment(startStopTime.endDateTime))) {
           if (this.reportingService.logs.length > 0) {
@@ -618,13 +617,16 @@ export class AutopilotComponent implements OnInit, OnDestroy {
     const found = (name) => {
       return Boolean(this.currentHoldings.find((value) => value.name === name));
     };
-
-    do {
-      stock = this.machineDaytradingService.getNextStock();
-    } while (found(stock))
-    const backtestResults = await this.backtestTableService.getBacktestData(stock);
-    if (backtestResults) {
-      cb(stock, backtestResults.ml);
+    let counter = this.machineDaytradingService.getCurrentStockList().length;
+    while (counter > 0 && (this.cartService.buyOrders.length + this.cartService.otherOrders.length) < this.maxTradeCount) {
+      do {
+        stock = this.machineDaytradingService.getNextStock();
+      } while (found(stock))
+      const backtestResults = await this.backtestTableService.getBacktestData(stock);
+      if (backtestResults) {
+        cb(stock, backtestResults.ml);
+      }
+      counter--;
     }
   }
 
@@ -650,7 +652,7 @@ export class AutopilotComponent implements OnInit, OnDestroy {
       console.log('training daytrade results ', trainingResults);
       if (trainingResults[0].correct / trainingResults[0].guesses > 0.6 && trainingResults[0].guesses > 50) {
         await this.addDaytrade(stock);
-        if (this.cartService.otherOrders.length > this.maxTradeCount) {
+        if ((this.cartService.buyOrders.length + this.cartService.otherOrders.length) > this.maxTradeCount) {
           break;
         }
       }
@@ -713,7 +715,7 @@ export class AutopilotComponent implements OnInit, OnDestroy {
   }
 
   async addBuy(holding: PortfolioInfoHolding, allocation = round(this.riskToleranceList[this.riskCounter], 2)) {
-    if (this.cartService.buyOrders.length < this.maxTradeCount) {
+    if ((this.cartService.buyOrders.length + this.cartService.otherOrders.length) < this.maxTradeCount) {
       console.log('Adding buy ', holding);
 
       const currentDate = moment().format('YYYY-MM-DD');
@@ -740,7 +742,7 @@ export class AutopilotComponent implements OnInit, OnDestroy {
   }
 
   async addDaytrade(stock: string) {
-    if (this.cartService.otherOrders.length < this.maxTradeCount) {
+    if ((this.cartService.buyOrders.length + this.cartService.otherOrders.length) < this.maxTradeCount) {
       const currentDate = moment().format('YYYY-MM-DD');
       const startDate = moment().subtract(100, 'days').format('YYYY-MM-DD');
       try {

src/app/backtest-table/backtest-table.service.ts

@@ -14,9 +14,9 @@ export class BacktestTableService {
     private optionsDataService: OptionsDataService,
     private portfolioService: PortfolioService) { }
 
-  async getBacktestData(symbol: string, startDate: string = null, endDate: string = null) {
-    const current = moment(endDate).format('YYYY-MM-DD');
-    const start = moment(startDate).subtract(365, 'days').format('YYYY-MM-DD');
+  async getBacktestData(symbol: string) {
+    const current = moment().format('YYYY-MM-DD');
+    const start = moment().subtract(365, 'days').format('YYYY-MM-DD');
 
     try {
       const indicatorResults = await this.backtestService.getBacktestEvaluation(symbol, start, current, 'daily-indicators').toPromise();
@@ -47,7 +47,8 @@ export class BacktestTableService {
         strongbuySignals: [],
         buySignals: [],
         strongsellSignals: [],
-        sellSignals: []
+        sellSignals: [],
+        high52: instruments[symbol].fundamental.high52
       };
       const latestMlResult = await this.aiPicksService.trainAndActivate(symbol);
       if (latestMlResult) {

src/app/machine-daytrading/machine-daytrading.service.ts

@@ -131,7 +131,10 @@ export class MachineDaytradingService {
 
   setCurrentStockList(stockList) {
     this.currentStockList = stockList;
-    this.resetStockCounter();
+  }
+
+  getCurrentStockList() {
+    return this.currentStockList;
   }
 
   getNextStock() {
@@ -145,10 +148,6 @@ export class MachineDaytradingService {
     return this.currentStockList[this.counter].ticker ? this.currentStockList[this.counter].ticker : this.currentStockList[this.counter].name;
   }
 
-  resetStockCounter() {
-    this.counter = 0;
-  }
-
   resetStock() {
     this.selectedStock = null;
   }

src/app/shared/services/reporting.service.ts

@@ -46,7 +46,8 @@ export class ReportingService {
       'Previous Implied Move': results.previousImpliedMovement,
       'AI Prediction': JSON.stringify(results.ml),
       'Options Volume': results.optionsVolume,
-      'Market Cap': results.marketCap
+      'Market Cap': results.marketCap,
+      '52 Week High': results.high52
     };
     if (selectedColumns.length > 0) {
       selectedColumns.forEach((column: {field: string, header: string}) => {

src/app/shared/stock.interface.ts

@@ -51,4 +51,5 @@ export interface Stock {
   ml?: any;
   optionsVolume?: number;
   marketCap?: number;
+  high52?: number;
 }