|
11 | 11 | public interface DeckJpaRepository extends JpaRepository<Deck, Long> { |
12 | 12 |
|
13 | 13 | @Query("SELECT d FROM Deck d JOIN DeckMember dm ON d.id = dm.deckId " |
14 | | - + "WHERE dm.userId = :userId AND d.deckType = :deckType " |
15 | | - + "AND dm.deletedAt IS NULL AND d.deletedAt IS NULL") |
| 14 | + + "WHERE dm.userId = :userId AND d.deckType = :deckType") |
16 | 15 | Optional<Deck> findByUserIdAndDeckType(@Param("userId") Long userId, @Param("deckType") DeckType deckType); |
17 | 16 |
|
18 | | - @Query("SELECT d FROM Deck d JOIN DeckMember dm ON d.id = dm.deckId " + "WHERE d.id = :id AND dm.userId = :userId " |
19 | | - + "AND dm.deletedAt IS NULL AND d.deletedAt IS NULL") |
| 17 | + @Query("SELECT d FROM Deck d JOIN DeckMember dm ON d.id = dm.deckId " + "WHERE d.id = :id AND dm.userId = :userId") |
20 | 18 | Optional<Deck> findByIdAndMemberUserId(@Param("id") Long id, @Param("userId") Long userId); |
21 | 19 |
|
22 | 20 | @Query("SELECT d FROM Deck d JOIN DeckMember dm ON d.id = dm.deckId " |
23 | 21 | + "WHERE dm.userId = :userId AND d.deckType != :deckType " |
24 | | - + "AND dm.deletedAt IS NULL AND d.deletedAt IS NULL " |
25 | 22 | + "ORDER BY d.createdAt DESC") |
26 | 23 | List<Deck> findByUserIdAndDeckTypeNotOrderByCreatedAtDesc( |
27 | 24 | @Param("userId") Long userId, @Param("deckType") DeckType deckType); |
28 | 25 |
|
29 | | - @Query("SELECT d FROM Deck d JOIN DeckMember dm ON d.id = dm.deckId " + "WHERE dm.userId = :userId " |
30 | | - + "AND dm.deletedAt IS NULL AND d.deletedAt IS NULL " |
| 26 | + @Query("SELECT d FROM Deck d JOIN DeckMember dm ON d.id = dm.deckId " |
| 27 | + + "WHERE dm.userId = :userId " |
31 | 28 | + "ORDER BY CASE WHEN d.deckType = :defaultType THEN 0 ELSE 1 END, d.createdAt DESC") |
32 | 29 | List<Deck> findAllByUserIdOrderByTypeAndCreatedAtDesc( |
33 | 30 | @Param("userId") Long userId, @Param("defaultType") DeckType defaultType); |
|
0 commit comments