diff --git a/MoviesCommon/src/main/java/at.technikumwien.movies/Actors.java b/MoviesCommon/src/main/java/at.technikumwien.movies/Actors.java index 987113b..22d6ddf 100644 --- a/MoviesCommon/src/main/java/at.technikumwien.movies/Actors.java +++ b/MoviesCommon/src/main/java/at.technikumwien.movies/Actors.java @@ -19,8 +19,8 @@ import java.time.LocalDate; query = "SELECT a FROM Actors a WHERE " + "a.firstname LIKE :firstname AND " + "a.lastname LIKE :lastname AND " + - "a.sex = :sex"// AND " + - //"a.birthdate = :birthdate" + "a.sex = :sex AND " + + "a.birthdate = :birthdate" ), @NamedQuery( name = "Actors.selectAllActors", diff --git a/MoviesWebApp/src/main/java/at/technikumwien/movies/MoviesService.java b/MoviesWebApp/src/main/java/at/technikumwien/movies/MoviesService.java index a30cb06..070e8d8 100644 --- a/MoviesWebApp/src/main/java/at/technikumwien/movies/MoviesService.java +++ b/MoviesWebApp/src/main/java/at/technikumwien/movies/MoviesService.java @@ -70,9 +70,8 @@ public class MoviesService { @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public void save(List movies) { - for (Movies movie : movies) { - - try { + try { + for (Movies movie : movies) { // Get studio for the movie from the database Studios movieStudio = movie.getStudio(); LOGGER.info("Get a studio" + movieStudio); @@ -101,7 +100,7 @@ public class MoviesService { .setParameter("firstname", movieActor.getFirstname()) .setParameter("lastname", movieActor.getLastname()) .setParameter("sex", movieActor.getSex()) - //.setParameter("birthdate", movieActor.getBirthdate()) + .setParameter("birthdate", movieActor.getBirthdate()) .getResultList(); if (!actorListResult.isEmpty() && actorListResult.size() > 0) { @@ -116,13 +115,13 @@ public class MoviesService { } } } - catch (Exception e) { - e.printStackTrace(); + + LOGGER.info("save() >> movies" + movies); + for (Movies movieToImport : movies) { + em.merge(movieToImport); } - } - LOGGER.info("save() >> movies" + movies); - for (Movies movie : movies) { - em.merge(movie); + } catch (Exception e) { + e.printStackTrace(); } } } \ No newline at end of file