Correction Spring Part

pom.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>2.4.3</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.itacademy</groupId>
 	<artifactId>CrudEmpleats</artifactId>
@@ -17,6 +18,14 @@
 		<java.version>15</java.version>
 	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -25,7 +34,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>

src/main/java/com/itacademy/CrudEmpleats/CrudEmpleatsApplication.java

@@ -2,8 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
-@SpringBootApplication
+@SpringBootApplication(exclude={DataSourceAutoConfiguration.class})
 public class CrudEmpleatsApplication {
 
 	public static void main(String[] args) {

src/main/java/com/itacademy/CrudEmpleats/controller/ControllerEmployees.java

@@ -1,16 +1,15 @@
 package com.itacademy.CrudEmpleats.controller;
 
-import java.io.IOException;
 import java.util.List;
 
-import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import com.itacademy.CrudEmpleats.domain.Employee;
-import com.itacademy.CrudEmpleats.persistence.EmployeeRepository;
+import com.itacademy.CrudEmpleats.service.EmployeeServices;
 
 @RestController
 public class ControllerEmployees {
@@ -19,45 +18,39 @@ public class ControllerEmployees {
 	 */
 
 	@Autowired
-	private EmployeeRepository repositori;
-
-
-	// Temporalment redirigim a la llista d'empleats
-	@GetMapping("/")
-	void start(HttpServletResponse reponse) throws IOException {
-		reponse.sendRedirect("/Empleat");
-	}
+	private EmployeeServices repositori;
 
 	// Crear nou empleat
-	@PostMapping( "/Empleat")
+	@PostMapping( "/EmployeeList")
 	@ResponseStatus(HttpStatus.CREATED)  // 201
-	public Employee addEmployee(@RequestBody Employee employee) {
+	public Employee addEmployee(@Valid @RequestBody Employee employee) {
 		repositori.addEmployee(employee);
-		return employee;
+		return repositori.getEmployeeById(employee.getId());
+
 	}
 
 	// Retorna una llista JSon d'empleats
-	@GetMapping("/Empleat")
+	@GetMapping("/EmployeeList")
 	public List<Employee> allEmployees() {
 		return repositori.getAllEmployees();
 	}
 
 	// Busca un empleat per Id
-	@GetMapping("/Empleat/{id}")
+	@GetMapping("/EmployeeList/{id}")
 	public Employee getFirstEmployee(@PathVariable("id") int id) {
 			return repositori.getEmployeeById(id);
 	}
 
 	// Actualitzar Empleat
-	@PutMapping("/Empleat/{id}")
+	@PutMapping("/EmployeeList/{id}")
 	@ResponseStatus(HttpStatus.ACCEPTED)  // 202
-	public Employee updateEmployee(@RequestBody Employee employee, @PathVariable("id") int id) {
+	public Employee updateEmployee(@Valid @RequestBody Employee employee, @PathVariable("id") int id) {
 		repositori.updateEmployee(employee,id);
 		return repositori.getEmployeeById(id);
 	}
 
 	// Eliminar Empleat
-	@DeleteMapping("/Empleat/{id}")
+	@DeleteMapping("/EmployeeList/{id}")
 	@ResponseStatus(HttpStatus.ACCEPTED)  // 202
 	public String deleteEmployee(@PathVariable("id") int id) {
 			repositori.deleteEmployee(id);

src/main/java/com/itacademy/CrudEmpleats/domain/Employee.java

@@ -1,9 +1,19 @@
 package com.itacademy.CrudEmpleats.domain;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Entity
 public class Employee {
 
+	@Id
+	@NotNull
 	private int id;
+	@NotBlank
 	private String name;
+	@NotBlank
 	private String job;
 	private double salary ;
 

src/main/java/com/itacademy/CrudEmpleats/domain/Jobs.java

@@ -8,7 +8,7 @@ public enum Jobs {
 	Programador_Senior("Programador Senior",35000),
 	Programador_Mid("Programador Mid-Level",29000), 
 	Programador_Junior("Programador Junior",21000), 
-	Administrativa("Administrativa",25000);
+	Administratiu("Administratiu",25000);
 
 	private String name;
 	private double salary;

src/main/java/com/itacademy/CrudEmpleats/exceptions/IdNotFound.java

@@ -2,6 +2,8 @@
 
 public class IdNotFound extends RuntimeException {
 
+	private static final long serialVersionUID = 1L;
+
 	private int id;
 
 	public IdNotFound(int id) {

src/main/java/com/itacademy/CrudEmpleats/persistence/EmployeeRepository.java

@@ -1,32 +1,33 @@
 package com.itacademy.CrudEmpleats.persistence;
 
+
 import java.util.*;
 
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 
 import com.itacademy.CrudEmpleats.domain.Employee;
 import com.itacademy.CrudEmpleats.exceptions.IdNotFound;
 
-@Service
+@Repository
 public class EmployeeRepository implements IEmployeeRepository{
 
 	// Els objectes persistents únicament en memòria
 
 	private static int idcount=0;
-	/*
-	private List<Employee> repository = new ArrayList<>(
-			Arrays.asList(
-					new Employee("Joan", "Director_Projectes"),
-					new Employee("Gerard", "Programador_Junior"),
-					new Employee("Maria", "Administrativa")
-					)
-			);
-	*/
-	private List<Employee> repository = new ArrayList<>(
+
+	private static List<Employee> repository = new ArrayList<>(
 			Arrays.asList(
-					new Employee(idcount++,"Joan", "Director_Projectes"),
-					new Employee(idcount++,"Gerard", "Programador_Junior"),
-					new Employee(idcount++,"Maria", "Administrativa")
+					new Employee(idcount++,"Joan Gordi", "Director_Projectes"),
+					new Employee(idcount++,"Gerard Puig", "Programador_Mid"),
+					new Employee(idcount++,"Maria Camps", "Administratiu"),
+					new Employee(idcount++,"Anaïs Iglesias", "Programador_Mid"),
+					new Employee(idcount++,"Pere Masnou", "Administratiu"),
+					new Employee(idcount++,"Laura Klaus", "Programador_Senior"),
+					new Employee(idcount++,"Jhon Smith", "Administratiu"),
+					new Employee(idcount++,"Ramón Dalmau", "Programador_Mid"),
+					new Employee(idcount++,"Joana Gracia", "Programador_Junior"),
+					new Employee(idcount++,"Quique Mota", "Administratiu"),
+					new Employee(idcount++,"Kevin Lohan", "Director_Projectes")
 					)
 			);
 

src/main/java/com/itacademy/CrudEmpleats/persistence/IEmployeeRepository.java

@@ -4,6 +4,7 @@
 
 import com.itacademy.CrudEmpleats.domain.Employee;
 
+
 public interface IEmployeeRepository {
 
 	public List<Employee> getAllEmployees();

src/main/java/com/itacademy/CrudEmpleats/service/EmployeeServices.java

@@ -0,0 +1,37 @@
+package com.itacademy.CrudEmpleats.service;
+
+import java.util.*;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.itacademy.CrudEmpleats.domain.Employee;
+import com.itacademy.CrudEmpleats.persistence.EmployeeRepository;
+
+@Service
+public class EmployeeServices {
+
+	@Autowired
+	private EmployeeRepository repositori;
+
+	public List<Employee> getAllEmployees() {
+		return repositori.getAllEmployees();
+	}
+
+	public Employee getEmployeeById(int id){
+		return repositori.getEmployeeById(id);
+	}
+
+	public void addEmployee(Employee employee) {
+		repositori.addEmployee(employee);
+	}
+
+	public void updateEmployee(Employee employee, int id) {
+		repositori.updateEmployee(employee, id);
+	}
+
+	public void deleteEmployee(int id) {
+		repositori.deleteEmployee(id);
+	}
+
+}