fix(editUserProfile): 회원정보 수정 로직 리팩토링

Author: sungchaewon

.github/workflows/cd.yml

@@ -32,7 +32,9 @@ jobs:
         distribution: 'temurin'
 
     - name: Grant execute permission for gradlew
-      run: chmod +x ./gradlew
+      run: |
+        chmod +x ./gradlew
+        chmod +x ./scripts/deploy.sh
 
     - name: Build with Gradle
       run: ./gradlew clean build -x test
@@ -51,16 +53,23 @@ jobs:
         echo "mysql_password=${{ secrets.mysql_password }}" >> .env
         echo "jwt_key=${{ secrets.jwt_key }}" >> .env
 
-    - name: Zip deploy package
+    - name: Prepare deployment package
       run: |
-        zip -r ../${{ github.sha }}.zip . -x ".git/*"
+        mkdir -p deploy
+        cp ./build/libs/*.jar ./deploy/
+        cp -r ./scripts ./deploy/
+        cp .env ./deploy/
+        cp appspec.yml ./deploy/
+        chmod +x ./deploy/scripts/deploy.sh
+        cd deploy
+        zip -r ../${{ github.sha }}.zip .
 
     - name: Upload to S3
       run: |
         aws deploy push \
           --application-name ${{ env.CODE_DEPLOY_APPLICATION_NAME }} \
           --s3-location s3://${{ env.S3_BUCKET_NAME }}/${{ github.sha }}.zip \
-          --source . \
+          --source ./deploy \
           --region ${{ env.AWS_REGION }}
 
     - name: Deploy with CodeDeploy

appspec.yml

@@ -15,6 +15,6 @@ permissions:
 
 hooks:
   AfterInstall:
-    - location: FixLog_Server/scripts/deploy.sh
+    - location: scripts/deploy.sh
       timeout: 180
       runas: ec2-user

build.gradle

@@ -27,6 +27,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
  	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
 	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
 	runtimeOnly('io.jsonwebtoken:jjwt-jackson:0.11.5')

scripts/deploy.sh

@@ -2,7 +2,7 @@
 
 export $(grep -v '^#' /home/ec2-user/app/.env | xargs)
 
-BUILD_JAR=$(ls /home/ec2-user/app/build/libs/*.jar)
+BUILD_JAR=$(ls /home/ec2-user/app/*.jar)
 JAR_NAME=$(basename $BUILD_JAR)
 echo "> build 파일명: $JAR_NAME" >> /home/ec2-user/app/deploy.log
 

src/main/java/com/example/FixLog/config/SecurityConfig.java

@@ -32,6 +32,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         .requestMatchers(HttpMethod.GET, "/members/check-email").permitAll()
                         .requestMatchers(HttpMethod.GET, "/members/check-nickname").permitAll()
                         .requestMatchers(HttpMethod.GET, "/h2-console/**").permitAll()
+                        //배포 확인용 임시 수정
+                        .requestMatchers(HttpMethod.GET, "/test", "/test/**").permitAll()
                         .anyRequest().authenticated()
                 )
                 .headers(headers -> headers.frameOptions(frame -> frame.disable())) // H2 콘솔용

src/main/java/com/example/FixLog/controller/Controller

@@ -0,0 +1,11 @@
+package com.example.FixLog.controller;
+
+@RestController
+public class Controller {
+
+    @GetMapping("test/api")
+    public String test() {
+        return "this is test.";
+    }
+
+}

src/main/java/com/example/FixLog/controller/MypageMemberController.java

@@ -9,8 +9,7 @@
 import com.example.FixLog.domain.member.Member;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.userdetails.UserDetails;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,38 +24,37 @@ public class MypageMemberController {
 
     @PatchMapping("/members/nickname")
     public ResponseEntity<Response<String>> editNickname(
-            @RequestBody EditNicknameRequestDto requestDto
+            @RequestBody @Valid EditNicknameRequestDto requestDto
     ) {
         Member member = memberService.getCurrentMemberInfo();
         memberService.editNickname(member, requestDto.getNickname());
-        return ResponseEntity.ok(Response.success("닉네임 수정 성공", null));
+        return ResponseEntity.ok(Response.success("닉네임 수정 성공", "SUCCESS"));
     }
 
     @PatchMapping("/members/password")
-    public ResponseEntity<Response<Void>> editPassword(
-            @AuthenticationPrincipal UserDetails userDetails,
-            @RequestBody EditPasswordRequestDto requestDto
+    public ResponseEntity<Response<String>> editPassword(
+            @RequestBody @Valid EditPasswordRequestDto requestDto
     ) {
         Member member = memberService.getCurrentMemberInfo();
         memberService.editPassword(member, requestDto);
-        return ResponseEntity.ok(Response.success("비밀번호 변경 성공", null));
+        return ResponseEntity.ok(Response.success("비밀번호 변경 성공", "SUCCESS"));
     }
 
     @PatchMapping("/members/profile-image")
     public ResponseEntity<Response<String>> editProfileImage(
-            @RequestBody EditProfileImageRequestDto requestDto
+            @RequestBody @Valid EditProfileImageRequestDto requestDto
     ) {
         Member member = memberService.getCurrentMemberInfo();
         memberService.editProfileImage(member, requestDto.getProfileImageUrl());
-        return ResponseEntity.ok(Response.success("프로필 이미지 수정 성공", null));
+        return ResponseEntity.ok(Response.success("프로필 이미지 수정 성공", "SUCCESS"));
     }
 
     @PatchMapping("/members/bio")
     public ResponseEntity<Response<String>> editBio(
-            @RequestBody EditBioRequestDto requestDto
+            @RequestBody @Valid EditBioRequestDto requestDto
     ) {
         Member member = memberService.getCurrentMemberInfo();
         memberService.editBio(member, requestDto.getBio());
-        return ResponseEntity.ok(Response.success("소개글 수정 성공", null));
+        return ResponseEntity.ok(Response.success("소개글 수정 성공", "SUCCESS"));
     }
-}
+}

src/main/java/com/example/FixLog/domain/member/Member.java

@@ -6,7 +6,6 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -21,7 +20,6 @@
 
 @Entity
 @Getter
-@Setter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @EntityListeners(AuditingEntityListener.class)
 public class Member implements UserDetails {
@@ -43,10 +41,6 @@ public class Member implements UserDetails {
     @Column(nullable = false)
     private Boolean isDeleted = false;
 
-    public void setIsDeleted(boolean isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     private SocialType socialType = SocialType.EMAIL;
@@ -59,37 +53,56 @@ public void setIsDeleted(boolean isDeleted) {
     @Column
     private LocalDateTime updatedAt;
 
-    // 프로필 사진 url
+    // 프로필 사진 URL
     @Column
     private String profileImageUrl;
 
     @Column(length = 200)
     private String bio;
 
+    // 게시글 연관관계
     @OneToMany(mappedBy = "userId", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Post> posts = new ArrayList<>();
 
-    // 북마크 폴더
+    // 북마크 폴더 (계정당 1개)
     @OneToOne(mappedBy = "userId", cascade = CascadeType.ALL, orphanRemoval = true)
-    private BookmarkFolder bookmarkFolderId;
-    // 우선은 계정 당 폴더 하나만 있는 걸로 생성
-    // @OneToMany(mappedBy = "userId", cascade = CascadeType.ALL, orphanRemoval = true)
-    // private List<BookmarkFolder> bookmarkFolders = new ArrayList<>();
-
-    // Member 객체를 정적 팩토리 방식으로 회원가입 시에 생성하는 메서드
-    // Member 객체를 정적 팩토리 방식으로 생성하는 메서드
-    // Creates a Member object using a static factory method
+    private BookmarkFolder bookmarkFolder;
+
+    // 정적 팩토리 메서드
     public static Member of(String email, String password, String nickname, SocialType socialType) {
         Member member = new Member();
         member.email = email;
         member.password = password;
         member.nickname = nickname;
         member.socialType = socialType;
         member.isDeleted = false;
-        member.profileImageUrl = null; // 디폴트 이미지는 db에 null로 저장하고 프론트한테는 기본 이미지 링크로 반환하는 방향으로 통일
+        member.profileImageUrl = null; // 기본 이미지는 응답 시 처리
         return member;
     }
 
+    // -------------------- 도메인 메서드 --------------------
+
+    public void updateNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public void updatePassword(String encodedPassword) {
+        this.password = encodedPassword;
+    }
+
+    public void updateProfileImage(String url) {
+        this.profileImageUrl = url;
+    }
+
+    public void updateBio(String bio) {
+        this.bio = bio;
+    }
+
+    public void markAsDeleted() {
+        this.isDeleted = true;
+    }
+
+    // -------------------- Spring Security --------------------
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
@@ -98,28 +111,26 @@ public Collection<? extends GrantedAuthority> getAuthorities() {
 
     @Override
     public String getUsername() {
-        return this.email; // 로그인 시 사용할 사용자 식별자
+        return this.email; // 로그인 시 사용할 식별자
     }
 
     @Override
     public boolean isAccountNonExpired() {
-        return true; // 계정 만료 여부 (true = 사용 가능)
+        return true; // 계정 만료 안 됨
     }
 
     @Override
     public boolean isAccountNonLocked() {
-        return true; // 계정 잠금 여부 (true = 잠금 아님)
+        return true; // 잠금 아님
     }
 
     @Override
     public boolean isCredentialsNonExpired() {
-        return true; // 비밀번호 만료 여부
+        return true; // 비밀번호 만료 안 됨
     }
 
     @Override
     public boolean isEnabled() {
-        return !this.isDeleted; // 탈퇴 여부 기반 활성 상태
+        return !this.isDeleted; // 탈퇴 계정은 비활성화
     }
-
-
 }

src/main/java/com/example/FixLog/dto/member/LoginResponseDto.java

@@ -15,7 +15,6 @@ public class LoginResponseDto {
     private String nickname;
     private String profileImageUrl;
 
-    // 정적 팩토리 메서드
     public static LoginResponseDto from(Member member, String accessToken) {
         return new LoginResponseDto(
                 member.getUserId(),
@@ -26,4 +25,4 @@ public static LoginResponseDto from(Member member, String accessToken) {
                         : DefaultImage.PROFILE
         );
     }
-}
+}

src/main/java/com/example/FixLog/dto/member/MemberInfoResponseDto.java

@@ -1,12 +1,10 @@
 package com.example.FixLog.dto.member;
 
-import com.example.FixLog.domain.member.Member;
 import com.example.FixLog.domain.member.SocialType;
-import com.example.FixLog.util.DefaultImage;
-import com.example.FixLog.util.DefaultText;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+// 서비스단에서 최대한 처리하도록 수정
 @Getter
 @AllArgsConstructor
 public class MemberInfoResponseDto {
@@ -15,18 +13,4 @@ public class MemberInfoResponseDto {
     private String profileImageUrl;
     private String bio;
     private SocialType socialType;
-
-    public static MemberInfoResponseDto from(Member member) {
-        return new MemberInfoResponseDto(
-                member.getEmail(),
-                member.getNickname(),
-                member.getProfileImageUrl() != null
-                        ? member.getProfileImageUrl()
-                        : DefaultImage.PROFILE,
-                member.getBio() != null
-                        ? member.getBio()
-                        : DefaultText.BIO,
-                member.getSocialType()
-        );
-    }
 }