[Refactor] - 여행기 Service 코드 리팩터링

backend/src/main/java/kr/touroot/member/service/MemberService.java

@@ -20,7 +20,7 @@ public class MemberService {
     private final PasswordEncryptor passwordEncryptor;
 
     @Transactional(readOnly = true)
-    public Member getById(Long memberId) {
+    public Member getMemberById(Long memberId) {
         return memberRepository.findById(memberId)
                 .orElseThrow(() -> new BadRequestException("존재하지 않는 사용자입니다."));
     }
@@ -53,7 +53,7 @@ private void validateNicknameDuplication(String nickname) {
 
     @Transactional
     public ProfileResponse updateProfile(ProfileUpdateRequest request, MemberAuth memberAuth) {
-        Member member = getById(memberAuth.memberId());
+        Member member = getMemberById(memberAuth.memberId());
         member.changeNickname(request.nickname());
 
         return ProfileResponse.from(member);

backend/src/main/java/kr/touroot/member/service/MyPageFacadeService.java

@@ -26,21 +26,21 @@ public class MyPageFacadeService {
 
     @Transactional(readOnly = true)
     public ProfileResponse readProfile(MemberAuth memberAuth) {
-        Member member = memberService.getById(memberAuth.memberId());
+        Member member = memberService.getMemberById(memberAuth.memberId());
         return ProfileResponse.from(member);
     }
 
     @Transactional(readOnly = true)
     public Page<MyTravelogueResponse> readTravelogues(MemberAuth memberAuth, Pageable pageable) {
-        Member member = memberService.getById(memberAuth.memberId());
+        Member member = memberService.getMemberById(memberAuth.memberId());
         Page<Travelogue> travelogues = travelogueService.findAllByMember(member, pageable);
 
         return travelogues.map(MyTravelogueResponse::from);
     }
 
     @Transactional(readOnly = true)
     public Page<PlanResponse> readTravelPlans(MemberAuth memberAuth, Pageable pageable) {
-        Member member = memberService.getById(memberAuth.memberId());
+        Member member = memberService.getMemberById(memberAuth.memberId());
         Page<TravelPlan> travelPlans = travelPlanService.getAllByAuthor(member, pageable);
 
         return travelPlans.map(PlanResponse::from);

backend/src/main/java/kr/touroot/tag/dto/TagResponse.java

@@ -2,6 +2,7 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import kr.touroot.tag.domain.Tag;
+import kr.touroot.travelogue.domain.TravelogueTag;
 import lombok.Builder;
 
 @Builder
@@ -16,4 +17,8 @@ public static TagResponse from(Tag tag) {
                 .tag(tag.getTag())
                 .build();
     }
+
+    public static TagResponse from(TravelogueTag travelogueTag) {
+        return from(travelogueTag.getTag());
+    }
 }

backend/src/main/java/kr/touroot/travelogue/controller/TravelogueController.java

@@ -103,7 +103,7 @@ public ResponseEntity<TravelogueLikeResponse> likeTravelogue(@PathVariable Long
     })
     @GetMapping("/{id}")
     public ResponseEntity<TravelogueResponse> findTravelogue(@PathVariable Long id) {
-        return ResponseEntity.ok(travelogueFacadeService.findTravelogueById(id));
+        return ResponseEntity.ok(travelogueFacadeService.findTravelogueByIdForGuest(id));
     }
 
     @Operation(summary = "여행기 상세 조회")
@@ -120,7 +120,7 @@ public ResponseEntity<TravelogueResponse> findTravelogue(@PathVariable Long id)
     })
     @GetMapping(value = "/{id}", headers = {HttpHeaders.AUTHORIZATION})
     public ResponseEntity<TravelogueResponse> findTravelogue(@PathVariable Long id, MemberAuth member) {
-        return ResponseEntity.ok(travelogueFacadeService.findTravelogueById(id, member));
+        return ResponseEntity.ok(travelogueFacadeService.findTravelogueByIdForAuthenticated(id, member));
     }
 
     @Operation(summary = "여행기 메인 페이지 조회")

backend/src/main/java/kr/touroot/travelogue/domain/Travelogue.java

@@ -21,7 +21,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.SQLRestriction;
 
@@ -70,11 +69,6 @@ public Travelogue(Member author, String title, String thumbnail) {
         this(null, author, title, thumbnail, 0L);
     }
 
-    public void update(String title, String thumbnail) {
-        this.title = title;
-        this.thumbnail = thumbnail;
-    }
-
     private void validate(Member author, String title, String thumbnail) {
         validateNotNull(author, title, thumbnail);
         validateNotBlank(title, thumbnail);
@@ -107,11 +101,30 @@ private void validateThumbnailFormat(String thumbnailUrl) {
             throw new BadRequestException("이미지 url 형식이 잘못되었습니다");
         }
     }
-
+
+    public void update(String title, String thumbnail) {
+        this.title = title;
+        this.thumbnail = thumbnail;
+    }
+
+    public void updateThumbnail(String thumbnail) {
+        this.thumbnail = thumbnail;
+    }
+
+    public void addDay(TravelogueDay day) {
+        day.updateTravelogue(this);
+        travelogueDays.add(day);
+    }
+
+    public void updateDays(List<TravelogueDay> travelogueDays) {
+        this.travelogueDays.clear();
+        travelogueDays.forEach(this::addDay);
+    }
+
     public void increaseLikeCount() {
         likeCount += LIKE_COUNT_WEIGHT;
     }
-    
+
     public void decreaseLikeCount() {
         likeCount -= LIKE_COUNT_WEIGHT;
     }

backend/src/main/java/kr/touroot/travelogue/domain/TravelogueDay.java

@@ -70,4 +70,13 @@ private void validateOrderRange(Integer order) {
             throw new BadRequestException("여행 날짜의 순서는 음수 일 수 없습니다");
         }
     }
+
+    public void addPlace(TraveloguePlace place) {
+        traveloguePlaces.add(place);
+        place.updateTravelogueDay(this);
+    }
+
+    public void updateTravelogue(Travelogue travelogue) {
+        this.travelogue = travelogue;
+    }
 }

