-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* chore: 파일 구조 수정 * chore: 파일 구조 수정 * feat: 대기중인 멤버 조회 기능 추가 * feat: 대기중인 멤버 조회 기능 추가 * docs: 어드민 controller 문서 작업 * style: spotless apply * style: spotless apply
- Loading branch information
1 parent
8796e8f
commit e27bc82
Showing
7 changed files
with
54 additions
and
5 deletions.
There are no files selected for viewing
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
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
8 changes: 7 additions & 1 deletion
8
src/main/java/com/gdschongik/gdsc/domain/member/dao/MemberRepository.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,12 @@ | ||
package com.gdschongik.gdsc.domain.member.dao; | ||
|
||
import com.gdschongik.gdsc.domain.member.domain.Member; | ||
import com.gdschongik.gdsc.domain.member.domain.MemberRole; | ||
import org.springframework.data.domain.Page; | ||
import org.springframework.data.domain.Pageable; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
|
||
public interface MemberRepository extends JpaRepository<Member, Long>, MemberCustomRepository {} | ||
public interface MemberRepository extends JpaRepository<Member, Long>, MemberCustomRepository { | ||
|
||
Page<Member> findAllByRole(MemberRole role, Pageable pageable); | ||
} |
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
4 changes: 2 additions & 2 deletions
4
...omain/requirement/domain/Requirement.java → ...dsc/domain/member/domain/Requirement.java
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
2 changes: 1 addition & 1 deletion
2
...requirement/domain/RequirementStatus.java → ...main/member/domain/RequirementStatus.java
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
29 changes: 29 additions & 0 deletions
29
...ain/java/com/gdschongik/gdsc/domain/member/dto/response/MemberPendingFindAllResponse.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package com.gdschongik.gdsc.domain.member.dto.response; | ||
|
||
import com.gdschongik.gdsc.domain.member.domain.Member; | ||
import com.gdschongik.gdsc.domain.member.domain.Requirement; | ||
|
||
public record MemberPendingFindAllResponse( | ||
Long memberId, | ||
String studentId, | ||
String name, | ||
String phone, | ||
String department, | ||
String email, | ||
String discordUsername, | ||
String nickname, | ||
Requirement requirement) { | ||
|
||
public static MemberPendingFindAllResponse of(Member member) { | ||
return new MemberPendingFindAllResponse( | ||
member.getId(), | ||
member.getStudentId(), | ||
member.getName(), | ||
member.getPhone(), | ||
member.getDepartment(), | ||
member.getEmail(), | ||
member.getDiscordUsername(), | ||
member.getNickname(), | ||
member.getRequirement()); | ||
} | ||
} |