♻️ refactor: 스토리, 입양, 후원 조회

nomad1jin · nomad1jin · commit ccef82845b8f · 2025-10-30T17:49:47.000+09:00
diff --git a/src/main/java/kpaas/dogcat/domain/adopt/AdoptScheduler.java b/src/main/java/kpaas/dogcat/domain/adopt/AdoptScheduler.java
@@ -14,8 +14,8 @@ public class AdoptScheduler {
 
     private final AdoptCommandService adoptCommandService;
 
-//    @Scheduled(cron = "0 0 0 * * ?", zone = "Asia/Seoul")
-    @Scheduled(fixedRate = 60000)
+    @Scheduled(cron = "0 0 0 * * ?", zone = "Asia/Seoul")
+//    @Scheduled(fixedRate = 60000)
     public void closeExpiredAdoption() {
         log.info("[ 입양 공고 마감 스케줄러 시작 ]");
         adoptCommandService.closeAdoption();
diff --git a/src/main/java/kpaas/dogcat/domain/adopt/entity/Adopt.java b/src/main/java/kpaas/dogcat/domain/adopt/entity/Adopt.java
@@ -7,6 +7,7 @@
 import kpaas.dogcat.domain.chat.entity.ChatRoom;
 import kpaas.dogcat.domain.member.entity.Member;
 import kpaas.dogcat.domain.pet.entity.Pet;
+import kpaas.dogcat.global.enums.PostType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -61,6 +62,11 @@ public class Adopt {
 
     private LocalDateTime appliedAt;
 
+    @Enumerated(EnumType.STRING)
+    @Builder.Default
+    @Column(nullable = false)
+    private PostType postType = PostType.ADOPTION;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_id", nullable = false)
     private Member writer;   // 공고 작성자
diff --git a/src/main/java/kpaas/dogcat/domain/adopt/repository/AdoptQueryDsl.java b/src/main/java/kpaas/dogcat/domain/adopt/repository/AdoptQueryDsl.java
@@ -14,4 +14,6 @@ List<Adopt> searchAdoptions(Long cursor, int size,
                                 Region region,
                                 String district,
                                 String keyword);
+
+    List<Adopt> findAdoptsByWalletAddress(String walletAddress, Long cursor, int size);
 }
diff --git a/src/main/java/kpaas/dogcat/domain/adopt/repository/AdoptQueryDslImpl.java b/src/main/java/kpaas/dogcat/domain/adopt/repository/AdoptQueryDslImpl.java
@@ -63,4 +63,21 @@ public List<Adopt> searchAdoptions(Long cursor,
                 .limit(size)
                 .fetch();
     }
+
+    @Override
+    public List<Adopt> findAdoptsByWalletAddress(String walletAddress, Long cursor, int size) {
+        QAdopt adopt = QAdopt.adopt;
+
+        var query = jpaQueryFactory
+                .selectFrom(adopt)
+                .where(adopt.writer.id.eq(walletAddress))
+                .orderBy(adopt.id.desc())
+                .limit(size);
+
+        if (cursor != null) {
+            query.where(adopt.id.lt(cursor));
+        }
+
+        return query.fetch();
+    }
 }
diff --git a/src/main/java/kpaas/dogcat/domain/adopt/repository/AdoptRepository.java b/src/main/java/kpaas/dogcat/domain/adopt/repository/AdoptRepository.java
@@ -2,8 +2,6 @@
 
 import kpaas.dogcat.domain.adopt.entity.Adopt;
 import kpaas.dogcat.domain.adopt.enums.AdoptionStatus;
-import kpaas.dogcat.domain.donate.donation.entity.Donation;
-import kpaas.dogcat.domain.donate.donation.enums.DonationStatus;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -25,4 +23,6 @@ public interface AdoptRepository extends JpaRepository<Adopt, Long>, AdoptQueryD
     List<Adopt> findByAdopterIdAndIdLessThanOrderByIdDesc(String adopterId, Long cursor, Pageable pageable);
 
     List<Adopt> findByStatus(AdoptionStatus adoptionStatus);
+
+//    List<Adopt> findAdoptionsByWalletAddress(String walletAddress, Long cursor, int size);
 }