backend/src/main/java/kr/touroot/travelogue/domain/TraveloguePhoto.java

@@ -67,4 +67,12 @@ private void validateOrderRange(Integer order) {
             throw new BadRequestException("여행 장소에 속하는 사진의 순서는 음수가 될 수 없습니다");
         }
     }
+
+    public void updateKey(String key) {
+        this.key = key;
+    }
+
+    public void updateTraveloguePlace(TraveloguePlace traveloguePlace) {
+        this.traveloguePlace = traveloguePlace;
+    }
 }

backend/src/main/java/kr/touroot/travelogue/domain/TraveloguePlace.java

@@ -132,4 +132,13 @@ private void validatePlaceNameLength(String placeName) {
             throw new BadRequestException("장소 이름은 " + PLACE_NAME_MAX_LENGTH + "자 이하여야 합니다");
         }
     }
+
+    public void addPhoto(TraveloguePhoto photo) {
+        traveloguePhotos.add(photo);
+        photo.updateTraveloguePlace(this);
+    }
+
+    public void updateTravelogueDay(TravelogueDay travelogueDay) {
+        this.travelogueDay = travelogueDay;
+    }
 }

backend/src/main/java/kr/touroot/travelogue/dto/request/TravelogueDayRequest.java

@@ -7,6 +7,7 @@
 import java.util.List;
 import kr.touroot.travelogue.domain.Travelogue;
 import kr.touroot.travelogue.domain.TravelogueDay;
