Merge origin/master

Uniandes-ISIS2603-backup · Mar 15, 2017 · 27359f7 · 27359f7
2 parents 6a4c050 + e413401
commit 27359f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/musica-02-logic/src/main/java/co/edu/uniandes/csw/musica/persistence/ReviewPersistence.java b/musica-02-logic/src/main/java/co/edu/uniandes/csw/musica/persistence/ReviewPersistence.java
@@ -27,14 +27,14 @@ public ReviewEntity find(Long id) {
     }
 
     public List<ReviewEntity> findAll(Long id) {
-        TypedQuery<ReviewEntity> q = em.createQuery("select u from ReviewEntity u WHERE u.funcion = :hola", ReviewEntity.class);
+        TypedQuery<ReviewEntity> q = em.createQuery("select u from ReviewEntity u WHERE u.funcion.id = :hola", ReviewEntity.class);
         q = q.setParameter("hola", id);
         List<ReviewEntity> allReviews = q.getResultList();
         return allReviews;
     }
     public List<ReviewEntity> findAllparaFuncion(Long id)
     {
-        TypedQuery<ReviewEntity> q = em.createQuery("select u from ReviewEntity u where u.funcion = :id", ReviewEntity.class);
+        TypedQuery<ReviewEntity> q = em.createQuery("select u from ReviewEntity u where u.funcion.id = :id", ReviewEntity.class);
         q = q.setParameter("id", id);
         List<ReviewEntity> revs = q.getResultList();
         if (revs.isEmpty() ) {

diff --git a/musica-02-web/src/main/java/co/edu/uniandes/csw/musica/resources/ReviewResource.java b/musica-02-web/src/main/java/co/edu/uniandes/csw/musica/resources/ReviewResource.java
@@ -50,9 +50,8 @@ private List<ReviewDetailDTO> listEntity2DTO(List<ReviewEntity> entityList) {
     }
 
     @GET
-    public List<ReviewDetailDTO> getReviews(@QueryParam("id") Long id) 
+    public List<ReviewDetailDTO> getReviews(@PathParam("id") Long id) 
     {
-        System.out.println("hola");
         return listEntity2DTO(logic.getReviews(id));
     } 
     @POST