diff --git a/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java b/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java index e9c4d20f74..3ebecc6622 100644 --- a/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java +++ b/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java @@ -45,7 +45,11 @@ public class SupervisorServiceImpl extends AbstractQueryService<Employee, Long> } @Override - public List<Employee> findByUsersName(final Date dateCreated) { + public Iterable<Employee> findByUsersName(final Date dateCreated) { + + //queryDslPredicateExecutor.findOne(); + + QEmployee employee = QEmployee.employee; BooleanExpression lastName = employee.user.lastName.eq("Vahlman"); BooleanExpression isNewEmployee = employee.user.dateCreated.eq(dateCreated); diff --git a/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java b/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java index 418a726b6a..06d3ef722c 100644 --- a/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java +++ b/src/main/java/se/su/dsv/scipro/springdata/services/SupervisorService.java @@ -11,5 +11,5 @@ import java.util.List; public interface SupervisorService extends CrudService<Employee,Long>, QueryService<Employee, Long> { public List<Employee> findAllEmployees(org.springframework.data.domain.Sort orders); - public List<Employee> findByUsersName(final Date dateCreated); + public Iterable<Employee> findByUsersName(final Date dateCreated); } diff --git a/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java b/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java index 1fb987c45e..f7ef66d5fd 100644 --- a/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java +++ b/src/test/java/se/su/dsv/scipro/springdata/TestSupervisor.java @@ -144,7 +144,9 @@ public class TestSupervisor { Employee vahlman = getEmployee("Tom", "Vahlman", "tom@dsv.su.se"); vahlman.getUser().setDateCreated(dateCreated); vahlman = supervisorService.save(vahlman); - employeeList.addAll(supervisorService.findByUsersName(dateCreated)); + for(Employee employee : supervisorService.findByUsersName(dateCreated)) { + employeeList.add(employee); + } assertFalse(employeeList.isEmpty()); assertTrue(employeeList.get(0).equals(vahlman)); }