Merge pull request #3 from matthieuLabaune/develop

Develop

Author: matthieuLabaune

pom.xml

@@ -34,6 +34,16 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
@@ -50,6 +60,10 @@
 			<artifactId>jaxb-api</artifactId>
 			<version>2.3.0</version>
 		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
 
 	</dependencies>
 

src/main/java/com/ecars/microcars/controller/CarController.java

@@ -1,51 +1,67 @@
 package com.ecars.microcars.controller;
 
-import com.ecars.microcars.dao.CarDao;
+import com.ecars.microcars.repository.CarRepository;
 import com.ecars.microcars.model.Car;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.sql.rowset.CachedRowSet;
 import java.util.List;
 
+@Api(tags = "CarController.java : Controller pour API REST (CRUD sur les voitures)")
 @RestController
 public class CarController {
 
     @Autowired //Instanciation automatique
-    private CarDao carDao;
+    private CarRepository carRepository;
 
     //INDEX => /cars
+    @ApiOperation(value = "Récupère la liste de toutes les voitures")
     @GetMapping(value = "cars") //GET Mapping pour l'uri pour la liste des voitures
     public List<Car> listCars() {
-        return carDao.findAll();
+        return carRepository.findAll();
     }
 
     //SHOW BY ID => /cars/{id}
+    @ApiOperation(value = "Récupère une voiture grâce à son ID")
     @GetMapping(value = "cars/{id}") //GET Mapping pour l'uri pour retourner une voiture par l'id
     public Car showCar(@PathVariable int id) {// Va chercher le paramètre id dans l'url et le passe à notre méthode
-        return carDao.findById(id);
+        return carRepository.findById(id);
     }
 
+    @ApiOperation(value = "Ajoute une voiture grâce à la liste")
     //STORE /cars
-    @PostMapping(value = "cars")
-    public void storeCar(@RequestBody Car car) { // Aller chercher dans le body de la requête la voiture et le parser
-        carDao.save(car);
+    @RequestMapping(value = "/cars/", method = RequestMethod.POST)
+    public ResponseEntity<Object> createCar(@RequestBody Car car) {
+        carRepository.save(car);
+        return new ResponseEntity<>("Car is created successfully", HttpStatus.CREATED);
     }
 
+    @ApiOperation(value = "Mise à jour d'une voiture grâce à son ID")
     @PutMapping(value = "/cars/{id}")
-    public ResponseEntity<?> updateCar(@PathVariable("id") int id, @RequestBody Car car) {
-        Car currentCar = carDao.findById(id);
+    public ResponseEntity<Object> updateCar(@PathVariable("id") int id, @RequestBody Car car) {
+        Car currentCar = carRepository.findById(id);
         currentCar.setBrand(car.getBrand());
         currentCar.setModel(car.getModel());
-        carDao.updateCar(currentCar);
-        return new ResponseEntity<Car>(currentCar, HttpStatus.OK);
+        carRepository.save(currentCar);
+        return new ResponseEntity<>("Car is updated successsfully", HttpStatus.OK);
     }
 
     //DELETE
-    @DeleteMapping (value = "/cars/{id}")
-    public void deleteCar(@PathVariable int id) {
-        carDao.deleteCar(id);
+/*        @ApiOperation(value = "Supprime une voiture grâce à son ID")
+        @DeleteMapping (value = "/cars/{id}")
+        public void deleteCar(@PathVariable int id) {
+            carRepository.deleteById(id);
+        }*/
+
+    @ApiOperation(value = "Supprime une voiture grâce à son ID")
+    @RequestMapping(value = "/cars/{id}", method = RequestMethod.DELETE)
+    public ResponseEntity<Object> delete(@PathVariable("id") int id) {
+        carRepository.deleteById(id);
+        return new ResponseEntity<>("Car is deleted successfully", HttpStatus.OK);
     }
 }
+

src/main/java/com/ecars/microcars/dao/CarDao.java

@@ -1,19 +1,45 @@
 package com.ecars.microcars.model;
 
-import java.util.Objects;
+import javax.persistence.*;
+import javax.xml.crypto.Data;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
+@Entity // Comprend que le nom de la table sera automatiquement car et les colonnes id, brand & model, etc
 public class Car {
+
+/*
+    private static SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'");
+*/
+
+    //ID
+    @Id
+    @GeneratedValue
     private int id;
+
+    //TIMESTAMP
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date createdAt;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date modifiedAt;
+
+    //DATA ON CARS
     private String brand;
     private String model;
 
     public Car() {
     }
 
-    public Car(int id, String brand, String model) {
+    public Car(String brand, String model) {
+    }
+
+    public Car(int id, String brand, String model, Date createdAt, Date modifiedAt) {
         this.id = id;
         this.brand = brand;
         this.model = model;
+        this.createdAt = createdAt;
+        this.modifiedAt = modifiedAt;
     }
 
     public int getId() {
@@ -46,6 +72,7 @@ public String toString() {
                 "id=" + id +
                 ", brand='" + brand + '\'' +
                 ", model='" + model + '\'' +
+                ", modifiedAt='" + model + '\''+
                 '}';
     }
 }

src/main/java/com/ecars/microcars/dao/CarDaoImpl.java

@@ -0,0 +1,19 @@
+package com.ecars.microcars.repository;
+
+import com.ecars.microcars.model.Car;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CarRepository extends JpaRepository<Car, Integer> {
+
+     List<Car> findAll();
+
+     Car findById(int id);
+
+     Car save(Car car);
+
+     Car deleteById(int id);
+}

src/main/java/com/ecars/microcars/model/Car.java

@@ -0,0 +1,14 @@
+package com.ecars.microcars.repository;
+
+import com.ecars.microcars.model.Car;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.junit.Assert.*;
+
+public class CarRepositoryTest {
+
+        @Autowired
+        private CarRepository carRepository;
+}

src/main/java/com/ecars/microcars/repository/CarRepository.java

@@ -1,2 +1,10 @@
-server.port=8080
+#APPLICATION CONFIGURATION
+server.port=8081
 spring.application.name=MicroCars
+
+#DATABASE CONFIGURATION
+spring.datasource.url=jdbc:mariadb://localhost:3306/VehiculeRentale
+spring.datasource.username=matt
+spring.datasource.password=soleil
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+spring.jpa.hibernate.ddl-auto=create-drop