Feat/72

back/src/main/java/com/back/domain/member/member/controller/AdmMemberController.java

@@ -0,0 +1,57 @@
+package com.back.domain.member.member.controller;
+
+import com.back.domain.member.member.dto.MemberSearchResponse;
+import com.back.domain.member.member.dto.MentorUpdateRequest;
+import com.back.domain.member.member.dto.MenteeUpdateRequest;
+import com.back.domain.member.member.service.MemberService;
+import com.back.global.rq.Rq;
+import com.back.global.rsData.RsData;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/members")
+@RequiredArgsConstructor
+@Tag(name = "AdmMemberController", description = "관리자 회원 관리 컨트롤러")
+public class AdmMemberController {
+    private final MemberService memberService;
+    private final Rq rq;
+
+
+    @GetMapping("/{memberId}")
+    @Operation(summary = "회원 상세 조회 (관리자)")
+    @PreAuthorize("hasRole('ADMIN')")
+    public RsData<MemberSearchResponse> getMember(@PathVariable Long memberId) {
+        MemberSearchResponse member = memberService.getMemberForAdmin(memberId);
+        return new RsData<>("200-14", "회원 상세 조회 성공", member);
+    }
+
+    @PostMapping("/{memberId}/delete")
+    @Operation(summary = "회원 삭제 (관리자) - 소프트 삭제")
+    @PreAuthorize("hasRole('ADMIN')")
+    public RsData<Void> deleteMember(@PathVariable Long memberId) {
+        memberService.deleteMemberByAdmin(memberId);
+        return new RsData<>("200-15", "회원 삭제 성공");
+    }
+
+    @PutMapping("/{memberId}/mentor")
+    @Operation(summary = "멘토 정보 수정 (관리자)")
+    @PreAuthorize("hasRole('ADMIN')")
+    public RsData<Void> updateMentor(@PathVariable Long memberId, @RequestBody MentorUpdateRequest request) {
+        memberService.updateMemberByAdmin(memberId, null, request.nickname(), null,
+                request.career(), request.careerYears(), null);
+        return new RsData<>("200-16", "멘토 정보 수정 성공");
+    }
+
+    @PutMapping("/{memberId}/mentee")
+    @Operation(summary = "멘티 정보 수정 (관리자)")
+    @PreAuthorize("hasRole('ADMIN')")
+    public RsData<Void> updateMentee(@PathVariable Long memberId, @RequestBody MenteeUpdateRequest request) {
+        memberService.updateMemberByAdmin(memberId, null, request.nickname(), null,
+                null, null, request.interestedField());
+        return new RsData<>("200-17", "멘티 정보 수정 성공");
+    }
+}

back/src/main/java/com/back/domain/member/member/controller/MemberController.java → back/src/main/java/com/back/domain/member/member/controller/MemberAuthController.java

@@ -1,6 +1,9 @@
 package com.back.domain.member.member.controller;
 
-import com.back.domain.member.member.dto.*;
+import com.back.domain.member.member.dto.MenteeSignupRequest;
+import com.back.domain.member.member.dto.MentorSignupVerifyRequest;
+import com.back.domain.member.member.dto.MentorVerificationRequest;
+import com.back.domain.member.member.dto.LoginRequest;
 import com.back.domain.member.member.entity.Member;
 import com.back.domain.member.member.service.MemberService;
 import com.back.global.rq.Rq;
@@ -15,8 +18,8 @@
 @RestController
 @RequestMapping("/auth")
 @RequiredArgsConstructor
