스페이스 멤버 리스트 조회내역 변경(ver.2) #101
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
… into feature/spaceMember-invite # Conflicts: # src/main/java/org/fastcampus/jober/template/repository/TemplateRepository.java
1. 관리자 검증 추가 2. 사용자 조회 추가 - 이메일로 유효성 검증 - 이미 멤버인지 검증 - 멤버 아닐 시, 멤버로 등록
…am-BE into feature/spaceMember-invite # Conflicts: # src/main/java/org/fastcampus/jober/space/controller/SpaceMemberController.java # src/main/java/org/fastcampus/jober/template/repository/TemplateRepository.java
특이사항 : SpaceMember 엔티티에 email 필드 재추가
…am-BE into feature/spaceMember-invite # Conflicts: # src/main/java/org/fastcampus/jober/space/controller/SpaceMemberController.java # src/main/java/org/fastcampus/jober/space/entity/InviteStatus.java # src/main/java/org/fastcampus/jober/space/entity/SpaceMember.java # src/main/java/org/fastcampus/jober/space/service/SpaceMemberService.java
… feature/spaceMember-invite # Conflicts: # src/main/java/org/fastcampus/jober/space/service/SpaceMemberService.java
… into feature/spaceMember-invite # Conflicts: # src/main/java/org/fastcampus/jober/space/controller/SpaceMemberController.java # src/main/java/org/fastcampus/jober/space/entity/InviteStatus.java # src/main/java/org/fastcampus/jober/space/entity/SpaceMember.java # src/main/java/org/fastcampus/jober/space/service/SpaceMemberService.java
이외 사항 - inviteSpaceMember 코드 정리 - acceptInvitationByEmail 반환타입 변경
- inviteSpaceMember: dto 리스트 기멤버/신규멤버 나눠서 arrayList에 담고 결과 반환 - acceptInvitationByEmail: 초대상태 필터링 + 기한만료 초대 제외
…am-BE into feature/spaceMember-invite # Conflicts: # src/main/java/org/fastcampus/jober/space/controller/SpaceMemberController.java # src/main/java/org/fastcampus/jober/space/service/SpaceMemberService.java
… into feature/spaceMember-invite
…to feature/spaceMember-register
… into feature/spaceMember-register # Conflicts: # src/main/java/org/fastcampus/jober/space/service/SpaceMemberService.java # src/main/java/org/fastcampus/jober/user/service/UserService.java
…to feature/spaceMember-register # Conflicts: # src/main/java/org/fastcampus/jober/space/service/SpaceMemberService.java
…to feature/spaceMember-register # Conflicts: # src/main/java/org/fastcampus/jober/space/controller/SpaceMemberController.java
…to feature/spaceMember-register
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
PR 종류
변경 사항
어떤 변경사항이 있는지 설명해주세요.
관련 이슈- 관련된 이슈 번호를 적어주세요 (#issue_number)
체크리스트- [ ] 테스트 코드를 작성하였나요?
스크린샷
필요한 경우 스크린샷을 첨부해주세요.
기타
추가로 알려야 할 사항이 있다면 적어주세요.