Skip to content

Commit 9da8d1c

Browse files
fix: Fix user submissions endpoints.
1 parent 2b26ebe commit 9da8d1c

File tree

1 file changed

+21
-24
lines changed

1 file changed

+21
-24
lines changed

src/main/java/net/modgarden/backend/data/event/Submission.java

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,16 @@ private static String selectStatement() {
186186

187187
private static String selectByUserStatement() {
188188
return """
189-
SELECT s.id, s.project_id, s.event, s.modrinth_version_id, s.submitted
190-
FROM submissions s
191-
LEFT JOIN projects p on p.id = s.project_id
192-
LEFT JOIN project_authors a on a.project_id = s.project_id
193-
WHERE p.id IN (SELECT pa.project_id
194-
FROM project_authors pa
195-
JOIN users uu
196-
ON pa.user_id = uu.id
197-
WHERE uu.id = ?
198-
OR uu.username = ?)
199-
GROUP BY s.id
189+
SELECT s.id, s.project_id, s.event, s.modrinth_version_id, s.submitted
190+
FROM submissions s
191+
LEFT JOIN projects p on p.id = s.project_id
192+
LEFT JOIN project_authors a on a.project_id = s.project_id
193+
WHERE a.user_id IN (
194+
SELECT u.id
195+
FROM users u
196+
WHERE u.id = ? OR u.username = ?
197+
)
198+
GROUP BY s.id
200199
""";
201200
}
202201

@@ -212,20 +211,18 @@ private static String selectByEventStatement() {
212211

213212
private static String selectByUserAndEventStatement() {
214213
return """
215-
SELECT s.id, s.project_id, s.event, s.modrinth_version_id, s.submitted
216-
FROM submissions s
217-
LEFT JOIN projects p on p.id = s.project_id
218-
LEFT JOIN project_authors a on a.project_id = s.project_id
219-
LEFT JOIN events e on e.id = s.event
220-
WHERE p.id IN (SELECT pa.project_id
221-
FROM project_authors pa
222-
JOIN users uu
223-
ON pa.user_id = uu.id
224-
WHERE uu.id = ?
225-
OR uu.username = ?) AND
226-
s.event = ? OR e.slug = ?
214+
SELECT s.id, s.project_id, s.event, s.modrinth_version_id, s.submitted
215+
FROM submissions s
216+
LEFT JOIN projects p on p.id = s.project_id
217+
LEFT JOIN project_authors a on a.project_id = s.project_id
218+
LEFT JOIN events e on e.id = s.event
219+
WHERE a.user_id IN (
220+
SELECT u.id
221+
FROM users u
222+
WHERE u.id = ? OR u.username = ?
223+
) AND e.id = ? OR e.slug = ?
227224
GROUP BY s.id
228-
""";
225+
""";
229226
}
230227

231228
private static DataResult<String> validate(String id) {

0 commit comments

Comments
 (0)