Merge branch 'release'

Author: LoicDelorme

.travis.yml

@@ -21,4 +21,4 @@ after_success:
     docker login -u=$DOCKER_USERNAME -p=$DOCKER_PASSWORD;
     echo "Docker Hub credentials are working";
     docker push $DOCKER_USERNAME/cryptowallet-backend;
-    fi
+    fi

BDD_V1.2.png

@@ -11,7 +11,7 @@
 - LAFAYE DE MICHEAUX Yoan
 
 ## Global database scheme
-![](BDD_V1.2.png)
+![](BDD_V1.3.png)
 
 ## Getting started
 - Clone Polytech-CryptoWallet-Backend project

BDD_V1.3.png

@@ -87,6 +87,7 @@ CREATE TABLE settings (
 
 CREATE TABLE alerts (
     id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+    name VARCHAR(250) NOT NULL,
     threshold NUMERIC(30, 8) NOT NULL,
     is_active BOOLEAN NOT NULL DEFAULT false,
     is_one_shot BOOLEAN NOT NULL DEFAULT false,

README.md

@@ -5,7 +5,7 @@
 
     <groupId>fr.polytech</groupId>
     <artifactId>cryptowallet-backend</artifactId>
-    <version>1.0.0</version>
+    <version>1.2.0</version>
     <packaging>jar</packaging>
 
     <name>Polytech-Codev-Backend</name>

config/mysql/docker-entrypoint-initdb.d/CREATE_ALL.sql

@@ -87,6 +87,7 @@ CREATE TABLE settings (
 
 CREATE TABLE alerts (
     id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+    name VARCHAR(250) NOT NULL,
     threshold NUMERIC(30, 8) NOT NULL,
     is_active BOOLEAN NOT NULL DEFAULT false,
     is_one_shot BOOLEAN NOT NULL DEFAULT false,

pom.xml

@@ -0,0 +1,34 @@
+USE CryptoWallet;
+
+INSERT INTO users VALUES (1, 'DELORME', 'Loïc', 'loic.delorme@test.fr', 'loic.delorme', true, true, now(), now(), now());
+INSERT INTO users VALUES (2, 'KASPRZYK', 'Nicolas', 'nicolas.kasprzyk@test.fr', 'nicolas.kasprzyk', true, false, now(), now(), now());
+INSERT INTO users VALUES (3, 'LAFAYE DE MICHEAUX', 'Yoan', 'yoan.lafayedemicheaux@test.fr', 'yoan.lafayedemicheaux', false, false, now(), now(), now());
+
+INSERT INTO favorites VALUES (1, 1);
+INSERT INTO favorites VALUES (2, 1);
+INSERT INTO favorites VALUES (3, 1);
+INSERT INTO favorites VALUES (1, 2);
+INSERT INTO favorites VALUES (2, 2);
+INSERT INTO favorites VALUES (3, 2);
+INSERT INTO favorites VALUES (4, 2);
+
+INSERT INTO settings VALUES (1, 'Light setting', 'light', now(), now(), 1);
+INSERT INTO settings VALUES (2, 'Dark setting', 'dark', now(), now(), 1);
+INSERT INTO settings VALUES (3, 'Setting n° 1', 'light', now(), now(), 2);
+
+INSERT INTO alerts VALUES (1, 'ETH = 0.002467', '0.002467', false, false, now(), now(), 1, 2, 1);
+INSERT INTO alerts VALUES (2, 'BCH = 0.00467', '0.00467', false, true, now(), now(), 1, 3, 1);
+INSERT INTO alerts VALUES (3, 'XRP = 0.0120467', '0.0120467', true, false, now(), now(), 1, 4, 1);
+INSERT INTO alerts VALUES (3, 'DASH = 0.012467', '0.012467', true, true, now(), now(), 1, 5, 1);
+
+INSERT INTO wallets VALUES (1, 'Wallet n° 1', now(), now(), 1);
+INSERT INTO wallets VALUES (2, 'Wallet n° 2', now(), now(), 1);
+INSERT INTO wallets VALUES (3, 'BTC Wallet', now(), now(), 2);
+INSERT INTO wallets VALUES (4, 'ETH Wallet', now(), now(), 2);
+
+INSERT INTO assets VALUES (1, 1, '1.25', '1.25');
+INSERT INTO assets VALUES (1, 2, '10000', '0.4874');
+INSERT INTO assets VALUES (1, 3, '5.765', '0.25');
+INSERT INTO assets VALUES (1, 4, '100', '0.4579');
+INSERT INTO assets VALUES (2, 3, '1.25', '1.25');
+INSERT INTO assets VALUES (2, 4, '10000', '0.4874');

scripts/sql/CREATE_ALL.sql

@@ -72,6 +72,7 @@ CREATE TABLE settings (
 
 CREATE TABLE alerts (
     id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+    name VARCHAR(250) NOT NULL,
     threshold NUMERIC(30, 8) NOT NULL,
     is_active BOOLEAN NOT NULL DEFAULT false,
     is_one_shot BOOLEAN NOT NULL DEFAULT false,