Skip to content

[MERGE] [BVFH-170] main 브렌치에 병합 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
Mongjo merged 76 commits into from
Jun 23, 2025
Merged

[MERGE] [BVFH-170] main 브렌치에 병합 #27

Mongjo merged 76 commits into from
Jun 23, 2025

Conversation

@Mongjo
Copy link
Contributor

@Mongjo Mongjo commented Jun 23, 2025

🔗 관련 JIRA KEY

PR 제목 앞에 Jira 키를 포함해주세요
예: [FEAT] PMEL-200 - 기능 제목

BVFH-170

📝 작업 내용 요약

이번 PR에서 작업한 내용을 간략히 설명해주세요.

  • 채팅 서비스 develop -> main 브렌치에 병합

📸 스크린샷 (선택)

UI 변경이 있을 경우, 전/후 비교 스크린샷 또는 동작 GIF를 첨부해주세요.

---해당없음

✅ 체크리스트

  • PR 제목에 Jira Key 포함했나요? (PMEL-123 등)
  • 로컬 테스트를 완료했나요?
  • 리뷰어를 지정했나요?

Mongjo and others added 30 commits June 9, 2025 21:58
@Mongjo
[FEAT] [BVFH-198] Implements Create Private ChatRoom
8c5f6f4
@Mongjo
[FIX] [BVFH-198] Fix createPrivateChatRoom Error Handling
e38f543
@Mongjo
[FEAT] [BVFH-209] add websocket, kafka config
c280e2e
@Mongjo
[FEAT] [BVFH-209] implements connect websocket, send message
f18ba90
@Mongjo
[FEAT] [BVFH-209] add WebSocket Interceptor of validation chatroom, m…
d7f4d81 
…ember
@Mongjo
[FEAT] [BVFH-209] implements getMessagesHistory by Cursor-based Pagin…
e8eecf1 
…ation
@Mongjo
[FEAT] [BVFH-209] add nickname field to ChatMessageDocument
9688783
@Mongjo
[FEAT] [BVFH-209] add nickname field to ChatMessageDocument
386f0b1
@Mongjo
[FIX] [BVFH-209] change kafka topic name
a7f5421
@Mongjo
Merge pull request #1 from Spharos-team1/BVFH-198-chatroom
7e14ebd 
[BVFH-198] 채팅방 생성
@Mongjo
Merge pull request #2 from Spharos-team1/BVFH-209-chat-message-basic
f7796f0 
[BVFH-209] 채팅 전송
@Mongjo
[FEAT] [BVFH-244] add ChatReadCheckPoint Document, Dto, Repository
0396a54
@Mongjo
[FEAT] [BVFH-244] add ChatReadCheckPoint Document, Dto, Repository
4778612
@Mongjo
[REFACTOR] [BVFH-209] improve Kafka-WebSocket error handling and conf…
9183efb 
…ig with timeout, fallback, and WS error propagation
@chuman0216
Merge pull request #3 from Spharos-team1/BVFH-209-chat-message-basic
a319045
@Mongjo
[MERGE] [BVFH-244] merge by develop
2904bdd
@Mongjo
[FEAT] [BVFH-244] implements Message Read CheckPoint
da46823
@chuman0216
Merge pull request #4 from Spharos-team1/BVFH-244-chat-read
b85b01b 
[FEAT] [BVFH-244] 메시지 읽음 처리
@Mongjo
[FEAT] [BVFH-245] implements get member chatroom list
94cc783
@Mongjo
[FEAT] [BVFH-245] implements update chatroom summary at message save,…
2c1e4f1 
… read-point update
@Mongjo
[FEAT] [BVFH-245] implements get read check-point
ed0d3ac
@Mongjo
[FEAT] [BVFH-245] implements publish chatroom summary update event on…
9407fe6 
… kafka
@chuman0216
Merge pull request #5 from Spharos-team1/BVFH-245-chat-room-list
b73f0ec 
[FEAT] [BVFH-245] 채팅방 리스트 요약 정보 구현
@Mongjo
[CHORE] [BVFH-198] update swagger config, controller
b24f178
@Mongjo
Merge pull request #7 from Spharos-team1/BVFH-198-chatroom
d998b28 
[CHORE] [BVFH-198]  swagger config, controller 수정
@Mongjo
[FEAT] [BVFH-286] implements get pre-signed-url api
6ffb55b
@Mongjo
[FEAT] [BVFH-286] implements send image chat
d6d6cec
@Mongjo
delete comment PreSignedUrlUtil.java
ed87334
@Mongjo
Merge pull request #8 from Spharos-team1/BVFH-286-chat-image
a0e8f88 
[FEAT] [BVFH-286] 채팅 이미지 전송
@Mongjo
[FEAT] [BVFH-290] implements exit chatroom
5863b3a
Mongjo and others added 29 commits June 20, 2025 15:10
@Mongjo
[FEAT] [BVFH-290] set websocket hearbeat
850b176
@Mongjo
Update ChatMessageQueryController.java
8805c6b
@Mongjo
Update application.yml
bf6857b
@Mongjo
Update application.yml
6363e20
@Mongjo
Merge pull request #16 from Spharos-team1/BVFH-290-chatroom-exit
92cb82b 
[FEAT] [BVFH-290] websocket heartbeat 설정
@Mongjo
[FIX] [BVFH-290] fix websocket hearbeat
90b38c2
@Mongjo
Merge branch 'BVFH-170-develop' of https://github.com/Spharos-team1/c…
db446e3 
…hat-service into BVFH-290-chatroom-exit
@Mongjo
Merge pull request #17 from Spharos-team1/BVFH-290-chatroom-exit
5404509 
[FIX] [BVFH-290] websocket heartbeat 수정
@Mongjo
Update SwaggerConfig.java
b6aa6d1
@Mongjo
[CHORE] [BVFH-290] update swagger controller description
dc75bf2
@Mongjo
Merge pull request #18 from Spharos-team1/BVFH-290-chatroom-exit
36eaa05 
[CHORE] [BVFH-290] 스웨거 컨트롤러 설명 수정
@Mongjo
[FEAT] [BVFH-198] implements get chatroom info
152ad4b
@chuman0216
Merge pull request #20 from Spharos-team1/BVFH-198-chatroom
b5208e4 
[FEAT] [BVFH-198] 채팅방 정보 조회
@Mongjo
[FEAT] [BVFH-198] implements get chatroom uuid by postuuid
a2eb38b
@Mongjo
Merge pull request #21 from Spharos-team1/BVFH-198-chatroom
67bb4b6 
[FEAT] [BVFH-198] 게시글의 채팅방 uuid 조회
@Mongjo
[FEAT] [BVFH-307] implements send chat reply message
0cd3cc8
@Mongjo
[FIX] [BVFH-307] include reply message fields in chat history response
11356f3
@Mongjo
[CHORE] [BVFH-307] update getMessagesHistory Controller Operation des…
52079e5 
…cription
@Mongjo
[CHORE] [BVFH-307] remove unused imports
06d28dd
@chuman0216
Merge pull request #22 from Spharos-team1/BVFH-307-chat-comment
e91129e 
[FEAT] [BVFH-307] 메시지 답글 기능
@Mongjo
[FIX] [BVFH-307] add EnableJpaAuditing Annotation at main class
3989587
@Mongjo
Merge pull request #23 from Spharos-team1/BVFH-307-chat-comment
271f40a 
[FIX] [BVFH-307] 시작 클래스에 @EnableJpaAuditing 추가
@Mongjo
Revert "[FIX] [BVFH-307] 시작 클래스에 @EnableJpaAuditing 추가"
b64da66
@Mongjo
Merge pull request #24 from Spharos-team1/revert-23-BVFH-307-chat-com…
3724a90 
…ment

Revert "[FIX] [BVFH-307] 시작 클래스에 @EnableJpaAuditing 추가"
@Mongjo
[CHORE] [BVFH-307] allowed all origins
7e90f24
@Mongjo
[CHORE] [BVFH-307] allowed all origins
fc38dd5
@Mongjo
Merge pull request #25 from Spharos-team1/BVFH-307-chat-comment
301a060 
[CHORE] [BVFH-307] 모든 요청 경로 허용(테스트를 위함)
@Mongjo
[CHORE] [BVFH-311] update webconfig
193c788
@Mongjo
Merge pull request #26 from Spharos-team1/BVFH-311-chat-optimize
046d2fe 
[CHORE] [BVFH-311] webconfig 수정
@Mongjo Mongjo merged commit 3edd899 into main Jun 23, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Mongjo @chuman0216