working on db

1.1.1/pom.xml

@@ -36,6 +36,10 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-rest</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 		<dependency>

1.1.1/src/main/java/DatabaseController/CryptoRepository.java

@@ -0,0 +1,23 @@
+package DatabaseController;
+
+import Trades.CryptoTrade;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+
+import java.util.List;
+
+@RepositoryRestResource
+public interface CryptoRepository extends CrudRepository<CryptoTrade, Long> {
+
+
+//
+//        public void saveOrUpdate(CryptoTrade ct);
+//
+//
+//        public void delete(Long ctId);
+//
+//        public CryptoTrade get(Long ctID);
+//
+//        public List<CryptoTrade> list();
+
+}

1.1.1/src/main/java/DatabaseController/CryptoRepositoryImpl.java

@@ -0,0 +1,69 @@
+//package DatabaseController;
+//
+//import Trades.CryptoTrade;
+//import org.springframework.jdbc.core.JdbcTemplate;
+//
+//import javax.sql.DataSource;
+//
+//public class CRUDRepositoryImpl implements CryptoRepository {
+//
+//    private JdbcTemplate jdbcTemplate;
+//
+//    public CRUDRepositoryImpl(DataSource dataSource) {
+//        jdbcTemplate = new JdbcTemplate(dataSource);
+//    }
+//
+//    public void saveOrUpdate(CryptoTrade ct) {
+//        if (ct.getId() > 0) {
+//            // update
+//            String sql = "UPDATE crypto_test SET ticker=?, exchange=?, signalBuyPrice=?, "
+//                    + "actualBuyPrice=?, buyTimestamp=?, signalSellPrice=?, actualSellPrice=?, "
+//            + "sellTimestamp=?, strategy1=? WHERE id=?";
+//            jdbcTemplate.update(sql, ct.getTicker(), ct.getExchange(),
+//                    ct.getSignalBuyPrice(), ct.getActualBuyPrice(),
+//                    ct.getBuyTimestamp(), ct.getSignalSellPrice(), ct.getActualSellPrice(), ct.getSellTimestamp(),
+//                    ct.getStrategy1());
+//        } else {
+//            // insert
+//            String sql = "INSERT INTO crypto_test (ticker, exchange, signalBuyPrice, actualBuyPrice, buyTimestamp, " +
+//                    "signalSellPrice, actualSellPrice, sellTimestamp, strategy1)"
+//                    + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
+//            jdbcTemplate.update(sql, ct.getTicker(), ct.getExchange(),
+//                    ct.getSignalBuyPrice(), ct.getActualBuyPrice(),
+//                    ct.getBuyTimestamp(), ct.getSignalSellPrice(), ct.getActualSellPrice(), ct.getSellTimestamp(),
+//                    ct.getStrategy1());
+//        }
+//    }
+//
+//    public void delete(Long ctId){
+//        String sql = "DELETE FROM contact WHERE id=?";
+//        jdbcTemplate.update(sql, ctId);}
+//
+//
+////                  GET LIST OF TRADES
+////    public CryptoTrade get(Long ctID){
+////        String sql = "SELECT * FROM contact";
+////        List<CryptoTrade> ctList = jdbcTemplate.query(sql, new RowMapper<CryptoTrade>() {
+////
+////            @Override
+////            public CryptoTrade mapRow(ResultSet rs, int rowNum) throws SQLException {
+////                CryptoTrade aCrypto = new CryptoTrade();
+////
+////                aCrypto.setId(rs.getInt("contact_id"));
+////                aCrypto.setName(rs.getString("name"));
+////                aCrypto.setEmail(rs.getString("email"));
+////                aCrypto.setAddress(rs.getString("address"));
+////                aCrypto.setTelephone(rs.getString("telephone"));
+////
+////                return aCrypto;
+////            }
+////
+////        });
+////
+////        return listContact;
+////    }
+////
+////    public List<CryptoTrade> list();
+//
+//
+//}

1.1.1/src/main/java/DatabaseController/CryptoTradeDBController.java

@@ -1,63 +0,0 @@
-package DatabaseController;
-
-import Trades.CryptoTrade;
-import Trades.CryptoTradeRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import javax.validation.Valid;
-import java.util.List;
-
-
-
-@RestController
-@RequestMapping("/api")
-
-public class CryptoTradeDBController {
-
-    @Autowired
-    CryptoTradeRepository cryptoTradeRepository;
-
-
-    @GetMapping("/crypto")
-    public List<CryptoTrade> getAllCryptoTrades() {
-        return cryptoTradeRepository.findAll();
-    }
-
-    @PostMapping("/crypto")
-    public CryptoTrade createCryptoTrade(@Valid @RequestBody CryptoTrade cryptoTrade){
-        return cryptoTradeRepository.save(cryptoTrade);
-
-    }
-
-//    @GetMapping("/crypto/{id}")
-//    public CryptoTrade getCryptoTradeById(@PathVariable(value = "id") Integer cryptoTradeId) {
-//        return cryptoTradeRepository.findById(cryptoTradeId);
-//    }
-
-
-    //UPDATING CRYPTOTRADE - https://www.callicoder.com/spring-boot-rest-api-tutorial-with-mysql-jpa-hibernate/
-//
-//    @PutMapping("/notes/{id}")
-//    public Note updateNote(@PathVariable(value = "id") Long noteId,
-//                           @Valid @RequestBody Note noteDetails) {
-//
-//        Note note = noteRepository.findById(noteId)
-//                .orElseThrow(() -> new ResourceNotFoundException("Note", "id", noteId));
-//
-//        note.setTitle(noteDetails.getTitle());
-//        note.setContent(noteDetails.getContent());
-//
-//        Note updatedNote = noteRepository.save(note);
-//        return updatedNote;
-
-//    @DeleteMapping("/crypto/{id}")
-//    public ResponseEntity<?> deleteNote(@PathVariable(value = "id") Integer cryptoTradeId) {
-//        CryptoTrade cryptoTrade = cryptoTradeRepository.findById(cryptoTradeId);
-//
-//        cryptoTradeRepository.delete(cryptoTrade);
-//
-//        return ResponseEntity.ok().build();
-//    }
-
-}

