Merge branch 'develop' into release

Author: LoicDelorme

BDD_V1.3.png

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

BDD_V1.4.png

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

README.md

@@ -12,14 +12,14 @@ 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 settings VALUES (1, 'Light setting', 'light', '1D', now(), now(), 1);
+INSERT INTO settings VALUES (2, 'Dark setting', 'dark', '1Y', now(), now(), 1);
+INSERT INTO settings VALUES (3, 'Setting n° 1', 'light', '3M', 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 alerts VALUES (4, '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);

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

@@ -64,6 +64,7 @@ CREATE TABLE settings (
     id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
     name VARCHAR(250) NOT NULL,
     theme VARCHAR(250) NOT NULL,
+    chart_period VARCHAR(3) NOT NULL,
     creation_date DATETIME NOT NULL,
     last_update DATETIME NOT NULL,
     user INT NOT NULL,

pom.xml

@@ -34,6 +34,11 @@ public class Setting implements fr.polytech.codev.backend.entities.Entity {
     @Column(name = "theme")
     private String theme;
 
+    @NotBlank(message = "The chart period can't be blank!")
+    @Size(message = "The chart period can't exceed 3 characters!", max = 3)
+    @Column(name = "chart_period")
+    private String chartPeriod;
+
     @JsonbDateFormat("dd/MM/yyyy hh:mm:ss")
     @NotNull(message = "The creation date can't be null!")
     @PastOrPresent(message = "The creation date can't be in the future!")