Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
a551848
chore #7: webSocket 관련 build.gradle 설정 추가
ghkdwldus0807 May 4, 2025
633de32
feat #7: webSocket config 추가
ghkdwldus0807 May 4, 2025
a59e4d5
feat #7: SendChatMessageRequest DTO 추가 및 ChatMessage 정적 팩토리 메서드 추가
ghkdwldus0807 May 5, 2025
05f4e08
feat #7: ChatMessage 및 ChatRoom Entity Builder, 정적 팩토리 메소드 추가
ghkdwldus0807 May 7, 2025
880a07a
feat #7: ChatMessage 및 ChatRoom의 Request DTO,Response DTO 추가
ghkdwldus0807 May 7, 2025
52300ae
remove #7: SendChatMessageRequest DTO 삭제
ghkdwldus0807 May 7, 2025
ea4dcb7
feat #7: ChatMessage 및 ChatRoom DTO Mappper 추가
ghkdwldus0807 May 7, 2025
6da2304
feat #7: ChatRoom & ChatMessage Create API init
ghkdwldus0807 May 7, 2025
ca170d2
feat #7: ChatRoom Error Code
ghkdwldus0807 May 7, 2025
dc52ac7
Merge branch 'dev' of https://github.com/URECA-DangSim/dangsim-be int…
ghkdwldus0807 May 7, 2025
21b4d1d
feat #7: ChatRoom Create API 추가
ghkdwldus0807 May 7, 2025
1ee06ee
fix #7: 불필요한 @Transactional 제거
ghkdwldus0807 May 8, 2025
2622d59
feat #7: 채팅방 생성 및 조회 API
ghkdwldus0807 May 8, 2025
e25e52b
rename #7: 채팅방 생성 Request DTO 명칭 변경
ghkdwldus0807 May 8, 2025
4f04da2
Merge branch 'dev' of https://github.com/URECA-DangSim/dangsim-be int…
ghkdwldus0807 May 8, 2025
48607a5
feat #7: ErrorCode Enum 추가
ghkdwldus0807 May 9, 2025
14af7d0
fix #7: 채팅방 목록 조회 query dsl repository where절 하나로 병합
ghkdwldus0807 May 9, 2025
9c37663
fix #7: User ErrorCode로 예외처리 변경
ghkdwldus0807 May 9, 2025
9ff2839
feat #7: WebSocket 환경 설정 & 웹소켓에서의 jwt token 검증
ghkdwldus0807 May 9, 2025
3a9540e
feat #7: WebSocket 실시간 채팅 Controller 추가
ghkdwldus0807 May 9, 2025
15154a9
feat #7: WebSocket 실시간 채팅 메시지 DTO 추가
ghkdwldus0807 May 9, 2025
fbadaae
feat #7: websocket 브로드캐스트 경로 추가
ghkdwldus0807 May 9, 2025
5c2b4b9
fix #7: ChatMessage 정적 팩토리 메서드 수정
ghkdwldus0807 May 9, 2025
a2055b1
Merge branch 'dev' of https://github.com/URECA-DangSim/dangsim-be int…
ghkdwldus0807 May 9, 2025
a456b43
feat #7: 채팅방 상세 조회 Controller 추가
ghkdwldus0807 May 12, 2025
fa999ea
feat #7: 채팅방 상세 조회 Service 추가
ghkdwldus0807 May 12, 2025
dc5a326
feat #7: 채팅방 상세 조회 Query DSL 추가
ghkdwldus0807 May 12, 2025
bba1e58
feat #7: 채팅방 상세 조회 Response DTO 추가
ghkdwldus0807 May 12, 2025
bd38b73
fix #7: 채팅방 마지막 메시지 날짜 형 변환 수정
ghkdwldus0807 May 12, 2025
23855ef
style #7: 코드 포맷팅
ghkdwldus0807 May 12, 2025
6747cf7
refactor #7: String 변수 상수화
ghkdwldus0807 May 12, 2025
bdfc7e7
fix #7: MessageType enum에 string messageType 추가
ghkdwldus0807 May 12, 2025
d320403
fix #7: 누락된 어노테이션 추가 및 조건절 수정
ghkdwldus0807 May 12, 2025
b73c9af
refactor #7:Boolean Expression을 공통 메서드로 추출
ghkdwldus0807 May 12, 2025
afe2331
Merge branch 'dev' of https://github.com/URECA-DangSim/dangsim-be int…
ghkdwldus0807 May 12, 2025
e2417eb
Merge branch 'dev' of https://github.com/URECA-DangSim/dangsim-be int…
ghkdwldus0807 May 14, 2025
c0a5465
Merge branch 'dev' of https://github.com/URECA-DangSim/dangsim-be int…
ghkdwldus0807 May 14, 2025
6e4f77e
Merge branch 'dev' of https://github.com/URECA-DangSim/dangsim-be int…
ghkdwldus0807 May 14, 2025
c86257d
fix #52: chatRoomTaskInfo 조회 시 자신의 userId를 응답으로 반환하도록 변경
ghkdwldus0807 May 16, 2025
b86c3a0
fix #52: chatRoom 생성 시 첫 메시지도 생성되도록 변경
ghkdwldus0807 May 16, 2025
079c660
fix #52: chatRoom 및 message ID 기반 조회로 변경 (QueryDSL)
ghkdwldus0807 May 16, 2025
a5ce7b5
fix #52: 웹소켓 관련 환경 설정 변경 및 security 변경
ghkdwldus0807 May 16, 2025
2c11ec9
conflict merge
ghkdwldus0807 May 16, 2025
4d20a34
test #52: TaskService Mock 추가
ghkdwldus0807 May 16, 2025
6996858
fix #59: 웹소켓 기반 실시간 메시지 전송 시 userId를 body에서 받은 후 인증하도록 수정
ghkdwldus0807 May 16, 2025
c2e05dc
fix #59: Task 완료 boolean 값 수정
ghkdwldus0807 May 16, 2025
d511706
feat #59: 메시지 queryDSL 수정
ghkdwldus0807 May 16, 2025
2fe3502
Merge branch 'dev' into fix-52-chatApi
ghkdwldus0807 May 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public CursorPageResponse<ChatRoomDetailResponse> findChatMessagesByCursor(Long
boolean hasNext = allMessages.size() > size;
List<ChatMessageDetailResponse> pageMessages = subLastPage(allMessages, hasNext);
String nextCursor = getNextCursorByMessage(pageMessages, hasNext);
System.out.println("nextCursor = " + nextCursor);

ChatRoomDetailResponse detailResponse = new ChatRoomDetailResponse(chatRoomId, pageMessages);

Expand Down Expand Up @@ -136,7 +137,7 @@ private String getNextCursorByMessage(List<ChatMessageDetailResponse> messages,
if (Objects.isNull(messages) || messages.isEmpty() || !hasNext) {
return null;
}
return messages.get(messages.size() - 1).timeStamp();
return String.valueOf(messages.get(messages.size() - 1).messageId());
}

private <T> List<T> subLastPage(List<T> list, boolean hasNext) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dangsim/common/config/CorsConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
// }
// };
// }
// }
// }
3 changes: 0 additions & 3 deletions src/test/java/com/dangsim/task/service/TaskServiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
import java.util.List;
import java.util.Optional;

import com.dangsim.payment.entity.PaymentStatus;
import com.dangsim.pg.repository.PaymentGatewayRepository;
import com.dangsim.pg.service.PaymentGatewayService;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down