diff --git a/src/main/java/me/kavin/piped/utils/DatabaseHelper.java b/src/main/java/me/kavin/piped/utils/DatabaseHelper.java index 19fcc0b..4bef70b 100644 --- a/src/main/java/me/kavin/piped/utils/DatabaseHelper.java +++ b/src/main/java/me/kavin/piped/utils/DatabaseHelper.java @@ -10,7 +10,6 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.JoinType; import javax.persistence.criteria.Root; -import java.util.List; public class DatabaseHelper { @@ -18,7 +17,7 @@ public class DatabaseHelper { CriteriaBuilder cb = s.getCriteriaBuilder(); CriteriaQuery cr = cb.createQuery(User.class); Root root = cr.from(User.class); - cr.select(root).where(root.get("sessionId").in(session)); + cr.select(root).where(cb.equal(root.get("sessionId"), session)); return s.createQuery(cr).uniqueResult(); } @@ -28,7 +27,7 @@ public class DatabaseHelper { CriteriaQuery cr = cb.createQuery(User.class); Root root = cr.from(User.class); root.fetch("subscribed_ids", JoinType.INNER); - cr.select(root).where(root.get("sessionId").in(session)); + cr.select(root).where(cb.equal(root.get("sessionId"), session)); return s.createQuery(cr).uniqueResult(); } @@ -37,35 +36,16 @@ public class DatabaseHelper { CriteriaBuilder cb = s.getCriteriaBuilder(); CriteriaQuery cr = cb.createQuery(Channel.class); Root root = cr.from(Channel.class); - cr.select(root).where(root.get("uploader_id").in(id)); + cr.select(root).where(cb.equal(root.get("uploader_id"), id)); return s.createQuery(cr).uniqueResult(); } - public static final List getChannelFromIds(Session s, List id) { - CriteriaBuilder cb = s.getCriteriaBuilder(); - CriteriaQuery cr = cb.createQuery(Channel.class); - Root root = cr.from(Channel.class); - cr.select(root).where(root.get("uploader_id").in(id)); - - return s.createQuery(cr).getResultList(); - } - - public static final List