diff --git a/src/main/java/kpaas/dogcat/domain/donate/donation/entity/Donation.java b/src/main/java/kpaas/dogcat/domain/donate/donation/entity/Donation.java
@@ -7,6 +7,7 @@
 import kpaas.dogcat.domain.donate.donationList.entity.DonationList;
 import kpaas.dogcat.domain.member.entity.Member;
 import kpaas.dogcat.domain.pet.entity.Pet;
+import kpaas.dogcat.global.enums.PostType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -43,6 +44,11 @@ public class Donation {
     @Builder.Default
     private DonationStatus status = DonationStatus.ACTIVE;       // 후원 상태
 
+    @Enumerated(EnumType.STRING)
+    @Builder.Default
+    @Column(nullable = false)
+    private PostType postType = PostType.DONATION;
+
     @Column(nullable = false)
     private String content;
 
diff --git a/src/main/java/kpaas/dogcat/domain/donate/donation/repository/DonationQueryDsl.java b/src/main/java/kpaas/dogcat/domain/donate/donation/repository/DonationQueryDsl.java
@@ -1,8 +1,5 @@
 package kpaas.dogcat.domain.donate.donation.repository;
 
-import kpaas.dogcat.domain.adopt.entity.Adopt;
-import kpaas.dogcat.domain.adopt.enums.AdoptionStatus;
-import kpaas.dogcat.domain.adopt.enums.Region;
 import kpaas.dogcat.domain.donate.donation.entity.Donation;
 import kpaas.dogcat.domain.donate.donation.enums.DonationStatus;
 import kpaas.dogcat.domain.pet.enums.Breed;
@@ -14,4 +11,6 @@ List<Donation> searchDonations(Long cursor, int size,
                                    Breed breed,
                                    DonationStatus status,
                                    String keyword);
+
+    List<Donation> findDonationsByWalletAddress(String walletAddress, Long cursor, int size);
 }
diff --git a/src/main/java/kpaas/dogcat/domain/donate/donation/repository/DonationQueryDslImpl.java b/src/main/java/kpaas/dogcat/domain/donate/donation/repository/DonationQueryDslImpl.java
@@ -51,4 +51,21 @@ public List<Donation> searchDonations(Long cursor, int size,
                 .limit(size)
                 .fetch();
     }
+
+    @Override
+    public List<Donation> findDonationsByWalletAddress(String walletAddress, Long cursor, int size) {
+        QDonation donation = QDonation.donation;
+
+        var query = jpaQueryFactory
+                .selectFrom(donation)
+                .where(donation.member.id.eq(walletAddress))
+                .orderBy(donation.id.desc())
+                .limit(size);
+
+        if (cursor != null) {
+            query.where(donation.id.lt(cursor));
+        }
+
+        return query.fetch();
+    }
 }
diff --git a/src/main/java/kpaas/dogcat/domain/member/controller/MemberController.java b/src/main/java/kpaas/dogcat/domain/member/controller/MemberController.java
@@ -12,6 +12,7 @@
 import kpaas.dogcat.global.apiPayload.CustomResponse;
 import kpaas.dogcat.global.apiPayload.code.SuccessCode;
 import kpaas.dogcat.global.auth.CurrentWalletAddress;
+import kpaas.dogcat.global.enums.PostType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -47,12 +48,20 @@ public CustomResponse<MemberResDto.ProfileResDto> getProfile(
         return CustomResponse.onSuccess(SuccessCode.OK, memberQueryService.getProfile(walletAddress));
     }
 
-    @Operation(summary = "작성한 일지 조회(마이페이지)", description = "일상일지 / 입양 후기 일지 모두 조회하는 API입니다.")
+    @Operation(summary = "작성한 일지 조회(마이페이지)", description = "일상일지 / 입양 후기 일지 모두 조회하는 API입니다." +
+    "타입에 DAILY, REVIEW, ADOPTION, DONATION 선택하세요. ")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "COMMON200", description = "성공입니다"),
+            @ApiResponse(responseCode = "COMMON400", description = "잘못된 요청입니다.")
+    })
     @GetMapping("/member/stories")
