Added ControllerUtils. Fixed EmployeeController and Employee entity.

Author: merikbest

pom.xml

@@ -48,6 +48,22 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.1.6.Final</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

src/main/java/com/gmail/merikbest2015/springbootreactjscrudapp/controller/ControllerUtils.java

@@ -0,0 +1,18 @@
+package com.gmail.merikbest2015.springbootreactjscrudapp.controller;
+
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+
+import java.util.Map;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+
+public class ControllerUtils {
+    static Map<String, String> getErrors(BindingResult bindingResult) {
+        Collector<FieldError, ?, Map<String, String>> collector = Collectors.toMap(
+                fieldError -> fieldError.getField() + "Error",
+                FieldError::getDefaultMessage
+        );
+        return bindingResult.getFieldErrors().stream().collect(collector);
+    }
+}

src/main/java/com/gmail/merikbest2015/springbootreactjscrudapp/controller/EmployeeController.java

@@ -4,9 +4,12 @@
 import com.gmail.merikbest2015.springbootreactjscrudapp.model.Employee;
 import com.gmail.merikbest2015.springbootreactjscrudapp.service.EmployeeService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,37 +27,57 @@ public EmployeeController(EmployeeService employeeService) {
     }
 
     @GetMapping("/employees")
-    public List<Employee> getAllEmployees() {
-        return employeeService.findAll();
+    public ResponseEntity<?> getAllEmployees() {
+        List<Employee> employees = employeeService.findAll();
+
+        return new ResponseEntity<>(employees, HttpStatus.OK);
     }
 
     @PostMapping("/employees")
-    public Employee createEmployee(@RequestBody Employee employee) {
-        return employeeService.save(employee);
+    public ResponseEntity<?> createEmployee(@RequestBody @Valid Employee employee, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            Map<String, String> errorsMap = ControllerUtils.getErrors(bindingResult);
+
+            return new ResponseEntity<>(errorsMap, HttpStatus.BAD_REQUEST);
+        } else {
+            Employee savedEmployee = employeeService.save(employee);
+
+            return new ResponseEntity<>(savedEmployee, HttpStatus.CREATED);
+        }
     }
 
     @GetMapping("/employees/{id}")
-    public ResponseEntity<Employee> getEmployeeById(@PathVariable Long id) {
+    public ResponseEntity<?> getEmployeeById(@PathVariable Long id) {
         Employee employee = employeeService.findById(id)
                 .orElseThrow(() -> new ResourceNotFoundException("Employee not exist with id: " + id));
 
-        return ResponseEntity.ok(employee);
+        return new ResponseEntity<>(employee, HttpStatus.OK);
     }
 
     @PutMapping("/employees/{id}")
-    public ResponseEntity<Employee> updateEmployee(@PathVariable Long id, @RequestBody Employee employeeDetails) {
-        Employee employee = employeeService.findById(id)
-                .orElseThrow(() -> new ResourceNotFoundException("Employee not exist with id: " + id));
-
-        employee.setFirstName(employeeDetails.getFirstName());
-        employee.setLastName(employeeDetails.getLastName());
-        employee.setCity(employeeDetails.getCity());
-        employee.setAddress(employeeDetails.getAddress());
-        employee.setTelephone(employeeDetails.getTelephone());
-
-        Employee updatedEmployee = employeeService.save(employee);
-
-        return ResponseEntity.ok(updatedEmployee);
+    public ResponseEntity<?> updateEmployee(
+            @PathVariable Long id,
+            @RequestBody @Valid Employee employeeDetails,
+            BindingResult bindingResult
+    ) {
+        if (bindingResult.hasErrors()) {
+            Map<String, String> errorsMap = ControllerUtils.getErrors(bindingResult);
+
+            return new ResponseEntity<>(errorsMap, HttpStatus.BAD_REQUEST);
+        } else {
+            Employee employee = employeeService.findById(id)
+                    .orElseThrow(() -> new ResourceNotFoundException("Employee not exist with id: " + id));
+
+            employee.setFirstName(employeeDetails.getFirstName());
+            employee.setLastName(employeeDetails.getLastName());
+            employee.setCity(employeeDetails.getCity());
+            employee.setAddress(employeeDetails.getAddress());
+            employee.setTelephone(employeeDetails.getTelephone());
+
+            employeeService.save(employee);
+
+            return new ResponseEntity<>(HttpStatus.OK);
+        }
     }
 
     @DeleteMapping("/employees/{id}")
@@ -66,6 +89,7 @@ public ResponseEntity<Map<String, Boolean>> deleteEmployee(@PathVariable Long id
         Map<String, Boolean> response = new HashMap<>();
         response.put("deleted", Boolean.TRUE);
 
-        return ResponseEntity.ok(response);
+        return new ResponseEntity<>(response, HttpStatus.NO_CONTENT);
+//        return ResponseEntity.ok(response);
     }
 }

src/main/java/com/gmail/merikbest2015/springbootreactjscrudapp/model/Employee.java

@@ -2,33 +2,32 @@
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
 
 @Entity
 @Table(name = "employees")
 @Data
 @NoArgsConstructor
-@RequiredArgsConstructor
 public class Employee {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    @NonNull
+    @NotBlank(message = "Empty field!")
     @Column(name = "first_name")
     private String firstName;
-    @NonNull
+    @NotBlank(message = "Empty field!")
     @Column(name = "last_name")
     private String lastName;
-    @NonNull
+    @NotBlank(message = "Empty field!")
     @Column(name = "city")
     private String city;
-    @NonNull
+    @NotBlank(message = "Empty field!")
     @Column(name = "address")
     private String address;
-    @NonNull
+    @NotBlank(message = "Empty field!")
     @Column(name = "telephone")
     private String telephone;
 }

src/main/resources/application.properties

@@ -3,4 +3,5 @@ spring.datasource.username=root
 spring.datasource.password=root
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 spring.jpa.hibernate.ddl-auto=validate
-spring.jpa.generate-ddl=false
+spring.jpa.generate-ddl=false
+spring.flyway.locations=classpath:/db/migration