Feature/#105

dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/auth/infrastructure/security/SecurityConfig.java

@@ -54,6 +54,9 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .requestMatchers(GET, "/member/my").authenticated()
                 .requestMatchers(GET, "/member/check/broadcast-club-member").hasAnyRole(STUDENT, ADMIN)
                 .requestMatchers(GET, "/member/**").hasAnyRole(TEACHER, ADMIN)
+                .requestMatchers(PATCH, "/member/student/info/**").hasAnyRole(TEACHER, ADMIN)
+                .requestMatchers(PATCH, "/member/teacher/info/**").hasAnyRole(TEACHER, ADMIN)
+                .requestMatchers(PATCH, "/member/status/**").hasRole(ADMIN)
                 .requestMatchers(PATCH, "/member/active/**").hasRole(ADMIN)
                 .requestMatchers(PATCH, "/member/deactivate").authenticated()
                 .requestMatchers(PATCH, "/member/deactivate/**").hasRole(ADMIN)

dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/MemberCommandUseCase.java

@@ -83,6 +83,13 @@ public Response delete(String id) {
         return Response.noContent("멤버 삭제 성공");
     }
 
+    @CacheEvict(value = "members-cache", key = "'activeMembers'")
+    public Response status(String id, ActiveStatus status) {
+        Member member = memberRepository.getById(id);
+        member.updateStatus(status);
+        return Response.ok("멤버 상태변경 성공");
+    }
+
     @CacheEvict(value = "members-cache", key = "'activeMembers'")
     public Response active(String id) {
         updateStatus(id, ActiveStatus.ACTIVE);
@@ -130,22 +137,16 @@ public Response updateStudentInfo(UpdateStudentInfoReq req) {
         return Response.noContent("내 학생 정보 수정 성공");
     }
 
+    @CacheEvict(value = "members-cache", key = "'activeMembers'")
     public Response updateStudentParentPhone(String id, UpdateStudentForAdminReq req){
-        Member current = memberAuthenticationHolder.current();
-        if (!(current.getRole() == MemberRole.TEACHER || current.getRole() == MemberRole.ADMIN)){
-            throw new UnauthorizedException();
-        }
         Member member = memberRepository.getById(id);
         Student student = studentRepository.getByMember(member);
         student.updateParentPhone(req.parentPhone());
         return Response.noContent("학생 정보 수정 성공");
     }
 
+    @CacheEvict(value = "members-cache", key = "'activeMembers'")
     public Response updateTeacherForAdmin(String id, UpdateTeacherForAdminReq req){
-        Member current = memberAuthenticationHolder.current();
-        if (!(current.getRole() == MemberRole.TEACHER)){
-            throw new UnauthorizedException();
-        }
         Member member = memberRepository.getById(id);
         Teacher teacher = teacherRepository.getByMember(member);
         teacher.updateInfo(req.tel(), req.position());

dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/MemberQueryUseCase.java

@@ -51,6 +51,13 @@ public ResponseData<List<MemberInfoRes>> getDeactivateMembers() {
                 .toList());
     }
 
+    public ResponseData<List<MemberInfoRes>> getPendingMembers(){
+        return ResponseData.ok("보류중인 멤버 조회 성공", memberRepository.findByStatusOrderByStudent(ActiveStatus.PENDING)
+                .parallelStream()
+                .map(this::getMemberInfo)
+                .toList());
+    }
+
     @Cacheable(value = "members-cache", key = "'activeMembers'")
     public List<MemberInfoRes> getAll() {
         return memberRepository.findByStatusOrderByStudent(ActiveStatus.ACTIVE).parallelStream()

dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/data/req/JoinStudentReq.java

@@ -27,7 +27,7 @@ public Member mapToMember(String encodedPw) {
                 .name(name)
                 .role(MemberRole.STUDENT)
                 .phone(phone)
-                .status(ActiveStatus.DEACTIVATE)
+                .status(ActiveStatus.PENDING)
                 .build();
     }
 }

dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/member/application/data/req/JoinTeacherReq.java

@@ -25,7 +25,7 @@ public Member mapToMember(String encodedPw) {
                 .name(name)
                 .role(MemberRole.TEACHER)
                 .phone(phone)
-                .status(ActiveStatus.DEACTIVATE)
+                .status(ActiveStatus.PENDING)
                 .build();
     }
 }

dodam-application/dodam-rest-api/src/main/java/b1nd/dodam/restapi/member/presentation/MemberController.java

@@ -1,5 +1,6 @@
 package b1nd.dodam.restapi.member.presentation;
 
+import b1nd.dodam.domain.rds.member.enumeration.ActiveStatus;
 import b1nd.dodam.restapi.member.application.MemberCommandUseCase;
 import b1nd.dodam.restapi.member.application.MemberQueryUseCase;
 import b1nd.dodam.restapi.member.application.data.req.*;
@@ -40,6 +41,11 @@ public Response delete(@PathVariable String id) {
         return commandUseCase.delete(id);
     }
 
+    @PatchMapping("/status/{id}")
+    public Response updateStatus(@PathVariable("id") String id, @RequestParam ActiveStatus status){
+        return commandUseCase.status(id, status);
+    }
+
     @PatchMapping("/active/{id}")
     public Response active(@PathVariable("id") String id) {
         return commandUseCase.active(id);
@@ -100,6 +106,11 @@ public ResponseData<List<MemberInfoRes>> getDeactivateMembers() {
         return queryUseCase.getDeactivateMembers();
     }
 
+    @GetMapping("/pending")
+    public ResponseData<List<MemberInfoRes>> getPendingMembers(){
+        return queryUseCase.getPendingMembers();
+    }
+
     @GetMapping("/all")
     public ResponseData<List<MemberInfoRes>> getAll() {
         return ResponseData.ok("모든 멤버 정보 조회 성공", queryUseCase.getAll());

dodam-system-domain/dodam-domain-rds/src/main/java/b1nd/dodam/domain/rds/member/enumeration/ActiveStatus.java

@@ -2,6 +2,6 @@
 
 public enum ActiveStatus {
 
-    ACTIVE, DEACTIVATE
+    ACTIVE, DEACTIVATE, PENDING
 
 }