add code review adjustments

Author: lukaszmachaj

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/AppointmentRepository.java

@@ -15,50 +15,46 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 
 
 @Repository
 public interface AppointmentRepository extends BaseJpaRepository<AppointmentEntity, Long> {
 
-    default List<AppointmentEntity> findByCriteria(AppointmentCriteria appointmentCriteria) {
-        Objects.requireNonNull(appointmentCriteria, "appointmentCriteria must not be null");
+    default List<AppointmentEntity> findByCriteria(AppointmentCriteria criteria) {
+        Objects.requireNonNull(criteria, "criteria must not be null");
 
         CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
         CriteriaQuery<AppointmentEntity> cq = cb.createQuery(AppointmentEntity.class);
         Root<AppointmentEntity> root = cq.from(AppointmentEntity.class);
         List<Predicate> predicates = new ArrayList<>();
 
-        Optional.ofNullable(appointmentCriteria.treatmentName())
-                .map(String::trim)
-                .filter(name -> !name.isEmpty())
-                .ifPresent(name -> {
-                    Join<AppointmentEntity, TreatmentEntity> treatmentJoin = root.join("treatment", JoinType.LEFT);
-                    predicates.add(cb.like(cb.lower(treatmentJoin.get("name")), "%" + name.toLowerCase() + "%"));
-                });
-
-        Optional.ofNullable(appointmentCriteria.startDate())
-                .ifPresent(startDate -> predicates.add(cb.greaterThanOrEqualTo(root.get("dateTime"), startDate))
-                );
-
-        Optional.ofNullable(appointmentCriteria.endDate())
-                .ifPresent(endDate -> predicates.add(cb.lessThanOrEqualTo(root.get("dateTime"), endDate)));
-
-        Optional.ofNullable(appointmentCriteria.status())
-                .ifPresent(status -> predicates.add(cb.equal(root.get("status"), status)));
-
-        Optional.ofNullable(appointmentCriteria.clientId())
-                .ifPresent(clientId -> {
-                    Join<AppointmentEntity, ClientEntity> clientJoin = root.join("client", JoinType.LEFT);
-                    predicates.add(cb.equal(clientJoin.get("id"), clientId));
-                });
-
-        Optional.ofNullable(appointmentCriteria.specialistId())
-                .ifPresent(specialistId -> {
-                    Join<AppointmentEntity, TreatmentEntity> treatmentJoin = root.join("treatment", JoinType.LEFT);
-                    Join<TreatmentEntity, SpecialistEntity> specialistJoin = treatmentJoin.join("specialist", JoinType.LEFT);
-                    predicates.add(cb.equal(specialistJoin.get("id"), specialistId));
-                });
+        if (criteria.treatmentName() != null && !criteria.treatmentName().trim().isEmpty()) {
+            Join<AppointmentEntity, TreatmentEntity> treatmentJoin = root.join("treatment", JoinType.LEFT);
+            predicates.add(cb.like(cb.lower(treatmentJoin.get("name")), "%" + criteria.treatmentName().trim().toLowerCase() + "%"));
+        }
+
+        if (criteria.startDate() != null) {
+            predicates.add(cb.greaterThanOrEqualTo(root.get("dateTime"), criteria.startDate()));
+        }
+
+        if (criteria.endDate() != null) {
+            predicates.add(cb.lessThanOrEqualTo(root.get("dateTime"), criteria.endDate()));
+        }
+
+        if (criteria.status() != null) {
+            predicates.add(cb.equal(root.get("status"), criteria.status()));
+        }
+
+        if (criteria.clientId() != null) {
+            Join<AppointmentEntity, ClientEntity> clientJoin = root.join("client", JoinType.LEFT);
+            predicates.add(cb.equal(clientJoin.get("id"), criteria.clientId()));
+        }
+
+        if (criteria.specialistId() != null) {
+            Join<AppointmentEntity, TreatmentEntity> treatmentJoin = root.join("treatment", JoinType.LEFT);
+            Join<TreatmentEntity, SpecialistEntity> specialistJoin = treatmentJoin.join("specialist", JoinType.LEFT);
+            predicates.add(cb.equal(specialistJoin.get("id"), criteria.specialistId()));
+        }
 
         cq.where(predicates.toArray(new Predicate[0]));
         return getEntityManager().createQuery(cq).getResultList();
@@ -83,4 +79,5 @@ SELECT CASE WHEN COUNT(a) > 0 THEN TRUE ELSE FALSE END
             AND a.dateTime = :date
             """)
     boolean hasConflictingAppointmentBySpecialistIdAndDateTime(@Param("specialistId") Long specialistId, @Param("date") Instant date);
+
 }

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/BaseJpaRepository.java

@@ -1,11 +1,12 @@
 package com.capgemini.training.appointmentbooking.dataaccess.repository;
 
 import jakarta.persistence.EntityManager;
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
 import org.springframework.data.repository.NoRepositoryBean;
 
 @NoRepositoryBean
 public interface BaseJpaRepository<T, ID> extends JpaRepositoryImplementation<T, ID> {
+
     EntityManager getEntityManager();
-}
+
+}

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/ClientRepository.java

@@ -4,8 +4,6 @@
 import com.capgemini.training.appointmentbooking.dataaccess.entity.QClientEntity;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.QUserEntity;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import jakarta.persistence.EntityManager;
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -26,4 +24,5 @@ default List<ClientEntity> findByName(String firstName, String lastName) {
                         .and(user.lastname.eq(lastName)))
                 .fetch();
     }
+
 }

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/CustomUserRepository.java

@@ -29,4 +29,5 @@ default List<SpecialistEntity> findSpecialistByName(String firstName, String las
                 .fetch();
 
     }
+
 }

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/SpecialistRepository.java

@@ -6,7 +6,6 @@
 import com.capgemini.training.appointmentbooking.dataaccess.repository.criteria.TreatmentCriteria;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQuery;
-import jakarta.persistence.EntityManager;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -42,4 +41,5 @@ default List<TreatmentEntity> findByCriteria(TreatmentCriteria treatmentCriteria
                 .where(predicate)
                 .fetch();
     }
+
 }

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/TreatmentRepository.java

@@ -1,9 +1,44 @@
 package com.capgemini.training.appointmentbooking.dataaccess.repository;
 
 import com.capgemini.training.appointmentbooking.dataaccess.entity.UserEntity;
-import org.springframework.data.jpa.repository.JpaRepository;
+import com.capgemini.training.appointmentbooking.dataaccess.repository.criteria.UserCriteria;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import org.springframework.stereotype.Repository;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 @Repository
-public interface UserRepository extends JpaRepository<UserEntity, Long>, CustomUserRepository {
+public interface UserRepository extends BaseJpaRepository<UserEntity, Long> {
+
+    default List<UserEntity> findByCriteria(UserCriteria criteria) {
+        Objects.requireNonNull(criteria, "criteria must not be null");
+
+        EntityManager entityManager = getEntityManager();
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+        CriteriaQuery<UserEntity> cq = cb.createQuery(UserEntity.class);
+        Root<UserEntity> root = cq.from(UserEntity.class);
+        List<Predicate> predicates = new ArrayList<>();
+
+        if (criteria.firstName() != null) {
+            predicates.add(cb.like(root.get("firstname"), criteria.firstName()));
+        }
+
+        if (criteria.lastName() != null) {
+            predicates.add(cb.like(root.get("lastname"), criteria.lastName()));
+        }
+
+        if (criteria.email() != null) {
+            predicates.add(cb.like(root.get("email"), criteria.email()));
+        }
+
+        cq.where(predicates.toArray(new Predicate[0]));
+        return entityManager.createQuery(cq).getResultList();
+    }
+
 }

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/UserRepository.java

@@ -4,9 +4,8 @@
 import jakarta.persistence.EntityManager;
 import org.springframework.data.jpa.repository.support.JpaEntityInformation;
 import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
-import org.springframework.stereotype.Repository;
 
-public class BaseJpaRepositoryImpl <T, ID>  extends SimpleJpaRepository<T, ID> implements BaseJpaRepository<T, ID> {
+public class BaseJpaRepositoryImpl<T, ID> extends SimpleJpaRepository<T, ID> implements BaseJpaRepository<T, ID> {
 
     private final EntityManager entityManager;
 
@@ -16,7 +15,8 @@ public class BaseJpaRepositoryImpl <T, ID>  extends SimpleJpaRepository<T, ID> i
     }
 
     @Override
-    public EntityManager getEntityManager(){
+    public EntityManager getEntityManager() {
         return this.entityManager;
     }
-}
+
+}