Skip to content

Commit 7e4fdea

Browse files
committed
work
1 parent 07728cc commit 7e4fdea

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserChatMessage.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@
2727
@Index(name = "ix_user_message_row_created_at", columnList = "row_created_at")
2828
}
2929
)
30+
@NamedQueries({
31+
@NamedQuery(
32+
name = "queryFindAllMessagesBetweenCurrentAndOtherUser",
33+
query = "select m from UserChatMessage m "
34+
+ "where (m.sender = :thisUser and m.receiver = :otherUser) "
35+
+ "or (m.sender = :otherUser and m.receiver = :thisUser)",
36+
lockMode = LockModeType.READ
37+
)
38+
})
3039
@Getter
3140
@Setter
3241
@EqualsAndHashCode(callSuper = false)

src/main/java/org/woehlke/java/simpleworklist/domain/db/user/chat/ChatMessageRepository.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@
1717
@Repository
1818
public interface ChatMessageRepository extends JpaRepository<UserChatMessage, Long> {
1919

20-
//TODO: #247 move the JQL Query-String to Entity as Prepared Statement
21-
String JQL = "select m from ChatMessage m "
22-
+ "where (m.sender = :thisUser and m.receiver = :otherUser) "
23-
+ "or (m.sender = :otherUser and m.receiver = :thisUser)";
24-
25-
@Query(JQL)
20+
@Query(name="queryFindAllMessagesBetweenCurrentAndOtherUser")
2621
Page<UserChatMessage> findAllMessagesBetweenCurrentAndOtherUser(
2722
@Param("thisUser") UserAccount thisUser,
2823
@Param("otherUser") UserAccount otherUser,

0 commit comments

Comments
 (0)