+import kr.touroot.travelogue.domain.TraveloguePlace;
 
 public record TravelogueDayRequest(
         @Schema(description = "여행기 장소 목록")
@@ -17,6 +18,16 @@ public record TravelogueDayRequest(
 ) {
 
     public TravelogueDay toTravelogueDay(int order, Travelogue travelogue) {
-        return new TravelogueDay(order, travelogue);
+        TravelogueDay travelogueDay = new TravelogueDay(order, travelogue);
+        addTraveloguePlaces(travelogueDay);
+        return travelogueDay;
+    }
+
+    private void addTraveloguePlaces(TravelogueDay travelogueDay) {
+        for (int placeOrder = 0; placeOrder < places.size(); placeOrder++) {
+            TraveloguePlaceRequest traveloguePlaceRequest = places.get(placeOrder);
+            TraveloguePlace traveloguePlace = traveloguePlaceRequest.toTraveloguePlace(placeOrder, travelogueDay);
+            travelogueDay.addPlace(traveloguePlace);
+        }
     }
 }

backend/src/main/java/kr/touroot/travelogue/dto/request/TraveloguePhotoRequest.java

@@ -2,10 +2,15 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import kr.touroot.travelogue.domain.TraveloguePhoto;
+import kr.touroot.travelogue.domain.TraveloguePlace;
 
 public record TraveloguePhotoRequest(
         @Schema(description = "여행기 장소 사진 URL", example = "S3 이미지 URL")
         @NotBlank(message = "여행기 장소 사진 URL 값은 비어있을 수 없습니다.")
         String url
 ) {
+    public TraveloguePhoto toTraveloguePhoto(Integer order, TraveloguePlace traveloguePlace) {
+        return new TraveloguePhoto(order, url, traveloguePlace);
+    }
 }

backend/src/main/java/kr/touroot/travelogue/dto/request/TraveloguePlaceRequest.java

@@ -7,6 +7,7 @@
 import jakarta.validation.constraints.Size;
 import java.util.List;
 import kr.touroot.travelogue.domain.TravelogueDay;
+import kr.touroot.travelogue.domain.TraveloguePhoto;
 import kr.touroot.travelogue.domain.TraveloguePlace;
 
 public record TraveloguePlaceRequest(
@@ -29,6 +30,23 @@ public record TraveloguePlaceRequest(
 ) {
 
     public TraveloguePlace toTraveloguePlace(int order, TravelogueDay travelogueDay) {
-        return new TraveloguePlace(order, description, placeName, position().lat(), position().lng(), travelogueDay);
+        TraveloguePlace traveloguePlace = new TraveloguePlace(
+                order,
+                description,
+                placeName,
+                position().lat(),
+                position().lng(),
+                travelogueDay
+        );
+        addTraveloguePhotos(traveloguePlace);
+        return traveloguePlace;
+    }
+
+    private void addTraveloguePhotos(TraveloguePlace traveloguePlace) {
+        for (int photoOrder = 0; photoOrder < photoUrls.size(); photoOrder++) {
+            TraveloguePhotoRequest traveloguePhotoRequest = photoUrls.get(photoOrder);
+            TraveloguePhoto traveloguePhoto = traveloguePhotoRequest.toTraveloguePhoto(photoOrder, traveloguePlace);
+            traveloguePlace.addPhoto(traveloguePhoto);
+        }
     }
 }

backend/src/main/java/kr/touroot/travelogue/dto/request/TravelogueRequest.java

@@ -5,9 +5,11 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+import java.util.ArrayList;
 import java.util.List;
 import kr.touroot.member.domain.Member;
 import kr.touroot.travelogue.domain.Travelogue;
+import kr.touroot.travelogue.domain.TravelogueDay;
 
 public record TravelogueRequest(
         @Schema(description = "여행기 제목", example = "서울 강남 여행기")
@@ -28,7 +30,28 @@ public record TravelogueRequest(
         List<TravelogueDayRequest> days
 ) {
 
-    public Travelogue toTravelogueOf(Member author, String url) {
-        return new Travelogue(author, title, url);
+    public Travelogue toTravelogue(Member author) {
+        Travelogue travelogue = new Travelogue(author, title, thumbnail);
+        addTravelogueDays(travelogue);
+        return travelogue;
+    }
+
+    private void addTravelogueDays(Travelogue travelogue) {
+        for (int dayOrder = 0; dayOrder < days.size(); dayOrder++) {
+            TravelogueDayRequest dayRequest = days.get(dayOrder);
+            TravelogueDay travelogueDay = dayRequest.toTravelogueDay(dayOrder, travelogue);
+            travelogue.addDay(travelogueDay);
+        }
+    }
+
+    public List<TravelogueDay> getTravelogueDays(Travelogue travelogue) {
+        List<TravelogueDay> travelogueDays = new ArrayList<>();
+        for (int dayOrder = 0; dayOrder < days.size(); dayOrder++) {
+            TravelogueDayRequest dayRequest = days.get(dayOrder);
+            TravelogueDay travelogueDay = dayRequest.toTravelogueDay(dayOrder, travelogue);
+            travelogueDays.add(travelogueDay);
+        }
+
+        return travelogueDays;
     }
 }

backend/src/main/java/kr/touroot/travelogue/dto/response/TravelogueDayResponse.java

@@ -13,10 +13,16 @@ public record TravelogueDayResponse(
         List<TraveloguePlaceResponse> places
 ) {
 
-    public static TravelogueDayResponse of(TravelogueDay day, List<TraveloguePlaceResponse> places) {
+    public static TravelogueDayResponse from(TravelogueDay travelogueDay) {
         return TravelogueDayResponse.builder()
-                .id(day.getId())
-                .places(places)
+                .id(travelogueDay.getId())
+                .places(getTraveloguePlaceResponse(travelogueDay))
                 .build();
     }
+
+    private static List<TraveloguePlaceResponse> getTraveloguePlaceResponse(TravelogueDay travelogueDay) {
+        return travelogueDay.getTraveloguePlaces().stream()
+                .map(TraveloguePlaceResponse::from)
+                .toList();
+    }
 }

backend/src/main/java/kr/touroot/travelogue/dto/response/TraveloguePlaceResponse.java

@@ -2,6 +2,7 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
+import kr.touroot.travelogue.domain.TraveloguePhoto;
 import kr.touroot.travelogue.domain.TraveloguePlace;
 import lombok.Builder;
 
@@ -17,13 +18,19 @@ public record TraveloguePlaceResponse(
         List<String> photoUrls
 ) {
 
-    public static TraveloguePlaceResponse of(TraveloguePlace place, List<String> photoUrls) {
+    public static TraveloguePlaceResponse from(TraveloguePlace traveloguePlace) {
         return TraveloguePlaceResponse.builder()
-                .id(place.getId())
-                .placeName(place.getName())
-                .description(place.getDescription())
-                .position(TraveloguePositionResponse.from(place.getPosition()))
-                .photoUrls(photoUrls)
+                .id(traveloguePlace.getId())
+                .placeName(traveloguePlace.getName())
+                .description(traveloguePlace.getDescription())
+                .position(TraveloguePositionResponse.from(traveloguePlace.getPosition()))
+                .photoUrls(getTraveloguePhotosResponse(traveloguePlace))
                 .build();
     }
+
+    private static List<String> getTraveloguePhotosResponse(TraveloguePlace traveloguePlace) {
+        return traveloguePlace.getTraveloguePhotos().stream()
+                .map(TraveloguePhoto::getKey)
+                .toList();
+    }
 }