OpenClassrooms-Student-Center · abelk7 · Feb 6, 2023 · Feb 26, 2023
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea/
diff --git a/Poseiden-skeleton/.idea/.gitignore b/Poseiden-skeleton/.idea/.gitignore
diff --git a/Poseiden-skeleton/.idea/compiler.xml b/Poseiden-skeleton/.idea/compiler.xml
diff --git a/Poseiden-skeleton/.idea/encodings.xml b/Poseiden-skeleton/.idea/encodings.xml
diff --git a/Poseiden-skeleton/.idea/jarRepositories.xml b/Poseiden-skeleton/.idea/jarRepositories.xml
diff --git a/Poseiden-skeleton/.idea/jpa-buddy.xml b/Poseiden-skeleton/.idea/jpa-buddy.xml
diff --git a/Poseiden-skeleton/.idea/misc.xml b/Poseiden-skeleton/.idea/misc.xml
diff --git a/Poseiden-skeleton/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d b/Poseiden-skeleton/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
diff --git a/Poseiden-skeleton/.idea/sonarlint/issuestore/b/5/b587c6e808d79a49964dbdaf42a38ce382a0b895 b/Poseiden-skeleton/.idea/sonarlint/issuestore/b/5/b587c6e808d79a49964dbdaf42a38ce382a0b895
diff --git a/Poseiden-skeleton/.idea/sonarlint/issuestore/index.pb b/Poseiden-skeleton/.idea/sonarlint/issuestore/index.pb
diff --git a/Poseiden-skeleton/.idea/vcs.xml b/Poseiden-skeleton/.idea/vcs.xml
diff --git a/Poseiden-skeleton/doc/data.sql b/Poseiden-skeleton/doc/data.sql
@@ -1,99 +1,100 @@
+USE demo;
 
 CREATE TABLE BidList (
-  BidListId tinyint(4) NOT NULL AUTO_INCREMENT,
-  account VARCHAR(30) NOT NULL,
-  type VARCHAR(30) NOT NULL,
-  bidQuantity DOUBLE,
-  askQuantity DOUBLE,
-  bid DOUBLE ,
-  ask DOUBLE,
-  benchmark VARCHAR(125),
-  bidListDate TIMESTAMP,
-  commentary VARCHAR(125),
-  security VARCHAR(125),
-  status VARCHAR(10),
-  trader VARCHAR(125),
-  book VARCHAR(125),
-  creationName VARCHAR(125),
-  creationDate TIMESTAMP ,
-  revisionName VARCHAR(125),
-  revisionDate TIMESTAMP ,
-  dealName VARCHAR(125),
-  dealType VARCHAR(125),
-  sourceListId VARCHAR(125),
-  side VARCHAR(125),
+                         BidListId tinyint(4) NOT NULL AUTO_INCREMENT,
+                         account VARCHAR(30) NOT NULL,
+                         type VARCHAR(30) NOT NULL,
+                         bidQuantity DOUBLE,
+                         askQuantity DOUBLE,
+                         bid DOUBLE ,
+                         ask DOUBLE,
+                         benchmark VARCHAR(125),
+                         bidListDate TIMESTAMP,
+                         commentary VARCHAR(125),
+                         security VARCHAR(125),
+                         status VARCHAR(10),
+                         trader VARCHAR(125),
+                         book VARCHAR(125),
+                         creationName VARCHAR(125),
+                         creationDate TIMESTAMP ,
+                         revisionName VARCHAR(125),
+                         revisionDate TIMESTAMP ,
+                         dealName VARCHAR(125),
+                         dealType VARCHAR(125),
+                         sourceListId VARCHAR(125),
+                         side VARCHAR(125),
 
-  PRIMARY KEY (BidListId)
-)
+                         PRIMARY KEY (BidListId)
+);
 
 CREATE TABLE Trade (
-  TradeId tinyint(4) NOT NULL AUTO_INCREMENT,
-  account VARCHAR(30) NOT NULL,
-  type VARCHAR(30) NOT NULL,
-  buyQuantity DOUBLE,
-  sellQuantity DOUBLE,
-  buyPrice DOUBLE ,
-  sellPrice DOUBLE,
-  tradeDate TIMESTAMP,
-  security VARCHAR(125),
-  status VARCHAR(10),
-  trader VARCHAR(125),
-  benchmark VARCHAR(125),
-  book VARCHAR(125),
-  creationName VARCHAR(125),
-  creationDate TIMESTAMP ,
-  revisionName VARCHAR(125),
-  revisionDate TIMESTAMP ,
-  dealName VARCHAR(125),
-  dealType VARCHAR(125),
-  sourceListId VARCHAR(125),
-  side VARCHAR(125),
+                       TradeId tinyint(4) NOT NULL AUTO_INCREMENT,
+                       account VARCHAR(30) NOT NULL,
+                       type VARCHAR(30) NOT NULL,
+                       buyQuantity DOUBLE,
+                       sellQuantity DOUBLE,
+                       buyPrice DOUBLE ,
+                       sellPrice DOUBLE,
+                       tradeDate TIMESTAMP,
+                       security VARCHAR(125),
+                       status VARCHAR(10),
+                       trader VARCHAR(125),
+                       benchmark VARCHAR(125),
+                       book VARCHAR(125),
+                       creationName VARCHAR(125),
+                       creationDate TIMESTAMP ,
+                       revisionName VARCHAR(125),
+                       revisionDate TIMESTAMP ,
+                       dealName VARCHAR(125),
+                       dealType VARCHAR(125),
+                       sourceListId VARCHAR(125),
+                       side VARCHAR(125),
 
-  PRIMARY KEY (TradeId)
-)
+                       PRIMARY KEY (TradeId)
+);
 
 CREATE TABLE CurvePoint (
-  Id tinyint(4) NOT NULL AUTO_INCREMENT,
-  CurveId tinyint,
-  asOfDate TIMESTAMP,
-  term DOUBLE ,
-  value DOUBLE ,
-  creationDate TIMESTAMP ,
+                            Id tinyint(4) NOT NULL AUTO_INCREMENT,
+                            CurveId tinyint,
+                            asOfDate TIMESTAMP,
+                            term DOUBLE ,
+                            value DOUBLE ,
+                            creationDate TIMESTAMP ,
 
-  PRIMARY KEY (Id)
-)
+                            PRIMARY KEY (Id)
+);
 
 CREATE TABLE Rating (
-  Id tinyint(4) NOT NULL AUTO_INCREMENT,
-  moodysRating VARCHAR(125),
-  sandPRating VARCHAR(125),
-  fitchRating VARCHAR(125),
-  orderNumber tinyint,
+                        Id tinyint(4) NOT NULL AUTO_INCREMENT,
+                        moodysRating VARCHAR(125),
+                        sandPRating VARCHAR(125),
+                        fitchRating VARCHAR(125),
+                        orderNumber tinyint,
 
-  PRIMARY KEY (Id)
-)
+                        PRIMARY KEY (Id)
+);
 
 CREATE TABLE RuleName (
-  Id tinyint(4) NOT NULL AUTO_INCREMENT,
-  name VARCHAR(125),
-  description VARCHAR(125),
-  json VARCHAR(125),
-  template VARCHAR(512),
-  sqlStr VARCHAR(125),
-  sqlPart VARCHAR(125),
+                          Id tinyint(4) NOT NULL AUTO_INCREMENT,
+                          name VARCHAR(125),
+                          description VARCHAR(125),
+                          json VARCHAR(125),
+                          template VARCHAR(512),
+                          sqlStr VARCHAR(125),
+                          sqlPart VARCHAR(125),
 
-  PRIMARY KEY (Id)
-)
+                          PRIMARY KEY (Id)
+);
 
 CREATE TABLE Users (
-  Id tinyint(4) NOT NULL AUTO_INCREMENT,
-  username VARCHAR(125),
-  password VARCHAR(125),
-  fullname VARCHAR(125),
-  role VARCHAR(125),
+                       Id tinyint(4) NOT NULL AUTO_INCREMENT,
+                       username VARCHAR(125),
+                       password VARCHAR(125),
+                       fullname VARCHAR(125),
+                       role VARCHAR(125),
 
-  PRIMARY KEY (Id)
-)
+                       PRIMARY KEY (Id)
+);
 