-@Tag(name = "MemberController", description = "회원 컨트롤러")
-public class  MemberController {
+@Tag(name = "MemberAuthController", description = "회원 인증 컨트롤러")
+public class MemberAuthController {
     private final MemberService memberService;
     private final Rq rq;
     private final EmailVerificationService emailVerificationService;
@@ -102,9 +105,9 @@ public RsData<Void> refresh() {
         return new RsData<>("200-6", "토큰 갱신 성공");
     }
 
-    @DeleteMapping("/me")
+    @PostMapping("/me/withdraw")
     @Operation(summary = "회원 탈퇴")
-    public RsData<Void> deleteMember() {
+    public RsData<Void> withdrawMember() {
         Member currentUser = rq.getActor();
         memberService.deleteMember(currentUser);
 
@@ -115,35 +118,4 @@ public RsData<Void> deleteMember() {
         return new RsData<>("200-7", "회원 탈퇴가 완료되었습니다.");
     }
 
-    @GetMapping("/me/mentee")
-    @Operation(summary = "멘티 마이페이지 조회")
-    public RsData<MenteeMyPageResponse> getMenteeMyPage() {
-        Member currentUser = rq.getActor();
-        MenteeMyPageResponse response = memberService.getMenteeMyPage(currentUser);
-        return new RsData<>("200-9", "멘티 정보 조회 성공", response);
-    }
-
-    @PutMapping("/me/mentee")
-    @Operation(summary = "멘티 정보 수정")
-    public RsData<Void> updateMentee(@RequestBody MenteeUpdateRequest request) {
-        Member currentUser = rq.getActor();
-        memberService.updateMentee(currentUser, request);
-        return new RsData<>("200-10", "멘티 정보 수정 성공");
-    }
-
-    @GetMapping("/me/mentor")
-    @Operation(summary = "멘토 마이페이지 조회")
-    public RsData<MentorMyPageResponse> getMentorMyPage() {
-        Member currentUser = rq.getActor();
-        MentorMyPageResponse response = memberService.getMentorMyPage(currentUser);
-        return new RsData<>("200-11", "멘토 정보 조회 성공", response);
-    }
-
-    @PutMapping("/me/mentor")
-    @Operation(summary = "멘토 정보 수정")
-    public RsData<Void> updateMentor(@RequestBody MentorUpdateRequest request) {
-        Member currentUser = rq.getActor();
-        memberService.updateMentor(currentUser, request);
-        return new RsData<>("200-12", "멘토 정보 수정 성공");
-    }
 }

back/src/main/java/com/back/domain/member/member/controller/MemberMyPageController.java

@@ -0,0 +1,55 @@
+package com.back.domain.member.member.controller;
+
+import com.back.domain.member.member.dto.MenteeMyPageResponse;
+import com.back.domain.member.member.dto.MenteeUpdateRequest;
+import com.back.domain.member.member.dto.MentorMyPageResponse;
+import com.back.domain.member.member.dto.MentorUpdateRequest;
+import com.back.domain.member.member.entity.Member;
+import com.back.domain.member.member.service.MemberService;
+import com.back.global.rq.Rq;
+import com.back.global.rsData.RsData;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/members")
+@RequiredArgsConstructor
+@Tag(name = "MemberMyPageController", description = "회원 마이페이지 컨트롤러")
+public class MemberMyPageController {
+    private final MemberService memberService;
+    private final Rq rq;
+
+    @GetMapping("/me/mentee")
+    @Operation(summary = "멘티 마이페이지 조회")
+    public RsData<MenteeMyPageResponse> getMenteeMyPage() {
+        Member currentUser = rq.getActor();
+        MenteeMyPageResponse response = memberService.getMenteeMyPage(currentUser);
+        return new RsData<>("200-9", "멘티 정보 조회 성공", response);
+    }
+
+    @PutMapping("/me/mentee")
+    @Operation(summary = "멘티 정보 수정")
+    public RsData<Void> updateMentee(@RequestBody MenteeUpdateRequest request) {
+        Member currentUser = rq.getActor();
+        memberService.updateMentee(currentUser, request);
+        return new RsData<>("200-10", "멘티 정보 수정 성공");
+    }
+
+    @GetMapping("/me/mentor")
+    @Operation(summary = "멘토 마이페이지 조회")
+    public RsData<MentorMyPageResponse> getMentorMyPage() {
+        Member currentUser = rq.getActor();
+        MentorMyPageResponse response = memberService.getMentorMyPage(currentUser);
+        return new RsData<>("200-11", "멘토 정보 조회 성공", response);
+    }
+
+    @PutMapping("/me/mentor")
+    @Operation(summary = "멘토 정보 수정")
+    public RsData<Void> updateMentor(@RequestBody MentorUpdateRequest request) {
+        Member currentUser = rq.getActor();
+        memberService.updateMentor(currentUser, request);
+        return new RsData<>("200-12", "멘토 정보 수정 성공");
+    }
+}

back/src/main/java/com/back/domain/member/member/dto/MemberSearchResponse.java

@@ -0,0 +1,37 @@
+package com.back.domain.member.member.dto;
+
+import com.back.domain.member.member.entity.Member;
+import com.back.domain.member.mentee.entity.Mentee;
+import com.back.domain.member.mentor.entity.Mentor;
+
+import java.time.LocalDateTime;
+
+public record MemberSearchResponse(
+        Long id,
+        String email,
+        String name,
+        String nickname,
+        Member.Role role,
+        Boolean isDeleted,
+        LocalDateTime createdAt,
+        LocalDateTime modifiedAt,
+        String career,        // 멘토인 경우에만 값이 있음 (TODO: Job 연결 후 수정 예정)
+        Integer careerYears,  // 멘토인 경우에만 값이 있음
+        String interestedField  // 멘티인 경우에만 값이 있음 (TODO: Job 연결 후 수정 예정)
+) {
+    public static MemberSearchResponse from(Member member, Mentor mentor, Mentee mentee) {
+        return new MemberSearchResponse(
+                member.getId(),
+                member.getEmail(),
+                member.getName(),
+                member.getNickname(),
+                member.getRole(),
+                member.getIsDeleted(),
+                member.getCreateDate(),
+                member.getModifyDate(),
+                mentor != null ? "TODO: Job 연결 필요" : null,  // TODO: Job 연결 후 수정
+                mentor != null ? mentor.getCareerYears() : null,
+                mentee != null ? "TODO: Job 연결 필요" : null   // TODO: Job 연결 후 수정
+        );
+    }
+}

back/src/main/java/com/back/domain/member/member/entity/Member.java

@@ -14,13 +14,13 @@ public class Member extends BaseEntity {
     @Column(unique = true, nullable = false, length = 36)
     private String publicId;
 
-    @Column(unique = true, nullable = false)
+    @Column(nullable = false)
     private String email;
 
     @Column(nullable = false)
     private String name;
 
-    @Column(unique = true, nullable = false)
+    @Column(nullable = false)
     private String nickname;
 
     @Column(nullable = false)
@@ -30,6 +30,9 @@ public class Member extends BaseEntity {
     @Column(nullable = false)
     private Role role;
 
+    @Column(nullable = false)
+    private Boolean isDeleted = false;
+
     public enum Role {
         MENTOR, MENTEE, ADMIN
     }
@@ -38,12 +41,21 @@ public void updateNickname(String nickname) {
         this.nickname = nickname;
     }
 
+    public void updateName(String name) {
+        this.name = name;
+    }
+
+    public void updateEmail(String email) {
+        this.email = email;
+    }
+
     public Member(String email, String password, String name, String nickname, Role role) {
         this.email = email;
         this.password = password;
         this.name = name;
         this.nickname = nickname;
         this.role = role;
+        this.isDeleted = false;
     }
 
     public Member(Long id, String email, String name, String nickname, Role role) {
@@ -52,6 +64,11 @@ public Member(Long id, String email, String name, String nickname, Role role) {
         this.name = name;
         this.nickname = nickname;
         this.role = role;
+        this.isDeleted = false;
+    }
+
+    public void delete() {
+        this.isDeleted = true;
     }
 
     @PrePersist

back/src/main/java/com/back/domain/member/member/repository/MemberRepository.java

@@ -2,10 +2,29 @@
 
 import com.back.domain.member.member.entity.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 
 public interface MemberRepository extends JpaRepository<Member, Long> {
-    Optional<Member> findByEmail(String email);
-    Optional<Member> findByNickname(String nickname);
+    // 활성 사용자만 조회 (소프트 삭제된 사용자 제외)
+    @Query("SELECT m FROM Member m WHERE m.email = :email AND m.isDeleted = false")
+    Optional<Member> findByEmail(@Param("email") String email);
+
+    @Query("SELECT m FROM Member m WHERE m.nickname = :nickname AND m.isDeleted = false")
+    Optional<Member> findByNickname(@Param("nickname") String nickname);
+
+    @Query("SELECT m FROM Member m WHERE m.id = :id AND m.isDeleted = false")
+    Optional<Member> findById(@Param("id") Long id);
+
+    // 관리자용
+    @Query("SELECT m FROM Member m WHERE m.email = :email")
+    Optional<Member> findByEmailIncludingDeleted(@Param("email") String email);
+
+    @Query("SELECT m FROM Member m WHERE m.nickname = :nickname")
+    Optional<Member> findByNicknameIncludingDeleted(@Param("nickname") String nickname);
+
+    @Query("SELECT m FROM Member m WHERE m.id = :id")
+    Optional<Member> findByIdIncludingDeleted(@Param("id") Long id);
 }