Feature/#99

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

@@ -2,7 +2,9 @@
 
 import b1nd.dodam.domain.rds.member.entity.Member;
 import b1nd.dodam.domain.rds.member.entity.Student;
+import b1nd.dodam.domain.rds.member.entity.Teacher;
 import b1nd.dodam.domain.rds.member.enumeration.ActiveStatus;
+import b1nd.dodam.domain.rds.member.enumeration.MemberRole;
 import b1nd.dodam.domain.rds.member.event.StudentRegisteredEvent;
 import b1nd.dodam.domain.rds.member.exception.*;
 import b1nd.dodam.domain.rds.member.service.MemberService;
@@ -126,6 +128,33 @@ public Response updateStudentInfo(UpdateStudentInfoReq req) {
  return Response.noContent("내 학생 정보 수정 성공");
  }
 
+ public Response updateInfoForAdmin(String id, MemberRole memberRole, UpdateStudentForAdminReq req){
+ switch (memberRole) {
+ case STUDENT:
+ updateMemberInfo(id, req);
+ Student student = getStudentByMember(service.getMemberBy(id));
+ student.updateInfo(req.grade(), req.room(), req.number());
+ break;
+
+ case TEACHER:
+ updateMemberInfo(id, req);
+ Teacher teacher = service.getTeacherBy(service.getMemberBy(id));
+ teacher.updateInfoForAdmin(req.tel(), req.position());
+ break;
+
+ default:
+ throw new UnmodifiableRole();
+ }
+ return Response.noContent("유저 정보 수정 성공");
+ }
+
+ private void updateMemberInfo(String id, UpdateStudentForAdminReq req) {
+ Member member = service.getMemberById(id)
+ .orElseThrow(MemberNotFoundException::new);
+ member.updateInfoForAdmin(req.name(), req.pw(), req.phone(), req.parentPhone());
+ service.save(member);
+ }
+
  private Student getStudentByMember(Member member) {
  return service.getStudentByMember(member)
  .orElseThrow(StudentNotFoundException::new);

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

@@ -9,7 +9,7 @@
 import jakarta.validation.constraints.NotNull;
 
 public record JoinStudentReq(@NotEmpty String id, @NotEmpty String pw, @NotEmpty String name, @NotEmpty @Email String email,
- @NotEmpty String phone, @NotNull int grade, @NotNull int room, @NotNull int number) {
+ @NotEmpty String phone, @NotNull String parentPhone, @NotNull int grade, @NotNull int room, @NotNull int number) {
  public Student mapToStudent(Member member) {
  return Student.builder()
  .member(member)
@@ -27,6 +27,7 @@ public Member mapToMember(String encodedPw) {
  .name(name)
  .role(MemberRole.STUDENT)
  .phone(phone)
+ .parentPhone(parentPhone)
  .status(ActiveStatus.DEACTIVATE)
  .build();
  }

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

@@ -0,0 +1,4 @@
+package b1nd.dodam.restapi.member.application.data.req;
+
+public record UpdateStudentForAdminReq(String pw, String name, String phone, String parentPhone, Integer grade,
+ Integer room, Integer number, String tel, String position) {}

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.MemberRole;
 import b1nd.dodam.restapi.member.application.MemberCommandUseCase;
 import b1nd.dodam.restapi.member.application.MemberQueryUseCase;
 import b1nd.dodam.restapi.member.application.data.req.*;
@@ -70,6 +71,14 @@ public Response updateStudentInfo(@RequestBody UpdateStudentInfoReq req) {
  return commandUseCase.updateStudentInfo(req);
  }
 
+ @PatchMapping("/info/{id}/{role}")
+ public Response updateInfoForAdmin(@PathVariable String id,
+ @PathVariable MemberRole role,
+ @RequestBody UpdateStudentForAdminReq req
+ ){
+ return commandUseCase.updateInfoForAdmin(id, role, req);
+ }
+
  @GetMapping("/{id}")
  public ResponseData<MemberInfoRes> getById(@PathVariable String id) {
  return queryUseCase.getById(id);
@@ -105,4 +114,5 @@ public ResponseData<Boolean> checkBroadcastClubMember(@PathVariable String id) {
  return queryUseCase.checkBroadcastClubMember(id);
  }
 
+
 }

dodam-system-domain/dodam-domain-rds/build.gradle

@@ -4,4 +4,6 @@ dependencies {
  implementation 'com.fasterxml.jackson.core:jackson-annotations:2.14.2'
 
  implementation 'jakarta.validation:jakarta.validation-api:3.0.2'
+
+ implementation 'org.apache.commons:commons-lang3:3.13.0'
 }

dodam-system-domain/dodam-domain-rds/src/main/java/b1nd/dodam/domain/rds/member/entity/Member.java

@@ -4,14 +4,16 @@
 import b1nd.dodam.domain.rds.member.enumeration.MemberRole;
 import b1nd.dodam.domain.rds.support.entity.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
 import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-
-import java.util.Objects;
+import org.apache.commons.lang3.StringUtils;
 
 @Getter
 @Entity(name = "member")
@@ -44,8 +46,10 @@ public class Member extends BaseEntity {
  @NotNull
  private String phone;
 
+ private String parentPhone;
+
  @Builder
- public Member(String id, String pw, String name, String email, MemberRole role, ActiveStatus status, String profileImage, String phone) {
+ public Member(String id, String pw, String name, String email, MemberRole role, ActiveStatus status, String profileImage, String phone, String parentPhone) {
  this.id = id;
  this.pw = pw;
  this.email = email;
@@ -54,27 +58,43 @@ public Member(String id, String pw, String name, String email, MemberRole role,
  this.status = status;
  this.profileImage = profileImage;
  this.phone = phone;
+ this.parentPhone = parentPhone;
  }
 
  public void updatePw(String pw) {
  this.pw = pw;
  }
 
  public void updateInfo(String name, String email, String phone, String profileImage) {
- if(Objects.nonNull(name)) {
+ if(StringUtils.isNotBlank(name)){
  this.name = name;
  }
- if(Objects.nonNull(email)) {
+ if(StringUtils.isNotBlank(email)){
  this.email = email;
  }
- if(Objects.nonNull(phone)) {
+ if(StringUtils.isNotBlank(phone)){
  this.phone = phone;
  }
- if(Objects.nonNull(profileImage)) {
+ if(StringUtils.isNotBlank(profileImage)){
  this.profileImage = profileImage;
  }
  }
 
+ public void updateInfoForAdmin(String pw, String name, String phone, String parentPhone){
+ if(StringUtils.isNotBlank(pw)){
+ this.phone = pw;
+ }
+ if(StringUtils.isNotBlank(name)){
+ this.name = name;
+ }
+ if(StringUtils.isNotBlank(phone)){
+ this.phone = phone;
+ }
+ if(StringUtils.isNotBlank(parentPhone)){
+ this.parentPhone = parentPhone;
+ }
+ }
+
  public void updateStatus(ActiveStatus status) {
  this.status = status;
  }

dodam-system-domain/dodam-domain-rds/src/main/java/b1nd/dodam/domain/rds/member/entity/Student.java

@@ -7,6 +7,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.Objects;
+
 @Getter
 @Entity(name = "student")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

dodam-system-domain/dodam-domain-rds/src/main/java/b1nd/dodam/domain/rds/member/entity/Teacher.java

@@ -6,6 +6,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 
 @Getter
 @Entity(name = "teacher")
@@ -33,4 +34,14 @@ public Teacher(Member member, String tel, String position) {
  this.position = position;
  }
 
+ public void updateInfoForAdmin(String tel, String position){
+ if(StringUtils.isNotBlank(tel)){
+ this.tel = tel;
+ }
+ if (StringUtils.isNotBlank(position)){
+ this.position = position;
+ }
+
+ }
+
 }

dodam-system-domain/dodam-domain-rds/src/main/java/b1nd/dodam/domain/rds/member/exception/MemberExceptionCode.java

@@ -14,7 +14,8 @@ public enum MemberExceptionCode implements ExceptionCode {
  PARENT_NOT_FOUND(404, "없는 부모님 정보"),
  TEACHER_NOT_FOUND(404, "없는 선생님"),
  MEMBER_DUPLICATION(409, "이미 존재하는 멤버"),
- BROADCAST_CLUB_MEMBER_DUPLICATION(409, "이미 존재하는 방송부원");
+ BROADCAST_CLUB_MEMBER_DUPLICATION(409, "이미 존재하는 방송부원"),
+ UNMODIFIABLE_ROLE(403, "해당 유저는 수정이 불가합니다");
 
  private final int status;
  private final String message;

dodam-system-domain/dodam-domain-rds/src/main/java/b1nd/dodam/domain/rds/member/exception/UnmodifiableRole.java

@@ -0,0 +1,12 @@
+package b1nd.dodam.domain.rds.member.exception;
+
+import b1nd.dodam.core.exception.CustomException;
+
+public class UnmodifiableRole extends CustomException {
+
+ public UnmodifiableRole() {
+ super(MemberExceptionCode.UNMODIFIABLE_ROLE);
+ }
+
+}
+