-insert into Users(fullname, username, password, role) values("Administrator", "admin", "$2a$10$pBV8ILO/s/nao4wVnGLrh.sa/rnr5pDpbeC4E.KNzQWoy8obFZdaa", "ADMIN")
-insert into Users(fullname, username, password, role) values("User", "user", "$2a$10$pBV8ILO/s/nao4wVnGLrh.sa/rnr5pDpbeC4E.KNzQWoy8obFZdaa", "USER")
+insert into Users(fullname, username, password, role) values("Administrator", "admin", "$2a$10$pBV8ILO/s/nao4wVnGLrh.sa/rnr5pDpbeC4E.KNzQWoy8obFZdaa", "ADMIN");
+insert into Users(fullname, username, password, role) values("User", "user", "$2a$10$pBV8ILO/s/nao4wVnGLrh.sa/rnr5pDpbeC4E.KNzQWoy8obFZdaa", "USER");
diff --git a/Poseiden-skeleton/pom.xml b/Poseiden-skeleton/pom.xml
@@ -60,13 +60,27 @@
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.24</version>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</exclude>
+					</excludes>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/Poseiden-skeleton/spring-boot-skeleton.iml b/Poseiden-skeleton/spring-boot-skeleton.iml
@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <setting name="provider-name" value="Hibernate" />
+        <datasource-mapping />
+        <naming-strategy-map />
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -79,6 +101,10 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.32" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:11.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:linux:11.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:mac:11.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:win:11.0.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.8.RELEASE" level="project" />
@@ -98,5 +124,6 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.46" level="project" />
     <orderEntry type="library" name="Maven: com.h2database:h2:1.4.197" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
   </component>
 </module>
diff --git a/Poseiden-skeleton/src/main/java/com/nnk/springboot/controllers/CurveController.java b/Poseiden-skeleton/src/main/java/com/nnk/springboot/controllers/CurveController.java
@@ -1,6 +1,8 @@
 package com.nnk.springboot.controllers;
 
 import com.nnk.springboot.domain.CurvePoint;
+import com.nnk.springboot.service.CurvePointService;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -12,8 +14,10 @@
 import javax.validation.Valid;
 
 @Controller
+@AllArgsConstructor
 public class CurveController {
     // TODO: Inject Curve Point service
+    private final CurvePointService
 
     @RequestMapping("/curvePoint/list")
     public String home(Model model)