Merge pull request #197 from TeamMJK/fix/enum-string

fix: enum-string 변환 문제 해결

Author: y22jun

src/main/java/team/mjk/agent/domain/company/application/CompanyService.java

@@ -19,11 +19,9 @@
 import team.mjk.agent.domain.mcp.notion.domain.NotionRepository;
 import team.mjk.agent.domain.mcp.slack.domain.Slack;
 import team.mjk.agent.domain.mcp.slack.domain.SlackRepository;
-import team.mjk.agent.domain.member.application.dto.response.MemberGetInfoResponse2;
+import team.mjk.agent.domain.member.application.dto.response.MemberInfoGetResponse;
 import team.mjk.agent.domain.member.domain.Member;
 import team.mjk.agent.domain.member.domain.MemberRepository;
-import team.mjk.agent.domain.member.application.dto.response.MemberInfoGetResponse;
-import team.mjk.agent.domain.passport.domain.Passport;
 import team.mjk.agent.domain.passport.domain.PassportRepository;
 import team.mjk.agent.global.util.KmsUtil;
 
@@ -175,10 +173,10 @@ public CompanyMemberListResponse getMembersInfo(Long memberId) {
 
 
     log.info("===== [4] MemberInfo 매핑 시작 - 여기서 N+1 문제 발생 =====");
-    List<MemberGetInfoResponse2> memberInfoGetResponses = members.stream()
+    List<MemberInfoGetResponse> memberInfoGetResponses = members.stream()
             .map(m -> {
               log.info("[Lazy Loading] Member(id: {}) 연관 엔티티 접근 -> 추가 쿼리 발생", m.getId());
-              return MemberGetInfoResponse2.from(m, kmsUtil);
+              return MemberInfoGetResponse.from(m, kmsUtil);
             })
             .collect(Collectors.toList());
     log.info("===== [4] MemberInfo 매핑 완료. (총 {}개의 Lazy 추가 쿼리 발생) =====\n", members.size());
@@ -187,7 +185,7 @@ public CompanyMemberListResponse getMembersInfo(Long memberId) {
     log.info("===== [5] 최종 응답 생성 완료 =====");
 
     return CompanyMemberListResponse.builder()
-            .members2(memberInfoGetResponses)
+            .members(memberInfoGetResponses)
             .build();
   }
 

src/main/java/team/mjk/agent/domain/company/dto/response/CompanyMemberListResponse.java

@@ -2,15 +2,11 @@
 
 import java.util.List;
 import lombok.Builder;
-import team.mjk.agent.domain.member.application.dto.response.MemberGetInfoResponse2;
 import team.mjk.agent.domain.member.application.dto.response.MemberInfoGetResponse;
 
 @Builder
 public record CompanyMemberListResponse(
-    List<MemberInfoGetResponse> members,
-
-    List<MemberGetInfoResponse2> members2
-
+    List<MemberInfoGetResponse> members
 ) {
 
 }

src/main/java/team/mjk/agent/domain/member/application/dto/response/MemberGetInfoResponse2.java

@@ -3,10 +3,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.springframework.data.repository.query.Param;
 import team.mjk.agent.domain.company.domain.Company;
-import team.mjk.agent.domain.member.application.dto.response.MemberGetInfoResponse2;
-import team.mjk.agent.domain.member.application.dto.response.MemberInfoGetResponse;
 
 public interface MemberRepository {
 
@@ -22,8 +19,6 @@ public interface MemberRepository {
 
     List<Member> findAllByCompanyId(Long companyId);
 
-    List<MemberGetInfoResponse2> findAllMemberInfoByCompanyId(Long companyId);
-
     void delete(Long memberId);
 
     long countByCompanyId(Long companyId);

src/main/java/team/mjk/agent/domain/member/domain/MemberRepository.java

@@ -7,8 +7,6 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import team.mjk.agent.domain.company.domain.Company;
-import team.mjk.agent.domain.member.application.dto.response.MemberGetInfoResponse2;
-import team.mjk.agent.domain.member.application.dto.response.MemberInfoGetResponse;
 import team.mjk.agent.domain.member.domain.Member;
 
 import java.util.Optional;
@@ -23,15 +21,6 @@ public interface MemberJpaRepository extends JpaRepository<Member, Long> {
 
     List<Member> findAllByCompanyId(@Param("companyId") Long companyId);
 
-    @Query("select new team.mjk.agent.domain.member.application.dto.response.MemberGetInfoResponse2(" +
-            "m.name, m.email, m.firstName, m.lastName, m.phoneNumber, m.gender, m.birthDate, " +
-            "p.passportNumber, p.passportExpireDate) " +
-            "from Member m " +
-            "join m.company c " +
-            "left join m.passport p " +
-            "where c.id = :companyId")
-    List<MemberGetInfoResponse2> findAllMemberInfoByCompanyId(@Param("companyId") Long companyId);
-
     long countByCompanyId(Long companyId);
 
     void deleteAllByCompanyId(Long companyId);

src/main/java/team/mjk/agent/domain/member/infrastructure/MemberJpaRepository.java

@@ -4,8 +4,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 import team.mjk.agent.domain.company.domain.Company;
-import team.mjk.agent.domain.member.application.dto.response.MemberGetInfoResponse2;
-import team.mjk.agent.domain.member.application.dto.response.MemberInfoGetResponse;
 import team.mjk.agent.domain.member.domain.Member;
 import team.mjk.agent.domain.member.domain.MemberRepository;
 
@@ -49,11 +47,6 @@ public List<Member> findAllByCompanyId(Long companyId) {
     return memberJpaRepository.findAllByCompanyId(companyId);
   }
 
-  @Override
-  public List<MemberGetInfoResponse2> findAllMemberInfoByCompanyId(Long companyId) {
-    return memberJpaRepository.findAllMemberInfoByCompanyId(companyId);
-  }
-
   @Override
   public void delete(Long memberId) {
     memberJpaRepository.deleteById(memberId);