[DEPLOY] v1.6 Chatting 수정 #100
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- chatting api에서 memberId 호출 부분 PD로 변경 - Store Entity 연관관계 수정 - StoreRepository class -> interface 수정 - 필요한 ErrorStatus 추가 - 채팅방 생성 api request 수정
- chatting api에서 memberId 호출 부분 PD로 변경 - Store Entity 연관관계 수정 - StoreRepository class -> interface 수정 - 필요한 ErrorStatus 추가 - 채팅방 생성 api request 수정
- develop pull & 충돌 해결
- 규칙에 맞게 Controller 수정
…urityutil-to-principaldetails' into refactor/#38-chatting-change-securityutil-to-principaldetails # Conflicts: # .gitignore # src/main/java/com/assu/server/domain/chat/controller/ChatController.java # src/main/java/com/assu/server/domain/store/entity/Store.java # src/main/java/com/assu/server/domain/store/repository/StoreRepository.java # src/main/java/com/assu/server/global/apiPayload/code/status/ErrorStatus.java
- 규칙에 맞게 Controller 수정 - 프론트 연결 중 필요한 내용 추가
인증 과정 수정
- 채팅 api 수정
…into refactor/#38-chatting-change-securityutil-to-principaldetails # Conflicts: # src/main/resources/application.yml # src/test/java/com/assu/server/ServerApplicationTests.java
[Refactor/#85] 웹소켓 인증과 잡다한 로직 수정
…into refactor/#38-chatting-change-securityutil-to-principaldetails # Conflicts: # src/main/java/com/assu/server/global/apiPayload/code/status/ErrorStatus.java
Refactor/#98 dashboard
…urityutil-to-principaldetails [Refactor] 채팅 api 수정
leesumin0526
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#️⃣연관된 이슈
📝작업 내용
🔎코드 설명(스크린샷(선택))
💬고민사항 및 리뷰 요구사항 (Optional)
비고 (Optional)