[refactor] : Result와 Stadium의 DDD구조 변경 및 Result 어그리게이트에 관한 간접참조와, 객체탐색 리팩토링을 진행한다.

src/main/java/kusitms/backend/result/application/ResultService.java

@@ -11,20 +11,15 @@
 import kusitms.backend.result.domain.enums.KtWizStadiumStatusType;
 import kusitms.backend.result.domain.enums.ProfileStatusType;
 import kusitms.backend.result.domain.enums.StadiumStatusType;
-import kusitms.backend.result.domain.repository.ProfileRepository;
 import kusitms.backend.result.domain.repository.ResultRepository;
-import kusitms.backend.result.domain.repository.ZoneRepository;
 import kusitms.backend.result.dto.request.SaveTopRankedZoneRequestDto;
 import kusitms.backend.result.dto.response.GetProfileResponseDto;
 import kusitms.backend.result.dto.response.GetZonesResponseDto;
 import kusitms.backend.result.dto.response.SaveTopRankedZoneResponseDto;
 import kusitms.backend.result.status.ResultErrorStatus;
-import kusitms.backend.stadium.domain.entity.Stadium;
-import kusitms.backend.stadium.domain.repository.StadiumRepository;
+import kusitms.backend.stadium.application.StadiumService;
 import kusitms.backend.stadium.status.StadiumErrorStatus;