1.1.1/src/main/java/Trades/CryptoTrade.java

@@ -4,49 +4,31 @@ import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import org.springframework.context.annotation.Scope;
 
 import javax.persistence.*;
 
 @Entity
 @Table(name="crypto_test")
-@Scope("Session")
 public class CryptoTrade {
     @Id
     @GeneratedValue(strategy=GenerationType.AUTO)
-    private Integer id;
+    private long id;
 
-    @Column(nullable = false)
+    @Column
     String ticker;
-    @Column(nullable = false)
     String exchange;
-    @Column(nullable = false)
     double signalBuyPrice;
-    @Column(nullable = false)
     double actualBuyPrice;
-    @Column(nullable = false)
-    @Temporal(TemporalType.TIMESTAMP)
     String buyTimestamp;
-    @Column(nullable = false)
     double signalSellPrice;
-    @Column(nullable = false)
     double actualSellPrice;
-    @Column(nullable = false)
-    @Temporal(TemporalType.TIMESTAMP)
     String sellTimestamp;
-    @Column(nullable = false)
     double percentChange;
-    @Column(nullable = false)
     String strategy1;
-    @Column
     String strategy1Notes;
-    @Column
     String strategy2;
-    @Column
     String strategy2Notes;
-    @Column
     String strategy3;
-    @Column
     String strategy3Notes;
 
 
@@ -63,7 +45,7 @@ public class CryptoTrade {
         this.strategy1 = strategy1;
     }
 
-    public int getId(){
+    public Long getId(){
         return id;
     }
 

1.1.1/src/main/java/Trades/CryptoTradeRepository.java

@@ -1,9 +0,0 @@
-package Trades;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface CryptoTradeRepository extends JpaRepository<CryptoTrade, Integer> {
-
-}

1.1.1/src/main/java/Trades/ForexTrade.java

@@ -6,7 +6,6 @@ import javax.persistence.*;
 
 @Entity
 @Table(name="forex_test")
-@Scope("Session")
 public class ForexTrade {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)

1.1.1/src/main/java/tradingproject001/Application.java

@@ -7,11 +7,21 @@ import Trades.CryptoTrade;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import javax.sql.DataSource;
+
+
 @SpringBootApplication
 public class Application {
 
+//    @Autowired
+//    DataSource dataSource;
+
+//    @Autowired
+//    CryptoRepository cryptoRepository;
+
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
+
 		String apiKey = "FRV46SGJ2IAABHTG";
         int timeout = 3000;
         ApiConnector apiConnector = new AlphaVantageConnector(apiKey, timeout);
@@ -30,7 +40,8 @@ public class Application {
         } catch (org.AlphaVantage.output.AlphaVantageException e) {
             System.out.println("something went wrong");
         }
+        CryptoTrade cryptoTrade = new CryptoTrade("BTC/USD", "Kraken", 609.88, 610.10, "2018-06-06 12:01:01",615.09, 615.78, "2018-06-06 15:01:01", 15.57, "K39");
+
 
-        CryptoTrade ct = new CryptoTrade("BTC/USD", "Kraken", 609.88, 610.10, "2018-06-06 12:01:01",615.09, 615.78, "2018-06-06 15:01:01", 15.57, "K39");
 	}
 }

1.1.1/src/main/resources/application.properties

@@ -1,4 +1,6 @@
 spring.jpa.hibernate.ddl-auto=update
-spring.datasource.url=jdbc:mysql://localhost:3306/trader?autoReconnect=true&useSSL=false
-spring.datasource.username=trader
-spring.datasource.password=tradertest
+spring.datasource.url=jdbc:mysql://localhost:3306/trader?useSSL=false
+spring.datasource.username=root
+spring.datasource.password=
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect

UI Ionic/www/build/main.js

@@ -384,10 +384,9 @@ var TradePage = /** @class */ (function () {
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
             selector: 'page-trade',template:/*ion-inline-start:"/Users/vincents/Labs/CryptoTrader/UI Ionic/src/pages/trade/trade.html"*/'<!--\n  Generated template for the TradePage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title text-center>Trade</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/vincents/Labs/CryptoTrader/UI Ionic/src/pages/trade/trade.html"*/,
         }),
-        __metadata("design:paramtypes", [typeof (_a = typeof __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */]) === "function" && _a || Object, typeof (_b = typeof __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */] !== "undefined" && __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]) === "function" && _b || Object])
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
     ], TradePage);
     return TradePage;
-    var _a, _b;
 }());
 
 //# sourceMappingURL=trade.js.map