코드 리팩터링

space-d/src/main/java/com/dnd/spaced/core/account/application/AccountService.java

@@ -1,8 +1,8 @@
 package com.dnd.spaced.core.account.application;
 
 import com.dnd.spaced.core.account.application.dto.mapper.AccountResponseMapper;
-import com.dnd.spaced.core.account.application.dto.request.ChangeCareerInfoRequest;
-import com.dnd.spaced.core.account.application.dto.request.ChangeProfileInfoRequest;
+import com.dnd.spaced.core.account.application.dto.request.ChangeCareerRequest;
+import com.dnd.spaced.core.account.application.dto.request.ChangeProfileRequest;
 import com.dnd.spaced.core.account.application.dto.response.AccountResponse;
 import com.dnd.spaced.core.account.application.exception.ForbiddenAccountException;
 import com.dnd.spaced.core.account.domain.Account;
@@ -17,40 +17,65 @@
 public class AccountService {
 
     private final AccountRepository accountRepository;
+    private final AccountResponseMapper mapper;
 
     @Transactional
     public void withdrawal(Long accountId) {
-        Account authorizedAccount = findAuthorizedAccount(accountId);
+        Account account = findAccount(accountId);
 
-        authorizedAccount.withdrawal();
+        withdrawAccount(account);
     }
 
     @Transactional
-    public void changeCareerInfo(Long accountId, ChangeCareerInfoRequest request) {
-        Account authorizedAccount = findAuthorizedAccount(accountId);
+    public void changeCareer(Long accountId, ChangeCareerRequest request) {
+        Account account = findAccount(accountId);
 
-        authorizedAccount.changeCareerInfo(
-                request.changedJobGroupName(),
-                request.changedCompanyName(),
-                request.changedExperienceName()
-        );
+        updateAccountCareer(account, request);
     }
 
     @Transactional
-    public void changeProfileInfo(Long accountId, ChangeProfileInfoRequest request) {
-        Account authorizedAccount = findAuthorizedAccount(accountId);
-        ProfileImageName changedProfileImageName = ProfileImageName.findBy(request.changedProfileImageKoreanName());
+    public void changeProfile(Long accountId, ChangeProfileRequest request) {
+        Account account = findAccount(accountId);
+        ProfileImageName changedProfileImageName = findProfileImageName(request);
 
-        authorizedAccount.changeProfileInfo(request.changedNickname(), changedProfileImageName.getImageName());
+        updateAccountProfile(account, request, changedProfileImageName);
     }
 
     public AccountResponse readAccount(Long accountId) {
-        Account authorizedAccount = findAuthorizedAccount(accountId);
+        Account account = findAccount(accountId);
+
+        return convertAccountResponse(account);
+    }
+
+    private void withdrawAccount(Account account) {
+        account.withdrawal();
+    }
+
+    private ProfileImageName findProfileImageName(ChangeProfileRequest request) {
+        return ProfileImageName.findByKorean(request.changedProfileImageKoreanName());
+    }
+
+    private void updateAccountProfile(
+            Account account,
+            ChangeProfileRequest request,
+            ProfileImageName changedProfileImageName
+    ) {
+        account.changeProfile(request.changedNickname(), changedProfileImageName);
+    }
+
+    private void updateAccountCareer(Account account, ChangeCareerRequest request) {
+        account.changeCareer(
+                request.changedJobGroupName(),
+                request.changedCompanyName(),
+                request.changedExperienceName()
+        );
+    }
 
-        return AccountResponseMapper.toDto(authorizedAccount);
+    private AccountResponse convertAccountResponse(Account account) {
+        return mapper.toDto(account);
     }
 
-    private Account findAuthorizedAccount(Long accountId) {
+    private Account findAccount(Long accountId) {
         return accountRepository.findBy(accountId)
                                 .orElseThrow(() -> new ForbiddenAccountException("존재하지 않는 회원이거나 이미 탈퇴한 회원입니다."));
     }

space-d/src/main/java/com/dnd/spaced/core/account/application/dto/mapper/AccountResponseMapper.java

@@ -2,24 +2,23 @@
 
 import com.dnd.spaced.core.account.application.dto.response.AccountResponse;
 import com.dnd.spaced.core.account.domain.Account;
-import com.dnd.spaced.core.account.domain.embed.CareerInfo;
-import com.dnd.spaced.core.account.domain.embed.ProfileInfo;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
+import com.dnd.spaced.core.account.domain.embed.Career;
+import com.dnd.spaced.core.account.domain.embed.Profile;
+import com.dnd.spaced.global.mapper.Mapper;
 
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class AccountResponseMapper {
+@Mapper
+public class AccountResponseMapper {
 
-    public static AccountResponse toDto(Account account) {
-        ProfileInfo profileInfo = account.getProfileInfo();
-        CareerInfo careerInfo = account.getCareerInfo();
+    public AccountResponse toDto(Account account) {
+        Profile profile = account.getProfile();
+        Career career = account.getCareer();
 
         return new AccountResponse(
-                profileInfo.getNickname(),
-                profileInfo.getProfileImage(),
-                careerInfo.getJobGroup().getName(),
-                careerInfo.getCompany().getName(),
-                careerInfo.getExperience().getName()
+                profile.getNickname(),
+                profile.getProfileImageName(),
+                career.getJobGroup().getName(),
+                career.getCompany().getName(),
+                career.getExperience().getName()
         );
     }
 }

space-d/src/main/java/com/dnd/spaced/core/account/application/dto/request/ChangeCareerInfoRequest.java → space-d/src/main/java/com/dnd/spaced/core/account/application/dto/request/ChangeCareerRequest.java

@@ -2,7 +2,7 @@
 
 import jakarta.validation.constraints.NotBlank;
 
-public record ChangeCareerInfoRequest(
+public record ChangeCareerRequest(
         @NotBlank
         String changedJobGroupName,
 

space-d/src/main/java/com/dnd/spaced/core/account/application/dto/request/ChangeProfileInfoRequest.java → space-d/src/main/java/com/dnd/spaced/core/account/application/dto/request/ChangeProfileRequest.java

@@ -2,7 +2,7 @@
 
 import jakarta.validation.constraints.NotBlank;
 
-public record ChangeProfileInfoRequest(
+public record ChangeProfileRequest(
         @NotBlank
         String changedNickname,
 

space-d/src/main/java/com/dnd/spaced/core/account/domain/Account.java

@@ -1,8 +1,9 @@
 package com.dnd.spaced.core.account.domain;
 
-import com.dnd.spaced.core.account.domain.embed.CareerInfo;
-import com.dnd.spaced.core.account.domain.embed.ProfileInfo;
-import com.dnd.spaced.core.account.domain.embed.SocialInfo;
+import com.dnd.spaced.core.account.domain.embed.Career;
+import com.dnd.spaced.core.account.domain.embed.Profile;
+import com.dnd.spaced.core.account.domain.embed.Social;
+import com.dnd.spaced.core.account.domain.enums.ProfileImageName;
 import com.dnd.spaced.core.account.domain.enums.RegistrationId;
 import com.dnd.spaced.core.account.domain.enums.Role;
 import com.dnd.spaced.global.audit.BaseTimeEntity;
@@ -37,44 +38,44 @@ public class Account extends BaseTimeEntity {
     private boolean deleted = false;
 
     @Embedded
-    private SocialInfo socialInfo;
+    private Social social;
 
     @Embedded
-    private ProfileInfo profileInfo;
+    private Profile profile;
 
     @Embedded
-    private CareerInfo careerInfo;
+    private Career career;
 
     @Builder
     private Account(
             String nickname,
-            String profileImage,
+            ProfileImageName profileImageName,
             Role role,
             RegistrationId registrationId,
             String socialIdentifier
     ) {
-        this.profileInfo = ProfileInfo.of(nickname, profileImage);
+        this.profile = Profile.of(nickname, profileImageName);
         this.role = role;
-        this.socialInfo = new SocialInfo(registrationId, socialIdentifier);
+        this.social = new Social(registrationId, socialIdentifier);
     }
 
     public void withdrawal() {
         this.deleted = true;
     }
 
-    public void changeCareerInfo(
+    public void changeCareer(
             String changedJobGroupName,
             String changedCompanyName,
             String changedExperienceName) {
-        this.careerInfo = CareerInfo.builder()
-                                    .jobGroupName(changedJobGroupName)
-                                    .companyName(changedCompanyName)
-                                    .experienceName(changedExperienceName)
-                                    .build();
+        this.career = Career.builder()
+                            .jobGroupName(changedJobGroupName)
+                            .companyName(changedCompanyName)
+                            .experienceName(changedExperienceName)
+                            .build();
     }
 
-    public void changeProfileInfo(String changedNickname, String changedProfileImage) {
-        this.profileInfo = ProfileInfo.of(changedNickname, changedProfileImage);
+    public void changeProfile(String changedNickname, ProfileImageName changedProfileImageName) {
+        this.profile = Profile.of(changedNickname, changedProfileImageName);
     }
 
     public boolean isEqualTo(Long id) {

space-d/src/main/java/com/dnd/spaced/core/account/domain/embed/CareerInfo.java → space-d/src/main/java/com/dnd/spaced/core/account/domain/embed/Career.java

@@ -14,7 +14,7 @@
 @Getter
 @Embeddable
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class CareerInfo {
+public class Career {
 
     @Enumerated(EnumType.STRING)
     private JobGroup jobGroup;
@@ -26,7 +26,7 @@ public class CareerInfo {
     private Experience experience;
 
     @Builder
-    private CareerInfo(String jobGroupName, String companyName, String experienceName) {
+    private Career(String jobGroupName, String companyName, String experienceName) {
         this.jobGroup = JobGroup.findBy(jobGroupName);
         this.company = Company.findBy(companyName);
         this.experience = Experience.findBy(experienceName);

space-d/src/main/java/com/dnd/spaced/core/account/domain/embed/ProfileInfo.java → space-d/src/main/java/com/dnd/spaced/core/account/domain/embed/Profile.java

@@ -2,6 +2,7 @@
 
 import com.dnd.spaced.core.account.domain.embed.exception.InvalidNicknameException;
 import com.dnd.spaced.core.account.domain.embed.exception.InvalidProfileImageException;
+import com.dnd.spaced.core.account.domain.enums.ProfileImageName;
 import jakarta.persistence.Embeddable;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -10,7 +11,7 @@
 @Getter
 @Embeddable
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class ProfileInfo {
+public class Profile {
 
     private static final int NICKNAME_MIN_LENGTH = 5;
     private static final int NICKNAME_MAX_LENGTH = 10;
@@ -21,20 +22,24 @@ public class ProfileInfo {
     );
 
     private String nickname;
-    private String profileImage;
+    private String profileImageName;
 
-    public static ProfileInfo of(String nickname, String profileImage) {
-        validateContent(nickname, profileImage);
+    public static Profile of(String nickname, ProfileImageName profileImageName) {
+        validateNickname(nickname);
+        validateProfileImageName(profileImageName);
 
-        return new ProfileInfo(nickname, profileImage);
+        return new Profile(nickname, profileImageName.getImageName());
     }
 
-    private static void validateContent(String nickname, String profileImage) {
+    private static void validateNickname(String nickname) {
         if (isInvalidNickname(nickname)) {
             throw new InvalidNicknameException(NICKNAME_EXCEPTION_MESSAGE);
         }
-        if (isInvalidProfileImage(profileImage)) {
-            throw new InvalidProfileImageException("프로필 이미지 정보는 null이거나 비어 있을 수 없습니다.");
+    }
+
+    private static void validateProfileImageName(ProfileImageName profileImageName) {
+        if (isInvalidProfileImageName(profileImageName)) {
+            throw new InvalidProfileImageException("프로필 이미지 정보는 null일 수 없습니다.");
         }
     }
 
@@ -43,19 +48,12 @@ private static boolean isInvalidNickname(String nickname) {
                 || nickname.length() < NICKNAME_MIN_LENGTH || nickname.length() > NICKNAME_MAX_LENGTH;
     }
 
-    private static boolean isInvalidProfileImage(String profileImage) {
-        return profileImage == null || profileImage.isBlank();
+    private static boolean isInvalidProfileImageName(ProfileImageName profileImageName) {
+        return profileImageName == null;
     }
 
-    private ProfileInfo(String nickname, String profileImage) {
+    private Profile(String nickname, String profileImageName) {
         this.nickname = nickname;
-        this.profileImage = profileImage;
-    }
-
-    public void changeProfileInfo(String changedNickname, String changedProfileImage) {
-        validateContent(changedNickname, changedProfileImage);
-
-        this.nickname = changedNickname;
-        this.profileImage = changedProfileImage;
+        this.profileImageName = profileImageName;
     }
 }

space-d/src/main/java/com/dnd/spaced/core/account/domain/embed/SocialInfo.java → space-d/src/main/java/com/dnd/spaced/core/account/domain/embed/Social.java

@@ -11,15 +11,15 @@
 @Getter
 @Embeddable
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class SocialInfo {
+public class Social {
 
     @Enumerated(EnumType.STRING)
     private RegistrationId registrationId;
 
-    private String socialIdentifier;
+    private String socialId;
 
-    public SocialInfo(RegistrationId registrationId, String socialIdentifier) {
+    public Social(RegistrationId registrationId, String socialId) {
         this.registrationId = registrationId;
-        this.socialIdentifier = socialIdentifier;
+        this.socialId = socialId;
     }
 }

space-d/src/main/java/com/dnd/spaced/core/account/domain/enums/ProfileImageName.java

@@ -32,10 +32,17 @@ public static ProfileImageName findRandom() {
                      .orElse(EARTH);
     }
 
-    public static ProfileImageName findBy(String korean) {
+    public static ProfileImageName findByKorean(String korean) {
         return Arrays.stream(ProfileImageName.values())
                      .filter(profileImageName -> profileImageName.korean.equals(korean))
                      .findAny()
                      .orElseThrow(() -> new InvalidProfileImageNameException(String.format(EXCEPTION_MESSAGE, korean)));
     }
+
+    public static ProfileImageName findByImageName(String imageName) {
+        return Arrays.stream(ProfileImageName.values())
+                     .filter(profileImageName -> profileImageName.imageName.equals(imageName))
+                     .findAny()
+                     .orElseThrow(() -> new InvalidProfileImageNameException(String.format(EXCEPTION_MESSAGE, imageName)));
+    }
 }

space-d/src/main/java/com/dnd/spaced/core/account/domain/repository/AccountRepository.java

@@ -1,7 +1,7 @@
 package com.dnd.spaced.core.account.domain.repository;
 
 import com.dnd.spaced.core.account.domain.Account;
-import com.dnd.spaced.core.account.domain.enums.RegistrationId;
+import com.dnd.spaced.core.account.domain.embed.Social;
 import java.util.Optional;
 
 public interface AccountRepository {
@@ -12,7 +12,7 @@ public interface AccountRepository {
 
     Optional<Account> findBy(Long accountId);
 
-    Optional<Account> findBy(RegistrationId registrationId, String socialIdentifier);
+    Optional<Account> findBy(Social social);
 
     Optional<Account> findPreInitializationAccountBy(Long accountId);
 }