CLAP-453 Refactor: 지연 로딩이 설정되어 있는 member에 대해 추가적인 쿼리가 발생되지 않도록 매퍼 수정

#592

Author: joowojr

src/main/java/clap/server/adapter/outbound/persistense/mapper/CommentPersistenceMapper.java

@@ -1,25 +1,34 @@
 package clap.server.adapter.outbound.persistense.mapper;
 
 import clap.server.adapter.outbound.persistense.entity.task.CommentEntity;
-
-import clap.server.adapter.outbound.persistense.mapper.common.PersistenceMapper;
-
+import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Comment;
-
+import org.hibernate.Hibernate;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
+import org.springframework.beans.factory.annotation.Autowired;
 
 @Mapper(componentModel = "spring", uses = {MemberPersistenceMapper.class, TaskPersistenceMapper.class})
-public interface CommentPersistenceMapper  extends PersistenceMapper<CommentEntity, Comment> {
+public abstract class CommentPersistenceMapper {
+
+    @Autowired
+    MemberPersistenceMapper memberPersistenceMapper;
 
-    @Override
     @Mapping(source = "modified", target = "isModified")
     @Mapping(source = "deleted", target = "isDeleted")
+    @Mapping(target = "member", expression = "java(mapMember(entity))")
     @Mapping(target = "task", ignore = true)
-    Comment toDomain(final CommentEntity entity);
+    public abstract Comment toDomain(final CommentEntity entity);
 
-    @Override
     @Mapping(source = "modified", target = "isModified")
     @Mapping(source = "deleted", target = "isDeleted")
-    CommentEntity toEntity(final Comment domain);
+    public abstract CommentEntity toEntity(final Comment domain);
+
+    protected Member mapMember(CommentEntity entity) {
+        if (entity == null || entity.getMember() == null || !Hibernate.isInitialized(entity.getMember())) {
+            return null;
+        }
+        return memberPersistenceMapper.toDomain(entity.getMember());
+    }
+
 }

src/main/java/clap/server/adapter/outbound/persistense/repository/history/TaskHistoryCustomRepositoryImpl.java

@@ -1,5 +1,6 @@
 package clap.server.adapter.outbound.persistense.repository.history;
 
+import clap.server.adapter.outbound.persistense.entity.member.QMemberEntity;
 import clap.server.adapter.outbound.persistense.entity.task.QCommentEntity;
 import clap.server.adapter.outbound.persistense.entity.task.QTaskHistoryEntity;
 import clap.server.adapter.outbound.persistense.entity.task.TaskHistoryEntity;
@@ -18,9 +19,11 @@ public class TaskHistoryCustomRepositoryImpl implements TaskHistoryCustomReposit
     public List<TaskHistoryEntity> findAllTaskHistoriesByTaskId(Long taskId) {
         QTaskHistoryEntity taskHistory = QTaskHistoryEntity.taskHistoryEntity;
         QCommentEntity comment = QCommentEntity.commentEntity;
+        QMemberEntity member = QMemberEntity.memberEntity;
 
         return queryFactory.selectFrom(taskHistory)
-                .leftJoin(taskHistory.comment, comment).fetchJoin() // TaskHistory와 Comment를 조인
+                .leftJoin(taskHistory.comment, comment).fetchJoin()
+                .leftJoin(taskHistory.modifiedMember, member).fetchJoin()
                 .where(
                         // Comment가 없는 경우에는 TaskModificationInfo의 Task 기준
                         taskHistory.comment.isNull()