TeamPiped-mirror
/
Piped-Backend
mirror of https://github.com/TeamPiped/Piped-Backend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix existing code for new hibernate sanity checks.

This commit is contained in:
Kavin 2023-04-26 12:00:46 +01:00
parent c298499a30
commit f42a006d81
No known key found for this signature in database
GPG Key ID: 49451E4482CC5BCD
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java
View File

@ -109,14 +109,14 @@ public class FeedHandlers {
CriteriaQuery<Video> criteria = cb.createQuery(Video.class); CriteriaQuery<Video> criteria = cb.createQuery(Video.class);
var root = criteria.from(Video.class); var root = criteria.from(Video.class);
root.fetch("channel", JoinType.RIGHT); root.fetch("channel", JoinType.RIGHT);
var subquery = criteria.subquery(User.class); var subquery = criteria.subquery(String.class);
var subroot = subquery.from(User.class); var subroot = subquery.from(User.class);
subquery.select(subroot.get("subscribed_ids")) subquery.select(subroot.get("subscribed_ids"))
.where(cb.equal(subroot.get("id"), user.getId())); .where(cb.equal(subroot.get("id"), user.getId()));
criteria.select(root) criteria.select(root)
.where( .where(
root.get("channel").in(subquery) root.get("channel").get("uploader_id").in(subquery)
) )
.orderBy(cb.desc(root.get("uploaded"))); .orderBy(cb.desc(root.get("uploaded")));
@ -162,14 +162,14 @@ public class FeedHandlers {
CriteriaQuery<Video> criteria = cb.createQuery(Video.class); CriteriaQuery<Video> criteria = cb.createQuery(Video.class);
var root = criteria.from(Video.class); var root = criteria.from(Video.class);
root.fetch("channel", JoinType.RIGHT); root.fetch("channel", JoinType.RIGHT);
var subquery = criteria.subquery(User.class); var subquery = criteria.subquery(String.class);
var subroot = subquery.from(User.class); var subroot = subquery.from(User.class);
subquery.select(subroot.get("subscribed_ids")) subquery.select(subroot.get("subscribed_ids"))
.where(cb.equal(subroot.get("id"), user.getId())); .where(cb.equal(subroot.get("id"), user.getId()));
criteria.select(root) criteria.select(root)
.where( .where(
root.get("channel").in(subquery) root.get("channel").get("uploader_id").in(subquery)
) )
.orderBy(cb.desc(root.get("uploaded"))); .orderBy(cb.desc(root.get("uploaded")));