refactor : project list api에 발생하던 N+1 해결을 위해 user수정

kwonhee1 · kwonhee1 · commit f8b2420ee1f7 · 2025-10-06T16:56:00.000+09:00
diff --git a/src/main/java/NextLevel/demo/img/ImgDto.java b/src/main/java/NextLevel/demo/img/ImgDto.java
@@ -3,8 +3,10 @@
 import NextLevel.demo.img.entity.ImgEntity;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter @Setter
+@ToString
 public class ImgDto {
 
     private static final String DEFAULT_IMG_URI = "very_very_long_and_long_default_img.png";
diff --git a/src/main/java/NextLevel/demo/project/project/dto/response/ResponseProjectDetailDto.java b/src/main/java/NextLevel/demo/project/project/dto/response/ResponseProjectDetailDto.java
@@ -53,7 +53,7 @@ public static ResponseProjectDetailDto of(ProjectEntity entity, Long fundingPric
         dto.setSum(fundingPrice);
         dto.setCompletionRate(FundingUtil.getCompletionRate(dto.sum, dto.goal));
         dto.setLikeCount(entity.getLikes().size());
-        dto.setIsAuthor(entity.getUser().getId() == userId);
+        dto.setIsAuthor(entity.getUser().getId().equals(userId));
         dto.status = entity.getProjectStatus().name();
         dto.startAt = entity.getStartAt();
         dto.expiredAt = entity.getExpiredAt();
diff --git a/src/main/java/NextLevel/demo/project/project/dto/response/ResponseProjectListDetailDto.java b/src/main/java/NextLevel/demo/project/project/dto/response/ResponseProjectListDetailDto.java
@@ -19,6 +19,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.Hibernate;
 
 @Getter
 @Setter
diff --git a/src/main/java/NextLevel/demo/project/project/dto/response/ResponseProjectListDto.java b/src/main/java/NextLevel/demo/project/project/dto/response/ResponseProjectListDto.java
@@ -1,6 +1,7 @@
 package NextLevel.demo.project.project.dto.response;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -19,4 +20,14 @@ public ResponseProjectListDto(List<ResponseProjectListDetailDto> projects, long
         this.page = page;
         this.totalCount = totalCount;
     }
+
+    @Override
+    public String toString() {
+        return "ResponseProjectListDto{" +
+                "projects=" + Arrays.toString(projects.toArray()) +
+                ", totalCount=" + totalCount +
+                ", pageCount=" + pageCount +
+                ", page=" + page +
+                '}';
+    }
 }
diff --git a/src/main/java/NextLevel/demo/project/project/entity/ProjectEntity.java b/src/main/java/NextLevel/demo/project/project/entity/ProjectEntity.java
@@ -43,7 +43,7 @@ public class ProjectEntity extends BasedEntity {
     @Column(nullable = false)
     private String content;
 
-    @ManyToOne(targetEntity = ImgEntity.class, fetch = FetchType.EAGER)
+    @ManyToOne(targetEntity = ImgEntity.class, fetch = FetchType.LAZY) // project list api에서 N+1을 발생 시킴
     @JoinColumn(name = "img_id")
     private ImgEntity titleImg;
 
@@ -112,12 +112,12 @@ public ProjectEntity(Long id, UserEntity user, String title, String content,
     public String toString() {
         return "ProjectEntity{" +
             "id=" + id +
-            ", user=" + user +
+           // ", user=" + user +
             ", title='" + title + '\'' +
             ", content='" + content + '\'' +
-            ", titleImg=" + titleImg +
+           // ", titleImg=" + titleImg +
             ", tags=" + tags +
-            ", imgs=" + stories +
+           // ", imgs=" + stories +
             '}';
     }
 }
diff --git a/src/main/java/NextLevel/demo/project/project/repository/ProjectDslRepository.java b/src/main/java/NextLevel/demo/project/project/repository/ProjectDslRepository.java
@@ -27,7 +27,7 @@ public ResponseProjectListDto selectProjectDsl(RequestMainPageProjectListDto dto
         QProjectTagEntity projectTagEntity = new QProjectTagEntity("projectTagEntity");
         SelectProjectListDslRepository.Builder builder = selectProjectRepository
                 .builder(dto.getUserId())
-                .leftJoin(projectTagEntity, QProjectEntity.class, (project)->projectTagEntity.project.id.eq(project.id), false);
+                .leftJoin(projectTagEntity, QProjectEntity.class, (project)->projectTagEntity.project.id.eq(project.id));
 
         String search = dto.getSearch();
         if(search != null && !search.isEmpty())
diff --git a/src/main/java/NextLevel/demo/project/select/SelectProjectListDslRepository.java b/src/main/java/NextLevel/demo/project/select/SelectProjectListDslRepository.java
@@ -58,7 +58,7 @@ public Builder(JPAQueryFactory queryFactory, Long userId) {
                     .select(projectEntity.count())
                     .from(projectEntity)
                     .leftJoin(likeEntity).on(likeEntity.project.id.eq(projectEntity.id))
-                    .leftJoin(isLikeEntity).on(likeEntity.project.id.eq(projectEntity.id).and(isLikeEntity.user.id.eq(userId)))
+                    .leftJoin(isLikeEntity).on(likeEntity.project.id.eq(projectEntity.id).and(userId!=null?isLikeEntity.user.id.eq(userId):Expressions.FALSE))
                     .leftJoin(viewEntity).on(viewEntity.project.id.eq(projectEntity.id));
 
             mainQuery = queryFactory
@@ -79,23 +79,16 @@ public Builder(JPAQueryFactory queryFactory, Long userId) {
                     .leftJoin(projectEntity.user, userEntity).fetchJoin()
                     .leftJoin(projectEntity.titleImg).fetchJoin()
                     .leftJoin(likeEntity).on(likeEntity.project.id.eq(projectEntity.id))
-                    .leftJoin(isLikeEntity).on(likeEntity.project.id.eq(projectEntity.id).and(isLikeEntity.user.id.eq(userId)))
+                    .leftJoin(isLikeEntity).on(likeEntity.project.id.eq(projectEntity.id).and(userId!=null?isLikeEntity.user.id.eq(userId):Expressions.FALSE))
                     .leftJoin(viewEntity).on(viewEntity.project.id.eq(projectEntity.id));
         }
         public <T extends EntityPathBase,J extends EntityPathBase> Builder leftJoin(
                 T joinEntity,
-                Class<J> entityClass, FunctionInterface<BooleanExpression, J> onFunction,
-                boolean isFetch
+                Class<J> entityClass, FunctionInterface<BooleanExpression, J> onFunction
         ){
             J entity = (J) getEntity(entityClass);
-            if(isFetch) {
-                log.info("fetch join" + joinEntity.toString());
-                //mainQuery.leftJoin(joinEntity).on(onFunction.function(entity)).fetchJoin();
-                //mainQuery.join(projectEntity.options).fetchJoin();
-            }
-            else
-                mainQuery.leftJoin(joinEntity).on(onFunction.function(entity));
 
+            mainQuery.leftJoin(joinEntity).on(onFunction.function(entity));
             totalCountQuery.leftJoin(joinEntity).on(onFunction.function(entity));
             return this;
         }
diff --git a/src/main/java/NextLevel/demo/project/select/refactoring.txt b/src/main/java/NextLevel/demo/project/select/refactoring.txt
@@ -127,4 +127,9 @@ query dsl을 도입하고자 하는 사람들에게
     진짜 다 쓸모 없고 조건에 맞는 List<Long> pk값 조회하고 다른 정보들 싹다 sub query 때는게 더 빠름 결론이 진심 ㅈ같다
 
 결론 : project list api는 최대한 left join으로 최적화에 성공했음 때문에 일단 funding 정보는 따로 조회하는 걸로 이번 refactoring을 마무리한다
- 추후 현 query 조회 속도를 측정하고 main query와 list query를 분리한다
+ 추후 현 query 조회 속도를 측정하고 main query와 list query를 분리한다
+
+추가 수정 left join fetch는 QEntity만으로 부족하다
+    join(projectEntity.projectTag, tagEntity).fetchJoin() 방식이 필요하다
+    문명 QProjectEntity의 연결된 변수들 중 QProjectTagEntity.class와 같은 변수를 찾는다면 찾을 수는 있다
+    하지만 left join중에 더 이상 fetch가 필요한 table이 없음으로 fetch = false 로 고정한다
diff --git a/src/main/java/NextLevel/demo/user/dto/user/response/UserSummeryInfoDto.java b/src/main/java/NextLevel/demo/user/dto/user/response/UserSummeryInfoDto.java
@@ -4,10 +4,12 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @NoArgsConstructor
 @Getter
 @Setter
+@ToString
 public class UserSummeryInfoDto {
 
     private String name;
diff --git a/src/main/java/NextLevel/demo/user/entity/UserDetailEntity.java b/src/main/java/NextLevel/demo/user/entity/UserDetailEntity.java
@@ -1,14 +1,6 @@
 package NextLevel.demo.user.entity;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.MapsId;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.ColumnDefault;
 
@@ -18,12 +10,11 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class UserDetailEntity {
     @Id
-    @Column(name = "user_id")
-    private Long userId;
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
 
-    @MapsId
-    @OneToOne(targetEntity = UserEntity.class, fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
-    @JoinColumn(name="user_id")
+    @ManyToOne(targetEntity = UserEntity.class, fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
+    @JoinColumn(name="user_id", unique = true)
     private UserEntity user;
 
     @Column(length = 36, columnDefinition = "CHAR(36)", unique = true, nullable = false) // default 값 없음 무조건 코드로 넣기 필수 !!
@@ -60,4 +51,5 @@ public UserDetailEntity(UserEntity user, String UUID, String role, String email)
     }
 
     public void setEmail(String email) {this.email = email;}
+    public Long getUserId() { return user.getId(); }
 }
diff --git a/src/main/java/NextLevel/demo/user/entity/UserEntity.java b/src/main/java/NextLevel/demo/user/entity/UserEntity.java
@@ -19,6 +19,11 @@
 import lombok.*;
 import org.hibernate.annotations.ColumnDefault;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 @Entity
 @Table(name = "user")
 @Getter
@@ -52,12 +57,21 @@ public class UserEntity extends BasedEntity {
     @Column(length=5, columnDefinition = "char(6)")
     private String role = UserRole.SOCIAL.name();
 
-    @ManyToOne(fetch = FetchType.EAGER,cascade = CascadeType.REMOVE, optional = true)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, optional = true)
     @JoinColumn(name = "img_id", nullable = true)
     private ImgEntity img;
 
-    @OneToOne(mappedBy = "user", fetch = FetchType.LAZY)
-    private UserDetailEntity userDetail;
+    @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
+    private List<UserDetailEntity> userDetail;
+
+    public UserDetailEntity getUserDetail() {
+        return userDetail.getFirst();
+    }
+
+    public void setUserDetail(UserDetailEntity detailEntity) {
+        userDetail = new ArrayList<>();
+        userDetail.add(detailEntity);
+    }
 
     @Builder
     public UserEntity(Long id, String name,String nickName, int point, String address, String number, String areaNumber, ImgEntity img) {
diff --git a/src/main/java/NextLevel/demo/user/repository/UserDetailRepository.java b/src/main/java/NextLevel/demo/user/repository/UserDetailRepository.java
@@ -17,7 +17,7 @@ public interface UserDetailRepository extends JpaRepository<UserDetailEntity, Lo
 
     Optional<UserDetailEntity> findByEmail(String email);
 
-    @Query("update UserDetailEntity u set u.password = :password where u.userId = :userId")
+    @Query("update UserDetailEntity u set u.password = :password where u.user.id = :userId")
     @Modifying
     void updatePasswordByUserId(@Param("password") String password, @Param("userId") Long userId);
 }
diff --git a/src/main/java/NextLevel/demo/user/repository/UserProjectDslRepository.java b/src/main/java/NextLevel/demo/user/repository/UserProjectDslRepository.java
@@ -38,7 +38,7 @@ public ResponseProjectListDto myProject(RequestMyPageProjectListDto dto) {
 
         List<Long> tagIds = dto.getTag();
         if(tagIds != null && !tagIds.isEmpty()){
-            builder.leftJoin(tag, QProjectEntity.class, project->project.id.eq(tag.project.id), false);
+            builder.leftJoin(tag, QProjectEntity.class, project->project.id.eq(tag.project.id));
             builder.where(null, entity->tag.tag.id.in(tagIds));
         }
 
@@ -68,8 +68,7 @@ private void where(SelectProjectListDslRepository.Builder builder, Long userId,
                 builder = builder.leftJoin(
                         view,
                         QProjectEntity.class,
-                        (project)->view.user.id.eq(userId).and(project.id.eq(view.project.id)),
-                        false
+                        (project)->view.user.id.eq(userId).and(project.id.eq(view.project.id))
                 );
                 builder.where(null,entity->view.isNotNull());
                 builder.orderBy(null, entity->view.createAt.max().desc());
diff --git a/src/main/java/NextLevel/demo/user/repository/UserRepository.java b/src/main/java/NextLevel/demo/user/repository/UserRepository.java
@@ -10,7 +10,7 @@
 
 public interface UserRepository extends JpaRepository<UserEntity, Long> {
 
-    @Query("select u from UserEntity u left join fetch UserDetailEntity d on d.userId = u.id where u.id = :userId")
+    @Query("select u from UserEntity u left join fetch u.userDetail where u.id = :userId")
     Optional<UserEntity> findUserFullInfoByUserId(@Param("userId")Long userId);
 
     @Query("select u from UserEntity u where u.nickName = :nickName")
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -153,8 +153,20 @@ spring:
       on-profile: query-test
   jpa:
     hibernate:
-      ddl-auto: validate # 무조건 유지
+      ddl-auto: update # 무조건 유지
+#      format_sql: true
+#      show_sql: true
     properties:
       hibernate:
         cache.use_second_level_cache: false
-        cache.use_query_cache: false
+        cache.use_query_cache: false
+#        show_sql: true
+#        format_sql: true
+#    show-sql: true
+#
+#logging:
+#  level:
+#    org.hibernate.SQL: debug
+#    org.hibernate.type.descriptor.sql: trace
+#    org.hibernate.type.descriptor.sql.BasicBinder: trace
+#    org.hibernate.orm.jdbc.bind: trace
diff --git a/src/test/java/NextLevel/demo/img/ImgTest.java b/src/test/java/NextLevel/demo/img/ImgTest.java
@@ -1,50 +1,52 @@
-//package NextLevel.demo.img;
-//
-//import NextLevel.demo.img.entity.ImgEntity;
-//import NextLevel.demo.img.repository.ImgRepository;
-//import NextLevel.demo.img.service.ImgService;
-//import NextLevel.demo.img.service.ImgServiceImpl;
-//import NextLevel.demo.img.service.ImgTransaction;
-//import org.junit.jupiter.api.Assertions;
-//import org.junit.jupiter.api.BeforeEach;
-//import org.junit.jupiter.api.Test;
-//import org.junit.jupiter.api.extension.ExtendWith;
-//import org.mockito.Mockito;
-//import org.mockito.junit.jupiter.MockitoExtension;
-//import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.mock.web.MockMultipartFile;
-//import org.springframework.test.context.ActiveProfiles;
-//import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import java.nio.file.Files;
-//import java.nio.file.Paths;
-//
-//@SpringBootTest
-//@ActiveProfiles("test")
-//@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
-//@ExtendWith(MockitoExtension.class)
-//public class ImgTest {
-//
-//    private ImgService imgService;
-//    @MockitoSpyBean
-//    private ImgRepository imgRepository;
-//
-//    private MultipartFile mockImgFile;
-//    private String imgName = "imgName";
-//    private byte[] imgData = "imgData".getBytes();
-//
-//    @BeforeEach
-//    public void setUp() {
-//        Mockito.lenient().when(imgRepository.getImgCount(Mockito.anyInt(), Mockito.anyString())).thenReturn(1L); // img count return 1;
-//        imgService = new ImgServiceImpl(imgRepository);
-//        // db 초기화
-//        Mockito.mockStatic(Files.class).when(()->Files.write(Mockito.any(), Mockito.any(byte[].class))).thenReturn(Paths.get("uri"));
-//        mockImgFile = new MockMultipartFile(imgName, imgName, "content type", imgData);
-//    }
-//
+package NextLevel.demo.img;
+
+import NextLevel.demo.img.entity.ImgEntity;
+import NextLevel.demo.img.repository.ImgRepository;
+import NextLevel.demo.img.service.ImgService;
+import NextLevel.demo.img.service.ImgServiceImpl;
+import NextLevel.demo.img.service.ImgTransaction;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+@SpringBootTest
+@ActiveProfiles("test")
+@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
+@ExtendWith(MockitoExtension.class)
+@Disabled
+public class ImgTest {
+
+    private ImgService imgService;
+    @MockitoSpyBean
+    private ImgRepository imgRepository;
+
+    private MultipartFile mockImgFile;
+    private String imgName = "imgName";
+    private byte[] imgData = "imgData".getBytes();
+
+    @BeforeEach
+    public void setUp() {
+        Mockito.lenient().when(imgRepository.getImgCount(Mockito.anyInt(), Mockito.anyString())).thenReturn(1L); // img count return 1;
+        imgService = new ImgServiceImpl(imgRepository);
+        // db 초기화
+        Mockito.mockStatic(Files.class).when(()->Files.write(Mockito.any(), Mockito.any(byte[].class))).thenReturn(Paths.get("uri"));
+        mockImgFile = new MockMultipartFile(imgName, imgName, "content type", imgData);
+    }
+
 //    @Transactional
 //    @ImgTransaction
 //    public ImgEntity testImgFail(MultipartFile imgFile, RuntimeException e, ImgPath imgPath) {
@@ -65,5 +67,5 @@
 //                ()->Assertions.assertEquals(dbImg.getUri(), img.getUri(), "dbImg not equal input img")
 //        );
 //    }
-//
-//}
+
+}
diff --git a/src/test/java/NextLevel/demo/query/make/MakeTestQuery.java b/src/test/java/NextLevel/demo/query/make/MakeTestQuery.java
diff --git a/src/test/java/NextLevel/demo/query/projectlist/MyPage.java b/src/test/java/NextLevel/demo/query/projectlist/MyPage.java
diff --git a/src/test/java/NextLevel/demo/query/projectlist/SelectProjectListTest.java b/src/test/java/NextLevel/demo/query/projectlist/SelectProjectListTest.java