-    public CustomResponse<MemberResDto.StoriesListDto> getStories(
+    public CustomResponse<MemberResDto.StoriesListDto> getMyStories(
             @Parameter(hidden = true) @CurrentWalletAddress String walletAddress,
             @RequestParam(required = false) Long cursor,
-            @RequestParam(defaultValue = "9") int size){
-        return CustomResponse.onSuccess(SuccessCode.OK, memberQueryService.getStories(walletAddress, cursor, size));
+            @RequestParam(defaultValue = "9") int size,
+            @RequestParam(required = false) PostType type
+    ) {
+        return CustomResponse.onSuccess(SuccessCode.OK,
+                memberQueryService.getStories(walletAddress, cursor, size, type));
     }
 }
diff --git a/src/main/java/kpaas/dogcat/domain/member/converter/MemberConverter.java b/src/main/java/kpaas/dogcat/domain/member/converter/MemberConverter.java
@@ -1,9 +1,12 @@
 package kpaas.dogcat.domain.member.converter;
 
+import kpaas.dogcat.domain.adopt.entity.Adopt;
+import kpaas.dogcat.domain.donate.donation.entity.Donation;
 import kpaas.dogcat.domain.member.dto.MemberReqDto;
 import kpaas.dogcat.domain.member.dto.MemberResDto;
 import kpaas.dogcat.domain.member.entity.Member;
 import kpaas.dogcat.domain.stories.story.entity.Story;
+import kpaas.dogcat.global.enums.PostType;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -44,10 +47,27 @@ public MemberResDto.StoryDto toStoryDto(Story story,
                                             Long likeCount,
                                             Long commentCount) {
         return MemberResDto.StoryDto.builder()
-                .storyId(story.getId())
+                .postId(story.getId())
                 .title(story.getTitle())
                 .likes(likeCount)
                 .comments(commentCount)
+                .type(story.getPostType())
+                .build();
+    }
+
+    public MemberResDto.StoryDto toStoryDtoFromAdopt(Adopt adopt) {
+        return MemberResDto.StoryDto.builder()
+                .postId(adopt.getId())
+                .title(adopt.getTitle())
+                .type(PostType.ADOPTION)
+                .build();
+    }
+
+    public MemberResDto.StoryDto toStoryDtoFromDonation(Donation donation) {
+        return MemberResDto.StoryDto.builder()
+                .postId(donation.getId())
+                .title(donation.getTitle())
+                .type(PostType.DONATION)
                 .build();
     }
 }
diff --git a/src/main/java/kpaas/dogcat/domain/member/dto/MemberResDto.java b/src/main/java/kpaas/dogcat/domain/member/dto/MemberResDto.java
@@ -1,5 +1,6 @@
 package kpaas.dogcat.domain.member.dto;
 
