[EC-215] feat: 회원정보 수정 API 구현 (#225)

ysc13245 · web-flow · commit a42cdf1207d2 · 2025-04-02T18:21:09.000+09:00
diff --git a/api/src/main/java/org/example/educheck/domain/member/controller/MyController.java b/api/src/main/java/org/example/educheck/domain/member/controller/MyController.java
@@ -1,6 +1,8 @@
 package org.example.educheck.domain.member.controller;
 
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.example.educheck.domain.member.dto.UpdateMyProfileRequestDto;
 import org.example.educheck.domain.member.dto.response.MyProfileResponseDto;
 import org.example.educheck.domain.member.entity.Member;
 import org.example.educheck.domain.member.service.MyService;
@@ -10,9 +12,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/my")
@@ -36,4 +36,18 @@ public ResponseEntity<ApiResponse<MyProfileResponseDto>> getMyProfile(@Authentic
                 )
         );
     }
+
+    @PatchMapping
+    public ResponseEntity<ApiResponse<Void>> updateMyProfile(@AuthenticationPrincipal Member member, @Valid @RequestBody UpdateMyProfileRequestDto requestDto) {
+
+        myService.updateMyProfile(member, requestDto);
+
+        return ResponseEntity.ok(
+                ApiResponse.ok(
+                        "개인 정보 수정 성공",
+                        "OK",
+                        null
+                )
+        );
+    }
 }
diff --git a/api/src/main/java/org/example/educheck/domain/member/dto/EditMyProfileRequestDto.java b/api/src/main/java/org/example/educheck/domain/member/dto/EditMyProfileRequestDto.java
@@ -0,0 +1,34 @@
+package org.example.educheck.domain.member.dto;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.PastOrPresent;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
+
+import java.time.LocalDate;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EditMyProfileRequestDto {
+    @Email(message = "이메일 형식이 올바르지 않습니다.")
+    private String email;
+
+    @Length(min = 2, max = 50, message = "이름은 2개 자리 이상 50개 자리 이하로 입력할 수 있습니다.")
+    private String name;
+
+    @Pattern(regexp = "^\\d{3}-\\d{3,4}-\\d{4}$", message = "전화번호 형식이 올바르지 않습니다.")
+    private String phoneNumber;
+
+    @PastOrPresent(message = "생년월일은 오늘 날짜를 초과할 수 없습니다.")
+    private LocalDate birthDate;
+
+    @Length(min = 8, message = "비밀번호은 8개 자리 이상으로 입력할 수 있습니다.")
+    private String password;
+
+}
diff --git a/api/src/main/java/org/example/educheck/domain/member/dto/LoginResponseDto.java b/api/src/main/java/org/example/educheck/domain/member/dto/LoginResponseDto.java
@@ -22,7 +22,7 @@ public class LoginResponseDto {
     private Long campusId;
     private Long courseId;
     private String courseName;
-    private LocalDateTime lastLoginDate;
-    private LocalDateTime lastPasswordChangeDate;
+    private LocalDateTime lastLoginDateTime;
+    private LocalDateTime lastPasswordChangeDateTime;
 
 }
