Refactor: Updated Doctor and Patient specs.

elwyncrestha · Jul 15, 2020 · 1b48c17 · 1b48c17
1 parent dadaec7
commit 1b48c17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pemits-api/src/main/java/com/pemits/webcare/api/doctor/repository/spec/DoctorSpec.java b/pemits-api/src/main/java/com/pemits/webcare/api/doctor/repository/spec/DoctorSpec.java
@@ -31,7 +31,7 @@ public Predicate toPredicate(Root<Doctor> root, CriteriaQuery<?> criteriaQuery,
  CriteriaBuilder criteriaBuilder) {
  switch (property) {
  case FILTER_BY_NAME:
- return criteriaBuilder.equal(root.join("user").get("name"), value.toLowerCase());
+ return criteriaBuilder.like(root.join("user").get("name"), "%" + value.toLowerCase() + "%");
  case FILTER_BY_USER_ID:
  return criteriaBuilder.equal(root.join("user").get("id"), Long.valueOf(value));
  case FILTER_BY_DEPARTMENT_ID:

diff --git a/pemits-api/src/main/java/com/pemits/webcare/api/patient/repository/spec/PatientSpec.java b/pemits-api/src/main/java/com/pemits/webcare/api/patient/repository/spec/PatientSpec.java
@@ -15,6 +15,7 @@
 public class PatientSpec implements Specification<Patient> {
 
  private static final String FILTER_BY_USER_ID = "user.id";
+ private static final String FILTER_BY_NAME = "user.name";
 
  private final String property;
  private final String value;
@@ -30,6 +31,8 @@ public Predicate toPredicate(Root<Patient> root, CriteriaQuery<?> criteriaQuery,
  switch (property) {
  case FILTER_BY_USER_ID:
  return criteriaBuilder.equal(root.join("user").get("id"), Long.valueOf(value));
+ case FILTER_BY_NAME:
+ return criteriaBuilder.like(root.join("user").get("name"), "%" + value.toLowerCase() + "%");
  default:
  return null;
  }