Jobs Enum & Salaries Implemented

Author: gerardpuigl

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

@@ -2,14 +2,11 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.NoSuchElementException;
 
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.server.ResponseStatusException;
 
 import com.itacademy.CrudEmpleats.domain.Employee;
 import com.itacademy.CrudEmpleats.persistence.EmployeeRepository;
@@ -59,11 +56,7 @@ public List<Employee> allEmployees() {
 	// Busca un empleat per Id
 	@GetMapping("/Empleat/{id}")
 	public Employee getFirstEmployee(@PathVariable("id") int id) {
-		try {
 			return repositori.getEmployeeById(id);
-		} catch (NoSuchElementException e) {
-			return null;
-		}
 	}
 
 	// Actualitzar Empleat
@@ -77,7 +70,7 @@ public Employee updateEmployee(@RequestBody Employee employee, @PathVariable("id
 	@DeleteMapping("/Empleat/{id}")
 	public String deleteEmployee( @PathVariable("id") int id) {
 		repositori.deleteEmployee(id);
-		if (getFirstEmployee(id)==null) {
+		if(repositori.getEmployeeById(id)==null) {
 			return "Empleat eliminat correctament.";
 		}
 			return "L'emplat no s'ha pogut eliminar.";

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

@@ -14,13 +14,15 @@ public class Employee {
 	private int id;
 	private String name;
 	private String job;
+	private double salary ;
 
 
 
 	public Employee(String name, String job) {
 		this.id=idCount++;
 		this.name = name;
-		this.job = job;
+		this.job = Jobs.valueOf(job).getName();
+		this.salary = Jobs.valueOf(job).getSalary();
 	}
 
 	public int getId() {
@@ -39,7 +41,12 @@ public String getJob() {
 		return job;
 	}
 	public void setJob(String job) {
-		this.job = job;
+		this.job = Jobs.valueOf(job).getName();
+		this.salary = Jobs.valueOf(job).getSalary();
+	}
+
+	public double getSalary() {
+		return salary;
 	}
 
 

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

@@ -6,4 +6,28 @@ public enum Jobs {
 	 * Les feines són fixes, és a dir ja estan definits en un ENUMERABLE.
 	 * 
 	 */
+	
+	Director_Projectes("Director de projectes",50000),
+	Programador_Senior("Programador Senior",35000),
+	Programador_Mid("Programador Mid-Level",29000), 
+	Programador_Junior("Programador Junior",21000), 
+	Administrativa("Administrativa",25000);
+	
+	private String name;
+	private double salary;
+	
+	private Jobs(String name, double salary) {
+		this.name = name;
+		this.salary = salary;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	double getSalary() {
+		
+		return salary;
+	}
+	
 }

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

@@ -16,8 +16,8 @@ public class EmployeeRepository {
 
 	private List<Employee> repository = new ArrayList<>(
 			Arrays.asList(
-					new Employee("Joan", "Director de Projectes"),
-					new Employee("Gerard", "Programador"),
+					new Employee("Joan", "Director_Projectes"),
+					new Employee("Gerard", "Programador_Junior"),
 					new Employee("Maria", "Administrativa")
 					)
 			);
@@ -26,8 +26,13 @@ public List<Employee> getAllEmployees() {
 		return repository;
 	}
 
-	public Employee getEmployeeById(int id) throws NoSuchElementException{
-		return repository.stream().filter(employee -> employee.getId()==id).findFirst().get();
+	public Employee getEmployeeById(int id){
+		try {
+			return repository.stream().filter(employee -> employee.getId()==id).findFirst().get();
+		} catch (Exception e) {
+			return null;
+		}
+
 	}
 
 	public void addEmployee(Employee employee) {