diff --git a/api/src/main/java/org/example/educheck/domain/member/dto/UpdateMyProfileRequestDto.java b/api/src/main/java/org/example/educheck/domain/member/dto/UpdateMyProfileRequestDto.java
@@ -0,0 +1,22 @@
+package org.example.educheck.domain.member.dto;
+
+import jakarta.validation.constraints.PastOrPresent;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class UpdateMyProfileRequestDto {
+    @Pattern(regexp = "^\\d{3}-\\d{3,4}-\\d{4}$", message = "전화번호 형식이 올바르지 않습니다.")
+    public String phoneNumber;
+    @PastOrPresent(message = "생년월일은 오늘 날짜를 초과할 수 없습니다.")
+    public LocalDate birthDate;
+
+    public String currentPassword;
+    public String newPassword;
+}
diff --git a/api/src/main/java/org/example/educheck/domain/member/dto/response/EmailCheckResponseDto.java b/api/src/main/java/org/example/educheck/domain/member/dto/response/EmailCheckResponseDto.java
@@ -0,0 +1,12 @@
+package org.example.educheck.domain.member.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class EmailCheckResponseDto {
+    private boolean available;
+}
diff --git a/api/src/main/java/org/example/educheck/domain/member/dto/response/LoginResponseDto.java b/api/src/main/java/org/example/educheck/domain/member/dto/response/LoginResponseDto.java
@@ -0,0 +1,28 @@
+package org.example.educheck.domain.member.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class LoginResponseDto {
+
+    private Long id;
+    private String email;
+    private String name;
+    private String phoneNumber;
+    private LocalDate birthDate;
+    private Long campusId;
+    private Long courseId;
+    private String courseName;
+    private LocalDateTime lastLoginDate;
+    private LocalDateTime lastPasswordChangeDate;
+
+}
diff --git a/api/src/main/java/org/example/educheck/domain/member/dto/response/RefreshTokenRotateResponseDto.java b/api/src/main/java/org/example/educheck/domain/member/dto/response/RefreshTokenRotateResponseDto.java
@@ -0,0 +1,5 @@
+package org.example.educheck.domain.member.dto.response;
+
+public class RefreshTokenRotateResponseDto {
+
+}
diff --git a/api/src/main/java/org/example/educheck/domain/member/entity/Member.java b/api/src/main/java/org/example/educheck/domain/member/entity/Member.java
@@ -30,8 +30,8 @@ public class Member implements UserDetails {
     private String phoneNumber;
     private LocalDate birthDate;
     private String password;
-    private LocalDateTime lastLoginDate;
-    private LocalDateTime lastPasswordChangeDate;
+    private LocalDateTime lastLoginDateTime;
+    private LocalDateTime lastPasswordChangeDateTime;
 
     @Enumerated(EnumType.STRING)
     @Column(columnDefinition = "VARCHAR(50)")
diff --git a/api/src/main/java/org/example/educheck/domain/member/repository/MemberRepository.java b/api/src/main/java/org/example/educheck/domain/member/repository/MemberRepository.java
@@ -17,7 +17,7 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
 
     @Query("""
                 select new org.example.educheck.domain.member.dto.LoginResponseDto(
-                     m.id, m.email, m.name, m.phoneNumber, m.birthDate, c.id, cr.id, cr.name,  m.lastLoginDate, m.lastPasswordChangeDate)
+                     m.id, m.email, m.name, m.phoneNumber, m.birthDate, c.id, cr.id, cr.name,  m.lastLoginDateTime, m.lastPasswordChangeDateTime)
                 from Member m
                 LEFT JOIN Student s ON s.member.id = m.id
                 LEFT JOIN Registration r ON r.student.id = s.id
@@ -29,7 +29,7 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
 
     @Query("""
             select new org.example.educheck.domain.member.dto.LoginResponseDto(
-                 m.id, m.email, m.name, m.phoneNumber, m.birthDate, c.id, cr.id, cr.name,  m.lastLoginDate, m.lastPasswordChangeDate
+                 m.id, m.email, m.name, m.phoneNumber, m.birthDate, c.id, cr.id, cr.name,  m.lastLoginDateTime, m.lastPasswordChangeDateTime
             )
             from Member m
             LEFT JOIN Staff st ON st.member.id = m.id
diff --git a/api/src/main/java/org/example/educheck/domain/member/service/AuthService.java b/api/src/main/java/org/example/educheck/domain/member/service/AuthService.java
@@ -98,7 +98,7 @@ public LoginResponseDto login(LoginRequestDto requestDto, HttpServletResponse re
         setTokensInResponse(authenticate, response);
         LoginResponseDto loginResponseDto = roleBasedLogin(member);
 
-        member.setLastLoginDate(LocalDateTime.now());
+        member.setLastLoginDateTime(LocalDateTime.now());
 
         return loginResponseDto;
     }
diff --git a/api/src/main/java/org/example/educheck/domain/member/service/MyService.java b/api/src/main/java/org/example/educheck/domain/member/service/MyService.java
@@ -2,23 +2,62 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.example.educheck.domain.member.dto.UpdateMyProfileRequestDto;
 import org.example.educheck.domain.member.dto.response.MyProfileResponseDto;
 import org.example.educheck.domain.member.entity.Member;
 import org.example.educheck.domain.member.repository.MemberRepository;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.util.Optional;
+
 @Slf4j
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class MyService {
 
     private final MemberRepository memberRepository;
+    private final PasswordEncoder passwordEncoder;
+    private final AuthenticationManager authenticationManager;
 
 
     public MyProfileResponseDto getMyProfile(Member member) {
-        log.info("getMyProfile", member.getId());
         return memberRepository.findMyProfileDtoById(member.getId());
     }
+
+    @Transactional
+    public void updateMyProfile(Member member, UpdateMyProfileRequestDto requestDto) {
+
+        authenticationManager.authenticate(
+                new UsernamePasswordAuthenticationToken(
+                        member.getEmail(), requestDto.getCurrentPassword())
+        );
+
+
+        Optional.ofNullable(requestDto.getPhoneNumber()).ifPresent(member::setPhoneNumber);
+        Optional.ofNullable(requestDto.getBirthDate()).ifPresent(member::setBirthDate);
+
+        if (requestDto.getNewPassword() != null) {
+            String encodedPassword = passwordEncoder.encode(requestDto.getNewPassword());
+            member.setPassword(encodedPassword);
+            member.setLastPasswordChangeDateTime(LocalDateTime.now());
+
+
+            Authentication authentication = authenticationManager.authenticate(
+                    new UsernamePasswordAuthenticationToken(
+                            member.getEmail(), requestDto.getCurrentPassword())
+            );
+
+            SecurityContextHolder.getContext().setAuthentication(authentication); //TODO: 삭제?
+
+        }
+        memberRepository.save(member);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class LoginResponseDto {`
`22`	`22`	`private Long campusId;`
`23`	`23`	`private Long courseId;`
`24`	`24`	`private String courseName;`
`25`		`- private LocalDateTime lastLoginDate;`
`26`		`- private LocalDateTime lastPasswordChangeDate;`
	`25`	`+ private LocalDateTime lastLoginDateTime;`
	`26`	`+ private LocalDateTime lastPasswordChangeDateTime;`
`27`	`27`
`28`	`28`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package org.example.educheck.domain.member.dto.response;
++
 +public class RefreshTokenRotateResponseDto {
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public LoginResponseDto login(LoginRequestDto requestDto, HttpServletResponse re`
`98`	`98`	`setTokensInResponse(authenticate, response);`
`99`	`99`	`LoginResponseDto loginResponseDto = roleBasedLogin(member);`
`100`	`100`
`101`		`- member.setLastLoginDate(LocalDateTime.now());`
	`101`	`+ member.setLastLoginDateTime(LocalDateTime.now());`
`102`	`102`
`103`	`103`	`return loginResponseDto;`
`104`	`104`	`}`