+import kpaas.dogcat.global.enums.PostType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -24,10 +25,11 @@ public static class SignupResDto {
     @NoArgsConstructor
     @Builder
     public static class StoryDto {
-        private Long storyId;
+        private Long postId;
         private String title;
         private Long comments;
         private Long likes;
+        private PostType type;
     }
 
     @Data
diff --git a/src/main/java/kpaas/dogcat/domain/member/service/MemberQueryService.java b/src/main/java/kpaas/dogcat/domain/member/service/MemberQueryService.java
@@ -1,21 +1,30 @@
 package kpaas.dogcat.domain.member.service;
 
+import kpaas.dogcat.domain.adopt.entity.Adopt;
+import kpaas.dogcat.domain.adopt.repository.AdoptQueryDslImpl;
+import kpaas.dogcat.domain.adopt.repository.AdoptRepository;
+import kpaas.dogcat.domain.donate.donation.entity.Donation;
+import kpaas.dogcat.domain.donate.donation.repository.DonationQueryDslImpl;
 import kpaas.dogcat.domain.member.converter.MemberConverter;
 import kpaas.dogcat.domain.member.dto.MemberResDto;
 import kpaas.dogcat.domain.member.entity.Member;
 import kpaas.dogcat.domain.member.repository.MemberRepository;
 import kpaas.dogcat.domain.stories.comment.service.CommentQueryService;
+import kpaas.dogcat.domain.stories.dailyStory.entity.DailyStory;
 import kpaas.dogcat.domain.stories.like.service.LikeQueryService;
+import kpaas.dogcat.domain.stories.review.entity.Review;
 import kpaas.dogcat.domain.stories.story.entity.Story;
 import kpaas.dogcat.domain.stories.story.repository.StoryRepository;
 import kpaas.dogcat.global.apiPayload.code.CustomException;
 import kpaas.dogcat.global.apiPayload.code.ErrorCode;
 //import kpaas.dogcat.global.jwt.JwtUtil;
 //import kpaas.dogcat.global.redis.service.RedisService;
+import kpaas.dogcat.global.enums.PostType;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -28,6 +37,10 @@ public class MemberQueryService {
     private final LikeQueryService likeQueryService;
     private final CommentQueryService commentQueryService;
     private final MemberConverter memberConverter;
+    private final AdoptRepository adoptRepository;
+    private final AdoptQueryDslImpl adoptQueryDslImpl;
+    private final DonationQueryDslImpl donationQueryDslImpl;
+
 
     public Member findById(String memberId) {
         return memberRepository.findById(memberId)
@@ -41,17 +54,42 @@ public MemberResDto.ProfileResDto getProfile(String walletAddress) {
         return memberConverter.toProfileResDto(member);
     }
 
-    public MemberResDto.StoriesListDto getStories(String walletAddress, Long cursor, int size) {
-        log.info("[ 마이페이지 스토리 조회 ]");
-        List<Story> stories = storyRepository.findStoriesByWalletAddress(walletAddress, cursor, size);
+    public MemberResDto.StoriesListDto getStories(String walletAddress, Long cursor, int size, PostType type) {
+        log.info("[ 마이페이지 글 조회 - 타입: {} ]", type);
+
+        List<MemberResDto.StoryDto> dtos = new ArrayList<>();
+
+        if (type == null) {
+            log.error("[ERROR] type 값이 null 입니다.");
+            throw new CustomException(ErrorCode.BAD_REQUEST_400);
+        }
 
-        List<MemberResDto.StoryDto> storyDtos = stories.stream()
-                .map(story -> mapToPreviewDto(story))
-                .toList();
-        Long nextCursor = stories.size() < size ? null : stories.get(stories.size() - 1).getId();
+        switch (type) {
+            case DAILY, REVIEW -> {
+                List<Story> stories = storyRepository.findStoriesByWalletAddress(walletAddress, cursor, size, type);
+                dtos = stories.stream()
+                        .map(this::mapToPreviewDto)
+                        .toList();
+            }
+            case ADOPTION -> {
+                List<Adopt> adopts = adoptQueryDslImpl.findAdoptsByWalletAddress(walletAddress, cursor, size);
+                dtos = adopts.stream()
+                        .map(memberConverter::toStoryDtoFromAdopt)
+                        .toList();
+            }
+            case DONATION -> {
+                List<Donation> donations = donationQueryDslImpl.findDonationsByWalletAddress(walletAddress, cursor, size);
+                dtos = donations.stream()
+                        .map(memberConverter::toStoryDtoFromDonation)
+                        .toList();
+            }
+            default -> log.warn("[WARN] 지정되지 않은 PostType 요청: {}", type);
+        }
+
+        Long nextCursor = dtos.size() < size ? null : dtos.get(dtos.size() - 1).getPostId();
 
         return MemberResDto.StoriesListDto.builder()
-                .stories(storyDtos)
+                .stories(dtos)
                 .nextCursor(nextCursor)
                 .build();
     }
@@ -60,6 +98,7 @@ private MemberResDto.StoryDto mapToPreviewDto(Story story) {
         Long storyId = story.getId();
         Long likeCount = likeQueryService.getLikeCount(storyId);
         Long commentCount = commentQueryService.getCommentCount(storyId);
+
         return memberConverter.toStoryDto(story, likeCount, commentCount);
     }
 }
diff --git a/src/main/java/kpaas/dogcat/domain/stories/dailyStory/converter/DailyStoryConverter.java b/src/main/java/kpaas/dogcat/domain/stories/dailyStory/converter/DailyStoryConverter.java
@@ -32,6 +32,7 @@ public DailyStoryResDto.WriteStoryResDto toWriteStoryResDto(Member member, Daily
                 .title(savedStory.getTitle())
                 .images(savedStory.getImages())
                 .content(savedStory.getContent())
+                .postType(savedStory.getPostType())
                 .build();
     }
 
diff --git a/src/main/java/kpaas/dogcat/domain/stories/dailyStory/dto/DailyStoryResDto.java b/src/main/java/kpaas/dogcat/domain/stories/dailyStory/dto/DailyStoryResDto.java
@@ -1,6 +1,7 @@
 package kpaas.dogcat.domain.stories.dailyStory.dto;
 
 import kpaas.dogcat.domain.pet.enums.Breed;
+import kpaas.dogcat.global.enums.PostType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -23,6 +24,7 @@ public static class WriteStoryResDto {
         private String title;
         private String images;
         private String content;
+        private PostType postType;
     }
 
     @Data
diff --git a/src/main/java/kpaas/dogcat/domain/stories/dailyStory/entity/DailyStory.java b/src/main/java/kpaas/dogcat/domain/stories/dailyStory/entity/DailyStory.java
@@ -1,8 +1,9 @@
 package kpaas.dogcat.domain.stories.dailyStory.entity;
 
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
+import jakarta.persistence.*;
 import kpaas.dogcat.domain.stories.story.entity.Story;
+import kpaas.dogcat.global.enums.PostType;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -12,4 +13,10 @@
 @NoArgsConstructor
 @SuperBuilder
 @DiscriminatorValue("DAILY")
-public class DailyStory extends Story { }
+public class DailyStory extends Story {
+
+    @PrePersist
+    public void prePersist() {
+        setPostType(PostType.DAILY);
+    }
+}
diff --git a/src/main/java/kpaas/dogcat/domain/stories/review/controller/ReviewController.java b/src/main/java/kpaas/dogcat/domain/stories/review/controller/ReviewController.java
@@ -32,7 +32,7 @@ public class ReviewController {
     })
     @PostMapping()
     public CustomResponse<ReviewResDto.WriteReviewResDto> create(
-            @CurrentWalletAddress String walletAddress,
+            @Parameter(hidden = true) @CurrentWalletAddress String walletAddress,
             @RequestBody ReviewReqDTO.WriteReviewDTO dto){
         ReviewResDto.WriteReviewResDto createdReview = reviewCommandService.writeReview(walletAddress, dto);
         return CustomResponse.onSuccess(SuccessCode.CREATED, createdReview);
diff --git a/src/main/java/kpaas/dogcat/domain/stories/review/converter/ReviewConverter.java b/src/main/java/kpaas/dogcat/domain/stories/review/converter/ReviewConverter.java
diff --git a/src/main/java/kpaas/dogcat/domain/stories/review/entity/Review.java b/src/main/java/kpaas/dogcat/domain/stories/review/entity/Review.java
diff --git a/src/main/java/kpaas/dogcat/domain/stories/story/entity/Story.java b/src/main/java/kpaas/dogcat/domain/stories/story/entity/Story.java
diff --git a/src/main/java/kpaas/dogcat/domain/stories/story/repository/StoryQueryDsl.java b/src/main/java/kpaas/dogcat/domain/stories/story/repository/StoryQueryDsl.java
diff --git a/src/main/java/kpaas/dogcat/domain/stories/story/repository/StoryQueryDslImpl.java b/src/main/java/kpaas/dogcat/domain/stories/story/repository/StoryQueryDslImpl.java
diff --git a/src/main/java/kpaas/dogcat/global/enums/PostType.java b/src/main/java/kpaas/dogcat/global/enums/PostType.java

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,6 @@ List<Adopt> searchAdoptions(Long cursor, int size,`
`14`	`14`	`Region region,`
`15`	`15`	`String district,`
`16`	`16`	`String keyword);`
	`17`	`+`
	`18`	`+ List<Adopt> findAdoptsByWalletAddress(String walletAddress, Long cursor, int size);`
`17`	`19`	`}`