From cf23b7842af650fa2ea65f3cc9289afbf34c6bf6 Mon Sep 17 00:00:00 2001
From: Alexey Zinchenko <alexey.zinchenko@protonmail.com>
Date: Fri, 10 May 2019 02:41:59 +0300
Subject: [PATCH] Fixed person validation. Removed unused code.

---
 .../java/com/github/prominence/carrepair/model/Person.java  | 6 +++---
 .../prominence/carrepair/repository/ClientRepository.java   | 3 ---
 .../prominence/carrepair/repository/MechanicRepository.java | 3 ---
 .../github/prominence/carrepair/service/ClientService.java  | 4 ----
 .../prominence/carrepair/service/MechanicService.java       | 4 ----
 .../github/prominence/carrepair/service/OrderService.java   | 4 ----
 6 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/github/prominence/carrepair/model/Person.java b/src/main/java/com/github/prominence/carrepair/model/Person.java
index 1d79e37..d614254 100644
--- a/src/main/java/com/github/prominence/carrepair/model/Person.java
+++ b/src/main/java/com/github/prominence/carrepair/model/Person.java
@@ -1,7 +1,7 @@
 package com.github.prominence.carrepair.model;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import java.util.Objects;
 
@@ -12,7 +12,7 @@ abstract public class Person {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     protected Long id;
 
-    @NotNull
+    @NotBlank
     @Size(max = 64)
     @Column(name = "firstName")
     protected String firstName;
@@ -21,7 +21,7 @@ abstract public class Person {
     @Column(name = "middleName")
     protected String middleName;
 
-    @NotNull
+    @NotBlank
     @Size(max = 64)
     @Column(name = "lastName")
     protected String lastName;
diff --git a/src/main/java/com/github/prominence/carrepair/repository/ClientRepository.java b/src/main/java/com/github/prominence/carrepair/repository/ClientRepository.java
index f8ee66f..b18b00c 100644
--- a/src/main/java/com/github/prominence/carrepair/repository/ClientRepository.java
+++ b/src/main/java/com/github/prominence/carrepair/repository/ClientRepository.java
@@ -11,9 +11,6 @@ import java.util.List;
 @Repository
 public interface ClientRepository extends JpaRepository<Client, Long> {
 
-    @Query(value = "select c.id from Client c")
-    public List<Long> findAllClientIds();
-
     @Query(value = "select c from Client c where c.firstName like concat('%', :query, '%') or c.middleName like concat('%', :query, '%') or c.lastName like concat('%', :query, '%')")
     public List<Client> findAllByInitials(@Param(value = "query") String query);
 }
diff --git a/src/main/java/com/github/prominence/carrepair/repository/MechanicRepository.java b/src/main/java/com/github/prominence/carrepair/repository/MechanicRepository.java
index 6fb11c6..8ac78a5 100644
--- a/src/main/java/com/github/prominence/carrepair/repository/MechanicRepository.java
+++ b/src/main/java/com/github/prominence/carrepair/repository/MechanicRepository.java
@@ -11,9 +11,6 @@ import java.util.List;
 @Repository
 public interface MechanicRepository extends JpaRepository<Mechanic, Long> {
 
-    @Query(value = "select m.id from Mechanic m")
-    public List<Long> findAllMechanicIds();
-
     @Query(value = "select m from Mechanic m where m.firstName like concat('%', :query, '%') or m.middleName like concat('%', :query, '%') or m.lastName like concat('%', :query, '%')")
     public List<Mechanic> findAllByInitials(@Param(value = "query") String query);
 }
diff --git a/src/main/java/com/github/prominence/carrepair/service/ClientService.java b/src/main/java/com/github/prominence/carrepair/service/ClientService.java
index 9dfed06..d5e3494 100644
--- a/src/main/java/com/github/prominence/carrepair/service/ClientService.java
+++ b/src/main/java/com/github/prominence/carrepair/service/ClientService.java
@@ -43,10 +43,6 @@ public class ClientService {
         return clientRepository.count();
     }
 
-    public List<Long> getAllClientIds() {
-        return clientRepository.findAllClientIds();
-    }
-
     public List<Client> searchByInitials(String query) {
         return clientRepository.findAllByInitials(query);
     }
diff --git a/src/main/java/com/github/prominence/carrepair/service/MechanicService.java b/src/main/java/com/github/prominence/carrepair/service/MechanicService.java
index e479eec..fda5746 100644
--- a/src/main/java/com/github/prominence/carrepair/service/MechanicService.java
+++ b/src/main/java/com/github/prominence/carrepair/service/MechanicService.java
@@ -63,10 +63,6 @@ public class MechanicService {
         return mechanicRepository.count();
     }
 
-    public List<Long> getAllMechanicIds() {
-        return mechanicRepository.findAllMechanicIds();
-    }
-
     public List<Mechanic> searchByInitials(String query) {
         return mechanicRepository.findAllByInitials(query);
     }
diff --git a/src/main/java/com/github/prominence/carrepair/service/OrderService.java b/src/main/java/com/github/prominence/carrepair/service/OrderService.java
index 5c34468..9662dbc 100644
--- a/src/main/java/com/github/prominence/carrepair/service/OrderService.java
+++ b/src/main/java/com/github/prominence/carrepair/service/OrderService.java
@@ -30,10 +30,6 @@ public class OrderService {
         this.orderValidator = orderValidator;
     }
 
-    public Page<Order> findAll(Pageable pageable) {
-        return orderRepository.findAll(pageable);
-    }
-
     public Page<Order> findAll(Specification<Order> specification, Pageable pageable) {
         return orderRepository.findAll(specification, pageable);
     }