-import kusitms.backend.user.domain.entity.User;
-import kusitms.backend.user.domain.repository.UserRepository;
-import kusitms.backend.user.status.UserErrorStatus;
+import kusitms.backend.user.application.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -37,11 +32,9 @@
 @RequiredArgsConstructor
 public class ResultService {
 
-    private final UserRepository userRepository;
-    private final StadiumRepository stadiumRepository;
+    private final UserService userService;
+    private final StadiumService stadiumService;
     private final ResultRepository resultRepository;
-    private final ZoneRepository zoneRepository;
-    private final ProfileRepository profileRepository;
     private final JWTUtil jwtUtil;
 
     @Transactional
@@ -58,49 +51,44 @@ public <T extends Enum<T> & StadiumStatusType> SaveTopRankedZoneResponseDto save
         List<T> recommendedZones = RecommendTopRankedZones.getTopRankedZones(
                 zones, List.of(request.clientKeywords()));
 
-        Stadium stadium = stadiumRepository.findByName(request.stadium())
-                .orElseThrow(() -> new CustomException(StadiumErrorStatus._NOT_FOUND_STADIUM));
+        Long stadiumId = stadiumService.getIdByStadiumName(request.stadium());
         Result result;
         if (accessToken == null) {
             result = Result.builder()
-                    .stadium(stadium)
+                    .stadiumId(stadiumId)
                     .preference(request.preference())
                     .build();
             resultRepository.save(result);
         }
         else{
             Long userId = jwtUtil.getUserIdFromToken(accessToken);
-            User user = userRepository.findById(userId)
-                    .orElseThrow(() -> new CustomException(UserErrorStatus._NOT_FOUND_USER));
-            log.info("유저 정보 조회 성공");
+            userService.isExistUserById(userId);
 
             result = Result.builder()
-                    .stadium(stadium)
-                    .user(user)
+                    .userId(userId)
+                    .stadiumId(stadiumId)
                     .preference(request.preference())
                     .build();
             resultRepository.save(result);
         }
 
         Profile profile = Profile.builder()
-                .result(result)
                 .imgUrl(recommendedProfile.getImgUrl())
                 .nickname(recommendedProfile.getNickName())
                 .type(recommendedProfile.getType())
                 .hashTags(recommendedProfile.getHashTags())
                 .build();
-        profileRepository.save(profile);
+        result.addProfile(profile);
 
        recommendedZones.forEach(zoneEnum -> {
            Zone zone = Zone.builder()
-                   .result(result)
                    .name(zoneEnum.getZoneName())
                    .color(zoneEnum.getZoneColor())
                    .explanations(zoneEnum.getExplanations())
                    .tip(zoneEnum.getTip())
                    .referencesGroup(zoneEnum.getReferencesGroup())
                    .build();
-           zoneRepository.save(zone);
+           result.addZone(zone);
        });
 
        return SaveTopRankedZoneResponseDto.of(result.getId());
@@ -110,16 +98,14 @@ public <T extends Enum<T> & StadiumStatusType> SaveTopRankedZoneResponseDto save
     public GetProfileResponseDto getRecommendedProfile(Long resultId) {
         Result result = resultRepository.findById(resultId)
                 .orElseThrow(() -> new CustomException(ResultErrorStatus._NOT_FOUND_RESULT));
-        Profile profile = profileRepository.findByResult(result)
-                .orElseThrow(() -> new CustomException(ResultErrorStatus._NOT_FOUND_PROFILE));
-        return GetProfileResponseDto.from(profile);
+        return GetProfileResponseDto.from(result.getProfile());
     }
 
     @Transactional(readOnly = true)
     public GetZonesResponseDto getRecommendedZones(Long resultId, Long count) {
         Result result = resultRepository.findById(resultId)
                 .orElseThrow(() -> new CustomException(ResultErrorStatus._NOT_FOUND_RESULT));
-        List<GetZonesResponseDto.ZoneResponseDto> zones = zoneRepository.findAllByResult(result)
+        List<GetZonesResponseDto.ZoneResponseDto> zones = result.getZones()
                 .stream()
                 .limit(count)
                 .map(GetZonesResponseDto.ZoneResponseDto::from)

src/main/java/kusitms/backend/result/common/RecommendTopRankedZones.java

@@ -4,6 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 public class RecommendTopRankedZones {
@@ -50,15 +51,24 @@ public static <T extends Enum<T> & StadiumStatusType> List<T> getTopRankedZones(
                     log.info("zone: {}, totalMatchCount: {}, page1Count: {}, page2Count: {}, page3Count: {}", result.get("zone"), result.get("totalMatchCount"), result.get("page1Count"), result.get("page2Count"), result.get("page3Count"));
                     return (T) result.get("zone");
                 })
+                .collect(Collectors.toCollection(ArrayList::new)); // 수정 가능한 리스트 생성
+
+        List<T> priorityDummyZones = Arrays.stream(zones)
+                .filter(zone -> {
+                    int ordinal = zone.ordinal();
+                    return ordinal == 0 || ordinal == 1 || ordinal == 2;
+                })
                 .toList();
 
-        // 필터링된 결과가 없을 경우 첫 번째 구역을 반환
-        if (filteredZones.isEmpty()) {
-            return Arrays.stream(zones)
-                    .findFirst()
-                    .map(List::of)
-                    .orElse(Collections.emptyList());
+        for (T priorityDummyZone : priorityDummyZones) {
+            if (filteredZones.size() >= 3) {
+                break;
+            }
+            if (!filteredZones.contains(priorityDummyZone)) {
+                filteredZones.add(priorityDummyZone);
+            }
         }
+
         return filteredZones;
     }
 }

src/main/java/kusitms/backend/result/domain/entity/Profile.java

@@ -39,11 +39,14 @@ public class Profile extends BaseTimeEntity {
     private List<String> hashTags;
 
     @Builder
-    public Profile(Result result, String imgUrl, String nickname, String type, String explanation, List<String> hashTags) {
-        this.result = result;
+    public Profile(String imgUrl, String nickname, String type, String explanation, List<String> hashTags) {
         this.imgUrl = imgUrl;
         this.nickname = nickname;
         this.type = type;
         this.hashTags = hashTags;
     }
+
+    public void assignToResult(Result result) {
+        this.result = result;
+    }
 }

src/main/java/kusitms/backend/result/domain/entity/Result.java

@@ -2,13 +2,12 @@
 
 import jakarta.persistence.*;
 import kusitms.backend.global.domain.BaseTimeEntity;
-import kusitms.backend.stadium.domain.entity.Stadium;
-import kusitms.backend.user.domain.entity.User;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Entity
@@ -21,24 +20,35 @@ public class Result extends BaseTimeEntity {
     @Column(name = "result_id", nullable = false)
     private Long id;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "stadium_id", nullable = false)
-    private Stadium stadium;
+    @Column(name = "user_id", nullable = false)
+    private Long userId; // User를 ID로 간접 참조
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id")
-    private User user;
+    @Column(name = "stadium_id", nullable = false)
+    private Long stadiumId; // Stadium을 ID로 간접 참조
 
     @Column(nullable = false)
     private String preference;
 
-    @OneToMany(mappedBy = "result", cascade = CascadeType.ALL)
-    private List<Zone> zones;
+    @OneToOne(mappedBy = "result", cascade = CascadeType.ALL, orphanRemoval = true)
+    private Profile profile;
+
+    @OneToMany(mappedBy = "result", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<Zone> zones = new ArrayList<>();
 
     @Builder
-    public Result(Stadium stadium, User user, String preference) {
-        this.stadium = stadium;
-        this.user = user;
+    public Result(Long userId, Long stadiumId, String preference) {
+        this.userId = userId;
+        this.stadiumId = stadiumId;
         this.preference = preference;
     }
-}
+
+    public void addProfile(Profile profile) {
+        this.profile = profile;
+        profile.assignToResult(this);
+    }
+
+    public void addZone(Zone zone){
+        this.zones.add(zone);
+        zone.assignToResult(this);
+    }
+}

src/main/java/kusitms/backend/result/domain/entity/Zone.java

@@ -45,12 +45,15 @@ public class Zone extends BaseTimeEntity {
     private List<ReferencesGroup> referencesGroup;
 
     @Builder
-    public Zone(Result result, String name, String color, List<String> explanations, String tip, List<ReferencesGroup> referencesGroup) {
-        this.result = result;
+    public Zone(String name, String color, List<String> explanations, String tip, List<ReferencesGroup> referencesGroup) {
         this.name = name;
         this.color = color;
         this.explanations = explanations;
         this.tip = tip;
         this.referencesGroup = referencesGroup;
     }
+
+    public void assignToResult(Result result) {
+        this.result = result;
+    }
 }