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

#590

Author: joowojr

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

@@ -6,10 +6,10 @@
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
-@Mapper(componentModel = "spring", uses = {MemberPersistenceMapper.class})
+@Mapper(componentModel = "spring")
 public interface DepartmentPersistenceMapper extends PersistenceMapper<DepartmentEntity, Department> {
 
-    @Mapping(source = "admin.memberId", target = "adminId")
+    @Mapping(target = "adminId", ignore = true)
     @Mapping(source = "manager", target = "isManager")
     Department toDomain(DepartmentEntity entity);
 

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

@@ -1,32 +1,64 @@
 package clap.server.adapter.outbound.persistense.mapper;
 
+import clap.server.adapter.outbound.persistense.entity.member.DepartmentEntity;
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.domain.model.member.Department;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.member.MemberInfo;
+import org.hibernate.Hibernate;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.springframework.beans.factory.annotation.Autowired;
 
-@Mapper(componentModel = "spring", uses = {DepartmentPersistenceMapper.class})
+@Mapper(componentModel = "spring")
 public abstract class MemberPersistenceMapper {
 
     @Autowired
     protected DepartmentPersistenceMapper departmentPersistenceMapper;
 
-    @Mapping(source = "name", target = "memberInfo.name")
-    @Mapping(source = "email", target = "memberInfo.email")
-    @Mapping(source = "nickname", target = "memberInfo.nickname")
-    @Mapping(source = "role", target = "memberInfo.role")
-    @Mapping(source = "departmentRole", target = "memberInfo.departmentRole")
-    @Mapping(source = "department", target = "memberInfo.department")
-    @Mapping(source = "reviewer", target = "memberInfo.isReviewer")
-    @Mapping(source = "admin", target = "admin", qualifiedByName = "toDomain")
-    @Mapping(source = "createdAt", target = "createdAt")
-    @Mapping(source = "updatedAt", target = "updatedAt")
-    @Mapping(source = "memberId", target = "memberId")
+    @Mapping(target = "memberInfo", expression = "java(memberEntityToMemberInfo(entity))")
+    @Mapping(target = "department", expression = "java(mapDepartment(entity))")
+    @Mapping(target = "admin", ignore = true)
+    @Mapping(source = "entity.createdAt", target = "createdAt")
+    @Mapping(source = "entity.updatedAt", target = "updatedAt")
+    @Mapping(source = "entity.memberId", target = "memberId")
     public abstract Member toDomain(MemberEntity entity);
 
+    protected MemberInfo memberEntityToMemberInfo(MemberEntity memberEntity) {
+        if (memberEntity == null) {
+            return null;
+        }
+
+        DepartmentEntity departmentEntity = memberEntity.getDepartment();
+        Department department = (departmentEntity != null && Hibernate.isInitialized(departmentEntity))
+                ? departmentPersistenceMapper.toDomain(departmentEntity)
+                : null;
+
+        return MemberInfo.builder()
+                .name(memberEntity.getName())
+                .email(memberEntity.getEmail())
+                .nickname(memberEntity.getNickname())
+                .role(memberEntity.getRole())
+                .departmentRole(memberEntity.getDepartmentRole())
+                .isReviewer(memberEntity.isReviewer())
+                .department(department)
+                .build();
+    }
+
+    protected Department mapDepartment(MemberEntity entity) {
+        DepartmentEntity department = entity.getDepartment();
+        if (department == null) {
+            return null;
+        }
+
+        if (!Hibernate.isInitialized(department)) {
+            return null;
+        }
+
+        return departmentPersistenceMapper.toDomain(department);
+    }
+
     @Mapping(source = "memberInfo.name", target = "name")
     @Mapping(source = "memberInfo.email", target = "email")
     @Mapping(source = "memberInfo.nickname", target = "nickname")
@@ -40,6 +72,7 @@ public abstract class MemberPersistenceMapper {
     @Mapping(source = "memberId", target = "memberId")
     public abstract MemberEntity toEntity(Member member);
 
+
     @Named("toDomain")
     protected Member toDomainAdmin(MemberEntity admin) {
         if (admin == null) return null;