[BE] 백엔드 develop 브랜치로 merge #482
Merged
Conversation
This file contains 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
Co-authored-by: pakxe <[email protected]>, soi-ha <[email protected]>, jinhokim98 <[email protected]>
Co-authored-by: JinHo Kim <[email protected]> Co-authored-by: Pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>, soi-ha <[email protected]>, jinhokim98 <[email protected]>
Co-authored-by: pakxe <[email protected]>, soi-ha <[email protected]>, jinhokim98 <[email protected]>
Co-authored-by: pakxe <[email protected]>, soi-ha <[email protected]>, jinhokim98 <[email protected]>, Todari <[email protected]>
Co-authored-by: pakxe <[email protected]>, soi-ha <[email protected]>, jinhokim98 <[email protected]>, Todari <[email protected]>
Co-authored-by: pakxe <[email protected]>, soi-ha <[email protected]>, jinhokim98 <[email protected]>, Todari <[email protected]>
Co-authored-by: pakxe <[email protected]>, soi-ha <[email protected]>, jinhokim98 <[email protected]>, Todari <[email protected]>
Co-authored-by: pakxe <[email protected]>, soi-ha <[email protected]>, jinhokim98 <[email protected]>, Todari <[email protected]>
Co-authored-by: pakxe <[email protected]>, soi-ha <[email protected]>, jinhokim98 <[email protected]>, Todari <[email protected]>
Co-authored-by: pakxe <[email protected]>, soi-ha <[email protected]>, jinhokim98 <[email protected]>, Todari <[email protected]>
Co-authored-by: pakxe <[email protected]> Co-authored-by: soi-ha <[email protected]> Co-authored-by: jinhokim98 <[email protected]> Co-authored-by: Todari <[email protected]> Co-authored-by: pakxe <[email protected]> Co-authored-by: soi-ha <[email protected]> Co-authored-by: jinhokim98 <[email protected]> Co-authored-by: Todari <[email protected]>
Co-authored-by: pakxe <[email protected]> Co-authored-by: soi-ha <[email protected]> Co-authored-by: jinhokim98 <[email protected]> Co-authored-by: Todari <[email protected]> Co-authored-by: pakxe <[email protected]> Co-authored-by: soi-ha <[email protected]> Co-authored-by: jinhokim98 <[email protected]> Co-authored-by: Todari <[email protected]>
Co-Authored-By: TaehunLee <[email protected]>
Co-Authored-By: TaehunLee <[email protected]>
Co-Authored-By: TaehunLee <[email protected]>
Co-Authored-By: TaehunLee <[email protected]>
Co-Authored-By: TaehunLee <[email protected]>
Co-Authored-By: TaehunLee <[email protected]>
Co-authored-by: pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>
Co-authored-by: pakxe <[email protected]>
* feat: 지출 액션 수정시 지출 디테일 초기화 기능 구현 * feat: 맴버 액션 삭제시 지출 디테일 초기화 기능 구현 * feat: 맴버 삭제시 지출 디테일 초기화 기능 구현 * fix: 버그 수정 * fix: 버그 수정
* feat: 지출 내역 추가 시, 상세 내역 생성 로직 추가 * feat: 지출 내역 삭제 시, 상세 내역 삭제 로직 추가 * fix: 멤버가 없는 상황에 대해 0으로 나누는 상황 방지
* refactor: BillActionDetail 변경 사항을 반영하여 참여자별 정산 현황 조회하도록 수정 * refactor: 액션 이력 조회 시 지출 액션 고정 금액 설정 여부 필드 추가 * refactor: isFixed 필드 삭제 * refactor: 메서드 이름 변경 * fix: BillAction 변경 로직 수정
* feat: 참여자 개별 지출 금액 수정 기능 구현 * refactor: BillActionDetailService 코드 리팩터링 * docs: restdocs 작성 * feat: 참여자별 지출 금액 조회 기능 구현 * docs: index.adoc에 billActionDetail.adoc 추가 * refactor: 충돌 해결
* feat: 로깅에 요청 정보 포함 * feat: 개발 환경 ddl update로 변경
* fix: 리스트 형태의 요청 바디에 null을 넣으면 500이 뜨는 에러 수정 * feat: 로그를 json 형태로 수정
* fix: 리스트 형태의 요청 바디에 null을 넣으면 500이 뜨는 에러 수정 * feat: 로그를 json 형태로 수정 * feat: 로그를 json 인덴트 추가
# Conflicts: # server/src/main/java/server/haengdong/application/BillActionService.java
* feat: 행사 비밀번호 암호화 추가 * refactor: 비밀번호 암호화 로직 수정 * fix: MessageDigest를 싱글톤으로 관리하지 않도록 수정 --------- Co-authored-by: 3juhwan <[email protected]>
* fix: BillActionDetail 초기화시 totalPrice와 정합성 안맞는 버그 수정 * refactor: BillActionDetail 초기화 로직 BillAction으로 위임 * style: 메소드 이름 수정 * refactor: BillActionDetail 계산 공통 로직 메소드 분리 * fix: price 분배 로직 버그 수정 * style: 미사용 필드 제거 --------- Co-authored-by: Arachneee <[email protected]>
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.
issue
구현 사항
main 브랜치로 병합하기 위해 be-develop 브랜치에 작업한 커밋을 develop 브랜치로 통합합니다.
중점적으로 리뷰받고 싶은 부분(선택)
어떤 부분을 중점으로 리뷰했으면 좋겠는지 작성해주세요.
논의하고 싶은 부분(선택)
논의하고 싶은 부분이 있다면 작성해주세요.
🫡 참고사항