refactor(persist): refactor persist login

src/main/java/com/e2i/wemeet/domain/code/CodePk.java

@@ -1,5 +1,6 @@
 package com.e2i.wemeet.domain.code;
 
+import com.e2i.wemeet.util.validator.CustomFormatValidator;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import java.io.Serializable;
@@ -27,6 +28,8 @@ public CodePk(String codeId, String groupCodeId) {
 
     // CE-001 -> CODE PK 생성
     public static CodePk of(final String groupCodeIdWithCodeId) {
+        CustomFormatValidator.validateCodePkFormat(groupCodeIdWithCodeId);
+
         final String[] split = groupCodeIdWithCodeId.split("-");
         return new CodePk(split[1], split[0]);
     }

src/main/java/com/e2i/wemeet/domain/code/CodeRepository.java

@@ -1,5 +1,6 @@
 package com.e2i.wemeet.domain.code;
 
+import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
@@ -9,4 +10,6 @@ public interface CodeRepository extends JpaRepository<Code, CodePk> {
 
     Optional<Code> findByCodePk(CodePk codePk);
 
+    List<Code> findByCodePkIn(List<CodePk> codePkList);
+
 }

src/main/java/com/e2i/wemeet/domain/member/Member.java

@@ -72,9 +72,6 @@ public class Member extends BaseTimeEntity {
     @Column(nullable = false)
     private Integer credit;
 
-    @Column
-    private Boolean imageAuth;
-
     @Embedded
     private ProfileImage profileImage;
 
@@ -99,7 +96,6 @@ public Member(String nickname, Gender gender, String phoneNumber, String email,
         this.collegeInfo = collegeInfo;
         this.mbti = mbti;
         this.credit = credit;
-        this.imageAuth = imageAuth;
         this.profileImage = profileImage;
         this.role = role;
     }

src/main/java/com/e2i/wemeet/domain/member/MemberRepository.java

@@ -1,11 +1,10 @@
 package com.e2i.wemeet.domain.member;
 
-import com.e2i.wemeet.domain.member.persist.PersistLoginRepository;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
-public interface MemberRepository extends JpaRepository<Member, Long>, PersistLoginRepository {
+public interface MemberRepository extends JpaRepository<Member, Long> {
 
     Optional<Member> findByPhoneNumber(String phoneNumber);
 

src/main/java/com/e2i/wemeet/domain/member/data/ProfileImage.java

@@ -13,10 +13,20 @@ public class ProfileImage {
 
     private String basicUrl;
     private String lowUrl;
+    private Boolean imageAuth;
 
     @Builder
-    public ProfileImage(String basicUrl, String lowUrl) {
+    public ProfileImage(String basicUrl, String lowUrl, Boolean imageAuth) {
         this.basicUrl = basicUrl;
         this.lowUrl = lowUrl;
+        this.imageAuth = imageAuth;
+    }
+
+    public boolean hasProfileImage() {
+        return basicUrl != null;
+    }
+
+    public boolean isImageAuthenticated() {
+        return imageAuth;
     }
 }

src/main/java/com/e2i/wemeet/domain/member/persist/PersistData.java

@@ -0,0 +1,12 @@
+package com.e2i.wemeet.domain.member.persist;
+
+import com.e2i.wemeet.domain.member.data.ProfileImage;
+
+public record PersistData(
+    String nickname,
+    String email,
+    ProfileImage profileImage,
+    Long teamId
+) {
+
+}

src/main/java/com/e2i/wemeet/domain/member/persist/PersistLoginRepository.java

@@ -1,8 +1,9 @@
 package com.e2i.wemeet.domain.member.persist;
 
 import com.e2i.wemeet.dto.response.persist.PersistResponseDto;
+import java.util.Optional;
 
 public interface PersistLoginRepository {
 
-    PersistResponseDto findPersistResponseById(Long memberId);
+    Optional<PersistResponseDto> findPersistResponseById(Long memberId);
 }

src/main/java/com/e2i/wemeet/domain/member/persist/PersistLoginRepositoryImpl.java

@@ -1,32 +1,39 @@
 package com.e2i.wemeet.domain.member.persist;
 
+import static com.e2i.wemeet.domain.member.QMember.member;
+import static com.e2i.wemeet.domain.team.QTeam.team;
+
 import com.e2i.wemeet.dto.response.persist.PersistResponseDto;
+import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
-// TODO :: service refactoring
 @Repository
 @RequiredArgsConstructor
 public class PersistLoginRepositoryImpl implements PersistLoginRepository {
 
     private final JPAQueryFactory queryFactory;
 
-    // TODO :: service refactoring
     @Override
-    public PersistResponseDto findPersistResponseById(Long memberId) {
-//        Optional<PersistLoginData> persistLoginData = Optional.ofNullable(queryFactory
-//            .select(Projections.constructor(
-//                PersistLoginData.class,
-//                member.nickname,
-//                member.collegeInfo.mail.as("email"),
-//                team.teamId
-//            ))
-//            .from(member)
-//            .leftJoin(member.team, team)
-//            .where(member.memberId.eq(memberId))
-//            .fetchOne());
+    public Optional<PersistResponseDto> findPersistResponseById(Long memberId) {
+        PersistData findPersistData = queryFactory
+            .select(Projections.constructor(
+                PersistData.class,
+                member.nickname,
+                member.email,
+                member.profileImage,
+                team.teamId
+            ))
+            .from(member)
+            .leftJoin(member.team, team)
+            .where(member.memberId.eq(memberId))
+            .fetchOne();
 
-        return null;
+        if (findPersistData == null) {
+            return Optional.empty();
+        }
+        return Optional.ofNullable(PersistResponseDto.of(findPersistData));
     }
 }

src/main/java/com/e2i/wemeet/dto/response/persist/PersistResponseDto.java

@@ -1,21 +1,64 @@
 package com.e2i.wemeet.dto.response.persist;
 
+import com.e2i.wemeet.domain.member.data.ProfileImage;
+import com.e2i.wemeet.domain.member.persist.PersistData;
+import java.util.Objects;
 import lombok.Builder;
 
-// TODO :: service refactoring
 @Builder
 public record PersistResponseDto(
     String nickname,
     boolean emailAuthenticated,
-    boolean preferenceCompleted,
     boolean hasMainProfileImage,
+    String basicProfileImage,
+    String lowProfileImage,
     boolean profileImageAuthenticated,
     boolean hasTeam
 ) {
 
+    public static PersistResponseDto of(PersistData persistData) {
+        final boolean emailAuthenticated = persistData.email() != null;
+        final boolean hasTeam = persistData.teamId() != null;
+
+        PersistResponseDtoBuilder builder = PersistResponseDto.builder()
+            .nickname(persistData.nickname())
+            .emailAuthenticated(emailAuthenticated)
+            .hasTeam(hasTeam);
+
+        if (Objects.isNull(persistData.profileImage())) {
+            return createResponseHasNoImage(builder);
+        }
+        return createResponse(persistData.profileImage(), builder);
+    }
+
+    private static PersistResponseDto createResponse(ProfileImage profileImage, PersistResponseDtoBuilder builder) {
+        return builder
+            .hasMainProfileImage(profileImage.hasProfileImage())
+            .profileImageAuthenticated(profileImage.isImageAuthenticated())
+            .basicProfileImage(profileImage.getBasicUrl())
+            .lowProfileImage(profileImage.getLowUrl())
+            .build();
+    }
+
+    private static PersistResponseDto createResponseHasNoImage(PersistResponseDtoBuilder builder) {
+        return builder
+            .hasMainProfileImage(false)
+            .profileImageAuthenticated(false)
+            .basicProfileImage(null)
+            .lowProfileImage(null)
+            .build();
+    }
+
+    @Override
     public String toString() {
-        return "PersistResponseDto(nickname=" + this.nickname() + ", emailAuthenticated=" + this.emailAuthenticated() + ", preferenceCompleted="
-            + this.preferenceCompleted() + ", hasMainProfileImage=" + this.hasMainProfileImage() + ", profileImageAuthenticated="
-            + this.profileImageAuthenticated() + ", hasTeam=" + this.hasTeam() + ")";
+        return "PersistResponseDto{" +
+            "nickname='" + nickname + '\'' +
+            ", emailAuthenticated=" + emailAuthenticated +
+            ", hasMainProfileImage=" + hasMainProfileImage +
+            ", basicProfileImage='" + basicProfileImage + '\'' +
+            ", lowProfileImage='" + lowProfileImage + '\'' +
+            ", profileImageAuthenticated=" + profileImageAuthenticated +
+            ", hasTeam=" + hasTeam +
+            '}';
     }
 }

src/main/java/com/e2i/wemeet/security/model/MemberPrincipal.java

@@ -104,7 +104,7 @@ public String toString() {
                 .map(GrantedAuthority::getAuthority)
                 .toList()
         );
-        final String format = "MemberPrincipal(memberId=%d, role=%s, registrationType=%s)";
+        final String format = "MemberPrincipal(memberId=%d, role=%s)";
 
         return String.format(format, memberId, role);
     }

src/main/java/com/e2i/wemeet/security/provider/SmsUserDetailsService.java

@@ -3,6 +3,7 @@
 import com.e2i.wemeet.domain.member.Member;
 import com.e2i.wemeet.domain.member.MemberRepository;
 import com.e2i.wemeet.security.model.MemberPrincipal;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -18,12 +19,10 @@ public class SmsUserDetailsService implements UserDetailsService {
      */
     @Override
     public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException {
-        Member member = memberRepository.findByPhoneNumber(username).orElse(null);
+        Optional<Member> member = memberRepository.findByPhoneNumber(username);
 
         // SMS 인증을 요청한 사용자가 회원가입이 되어있지 않을 경우
-        if (member == null) {
-            return new MemberPrincipal();
-        }
-        return new MemberPrincipal(member);
+        return member.map(MemberPrincipal::new)
+            .orElseGet(MemberPrincipal::new);
     }
 }

src/main/java/com/e2i/wemeet/service/code/CodeServiceImpl.java

@@ -3,39 +3,23 @@
 import com.e2i.wemeet.domain.code.Code;
 import com.e2i.wemeet.domain.code.CodePk;
 import com.e2i.wemeet.domain.code.CodeRepository;
-import com.e2i.wemeet.exception.ErrorCode;
-import com.e2i.wemeet.exception.badrequest.InvalidDataFormatException;
-import com.e2i.wemeet.exception.notfound.CodeNotFoundException;
-import java.util.ArrayList;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @RequiredArgsConstructor
+@Transactional(readOnly = true)
 @Service
 public class CodeServiceImpl implements CodeService {
 
     private final CodeRepository codeRepository;
 
-    public List<Code> findCodeList(List<String> dataList) {
-        List<Code> result = new ArrayList<>();
-        for (String data : dataList) {
-            String[] splitCode = splitString(data);
-            Code code = codeRepository.findById(new CodePk(splitCode[1], splitCode[0]))
-                .orElseThrow(CodeNotFoundException::new);
+    public List<Code> findCodeList(List<String> codeList) {
+        List<CodePk> codePks = codeList.stream()
+            .map(CodePk::of)
+            .toList();
 
-            result.add(code);
-        }
-
-        return result;
-    }
-
-    private String[] splitString(String input) {
-        String[] splitArray = input.split("_");
-        if (splitArray.length != 2) {
-            throw new InvalidDataFormatException(ErrorCode.INVALID_CODE_FORMAT);
-        }
-
-        return splitArray;
+        return codeRepository.findByCodePkIn(codePks);
     }
 }

src/main/java/com/e2i/wemeet/service/token/TokenServiceImpl.java

@@ -2,6 +2,7 @@
 
 import com.e2i.wemeet.domain.member.persist.PersistLoginRepository;
 import com.e2i.wemeet.dto.response.persist.PersistResponseDto;
+import com.e2i.wemeet.exception.notfound.MemberNotFoundException;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +20,7 @@ public TokenServiceImpl(
     @Transactional(readOnly = true)
     @Override
     public PersistResponseDto persistLogin(final Long memberId) {
-        return persistLoginRepository.findPersistResponseById(memberId);
+        return persistLoginRepository.findPersistResponseById(memberId)
+            .orElseThrow(MemberNotFoundException::new);
     }
 }

src/main/java/com/e2i/wemeet/util/validator/CustomFormatValidator.java

@@ -5,6 +5,7 @@
 import static com.e2i.wemeet.exception.ErrorCode.INVALID_NICKNAME_FORMAT;
 import static com.e2i.wemeet.exception.ErrorCode.INVALID_PHONE_FORMAT;
 
+import com.e2i.wemeet.exception.ErrorCode;
 import com.e2i.wemeet.exception.badrequest.InvalidDataFormatException;
 import java.util.regex.Pattern;
 
@@ -22,6 +23,7 @@ private CustomFormatValidator() {
     private static final Pattern SMS_CREDENTIAL_REG = Pattern.compile("^\\d{6}$");
     private static final Pattern EMAIL_CREDENTIAL_REG = Pattern.compile("^\\d{6}$");
     private static final Pattern NICKNAME_PATTERN = Pattern.compile("^[가-힣\\s]{2,10}$");
+    private static final Pattern CODE_PK_PATTERN = Pattern.compile("^[A-Z]{2}-\\d{3}$");
 
     public static void validatePhoneFormat(final String phone) {
         if (!PHONE_REG.matcher(phone).matches()) {
@@ -52,4 +54,10 @@ public static void validateNicknameFormat(final String nickname) {
             throw new InvalidDataFormatException(INVALID_NICKNAME_FORMAT);
         }
     }
+
+    public static void validateCodePkFormat(final String groupCodeIdWithCodeId) {
+        if (!CODE_PK_PATTERN.matcher(groupCodeIdWithCodeId).matches()) {
+            throw new InvalidDataFormatException(ErrorCode.INVALID_DATA_FORMAT);
+        }
+    }
 }