Add(.remind): 피드백 가능한 계획 목록 조회 API 구현

src/main/java/me/ajaja/global/common/BaseTime.java

@@ -75,6 +75,10 @@ public boolean isWithinAMonth(BaseTime time) {
 		return zonedDateTime.isBefore(time.oneMonthLater()) && zonedDateTime.isAfter(time.zonedDateTime);
 	}
 
+	public long betweenDays(BaseTime compare) {
+		return Duration.between(this.instant, compare.instant).toDays();
+	}
+
 	private static LocalDateTime parseDateTime(int year, int month, int date, int hour, int minute) {
 		return LocalDateTime.of(year, month, date, hour, minute);
 	}

src/main/java/me/ajaja/module/feedback/application/LoadEvaluableFeedbacksService.java

@@ -0,0 +1,36 @@
+package me.ajaja.module.feedback.application;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import lombok.RequiredArgsConstructor;
+import me.ajaja.global.common.BaseTime;
+import me.ajaja.module.feedback.domain.Feedback;
+import me.ajaja.module.feedback.domain.FeedbackQueryRepository;
+import me.ajaja.module.feedback.dto.FeedbackResponse;
+import me.ajaja.module.feedback.mapper.FeedbackMapper;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class LoadEvaluableFeedbacksService {
+	private final FeedbackQueryRepository feedbackQueryRepository;
+	private final LoadEvaluableTargetsService loadEvaluableTargetsService;
+	private final FeedbackMapper mapper;
+
+	public List<FeedbackResponse.EvaluableFeedback> loadEvaluableFeedbacksByUserId(Long userId) {
+		List<Feedback> feedbacks = feedbackQueryRepository.findAllFeedbacksByUserId(userId);
+
+		return loadEvaluableTargetsService.findEvaluableTargetsByUserId(userId).stream()
+			.filter(feedback -> isNotEvaluate(feedbacks, feedback.planId(), feedback.period()))
+			.map(mapper::toResponse)
+			.toList();
+	}
+
+	private boolean isNotEvaluate(List<Feedback> feedbacks, Long planId, BaseTime period) {
+		return feedbacks.stream().noneMatch(feedback ->
+			feedback.getPlanId().equals(planId) && period.isWithinAMonth(feedback.getCreatedAt()));
+	}
+}

src/main/java/me/ajaja/module/feedback/application/LoadEvaluableTargetsService.java

@@ -0,0 +1,9 @@
+package me.ajaja.module.feedback.application;
+
+import java.util.List;
+
+import me.ajaja.module.feedback.application.model.UpdatableFeedback;
+
+public interface LoadEvaluableTargetsService { // todo: 헥사고날 아키텍쳐 적용 후 네이밍 변경
+	List<UpdatableFeedback> findEvaluableTargetsByUserId(Long userId);
+}

src/main/java/me/ajaja/module/feedback/application/LoadFeedbackService.java

@@ -16,6 +16,6 @@ public class LoadFeedbackService {
 	private final FeedbackQueryRepository feedbackQueryRepository;
 
 	public List<Feedback> loadFeedback(Long planId) {
-		return feedbackQueryRepository.findAllFeedbackByPlanId(planId);
+		return feedbackQueryRepository.findAllFeedbacksByPlanId(planId);
 	}
 }

src/main/java/me/ajaja/module/feedback/application/UpdateFeedbackService.java

@@ -27,7 +27,7 @@ public void updateFeedback(Long userId, Long planId, int rate, String message) {
 		Plan plan = findTargetPort.findByUserIdAndPlanId(userId, planId);
 		BaseTime now = BaseTime.now();
 
-		BaseTime period = plan.getFeedbackPeriod(now);
+		BaseTime period = plan.findFeedbackPeriod(now);
 		checkExistFeedback(planId, period);
 
 		Feedback feedback = Feedback.create(userId, planId, rate, message);

src/main/java/me/ajaja/module/feedback/application/model/UpdatableFeedback.java

@@ -0,0 +1,10 @@
+package me.ajaja.module.feedback.application.model;
+
+import me.ajaja.global.common.BaseTime;
+
+public record UpdatableFeedback(
+	String title,
+	Long planId,
+	BaseTime period
+) {
+}

src/main/java/me/ajaja/module/feedback/domain/FeedbackQueryRepository.java

@@ -7,9 +7,11 @@
 import me.ajaja.module.feedback.infra.model.FeedbackInfo;
 
 public interface FeedbackQueryRepository {
-	List<Feedback> findAllFeedbackByPlanId(Long planId);
+	List<Feedback> findAllFeedbacksByPlanId(Long planId);
 
-	boolean existByPlanIdAndPeriod(Long feedbackId, BaseTime period);
+	List<Feedback> findAllFeedbacksByUserId(Long userId);
+
+	boolean existByPlanIdAndPeriod(Long planId, BaseTime period);
 
 	List<FeedbackInfo> findFeedbackInfosByPlanId(Long planId);
 

src/main/java/me/ajaja/module/feedback/dto/FeedbackResponse.java

@@ -24,4 +24,13 @@ public static class RemindFeedback {
 		private final int endDate;
 		private final boolean reminded;
 	}
+
+	@Data
+	public static class EvaluableFeedback {
+		private final String title;
+		private final Long planId;
+		private final long remainPeriod;
+		private final int month;
+		private final int date;
+	}
 }

src/main/java/me/ajaja/module/feedback/infra/FeedbackQueryRepositoryImpl.java

@@ -26,7 +26,7 @@ class FeedbackQueryRepositoryImpl implements FeedbackQueryRepository {
 	private final FeedbackMapper mapper;
 
 	@Override
-	public List<Feedback> findAllFeedbackByPlanId(Long planId) {
+	public List<Feedback> findAllFeedbacksByPlanId(Long planId) {
 		List<FeedbackEntity> entities = queryFactory.selectFrom(feedbackEntity)
 			.where(feedbackEntity.planId.eq(planId))
 			.orderBy(feedbackEntity.createdAt.asc())
@@ -35,6 +35,17 @@ public List<Feedback> findAllFeedbackByPlanId(Long planId) {
 		return mapper.toDomain(entities);
 	}
 
+	@Override
+	public List<Feedback> findAllFeedbacksByUserId(Long userId) {
+		List<FeedbackEntity> entities = queryFactory.selectFrom(feedbackEntity)
+			.where(feedbackEntity.userId.eq(userId)
+				.and(feedbackEntity.createdAt.year().eq(BaseTime.now().getYear())))
+			.orderBy(feedbackEntity.planId.asc())
+			.fetch();
+
+		return mapper.toDomain(entities);
+	}
+
 	@Override
 	public boolean existByPlanIdAndPeriod(Long planId, BaseTime period) {
 		return queryFactory.selectFrom(feedbackEntity)

src/main/java/me/ajaja/module/feedback/mapper/FeedbackMapper.java

@@ -8,6 +8,7 @@
 
 import me.ajaja.global.common.BaseTime;
 import me.ajaja.module.feedback.application.model.PlanFeedbackInfo;
+import me.ajaja.module.feedback.application.model.UpdatableFeedback;
 import me.ajaja.module.feedback.domain.Feedback;
 import me.ajaja.module.feedback.dto.FeedbackResponse;
 import me.ajaja.module.feedback.infra.FeedbackEntity;
@@ -59,4 +60,9 @@ default boolean isReminded(BaseTime sendDate) {
 		BaseTime now = BaseTime.now();
 		return now.isAfter(sendDate);
 	}
+
+	@Mapping(target = "remainPeriod", expression = "java(feedback.period().betweenDays(BaseTime.now()))")
+	@Mapping(target = "month", expression = "java(feedback.period().getMonth())")
+	@Mapping(target = "date", expression = "java(feedback.period().getDate())")
+	FeedbackResponse.EvaluableFeedback toResponse(UpdatableFeedback feedback);
 }

src/main/java/me/ajaja/module/feedback/presentation/FeedbackController.java

@@ -2,6 +2,8 @@
 
 import static org.springframework.http.HttpStatus.*;
 
+import java.util.List;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,6 +16,7 @@
 import me.ajaja.global.common.AjajaResponse;
 import me.ajaja.global.security.annotation.Authorization;
 import me.ajaja.global.util.SecurityUtil;
+import me.ajaja.module.feedback.application.LoadEvaluableFeedbacksService;
 import me.ajaja.module.feedback.application.LoadFeedbackInfoService;
 import me.ajaja.module.feedback.application.UpdateFeedbackService;
 import me.ajaja.module.feedback.dto.FeedbackRequest;
@@ -25,6 +28,7 @@
 public class FeedbackController {
 	private final UpdateFeedbackService updateFeedbackService;
 	private final LoadFeedbackInfoService loadFeedbackInfoService;
+	private final LoadEvaluableFeedbacksService loadEvaluableFeedbacksService;
 
 	@Authorization
 	@PostMapping("/{planId}")
@@ -46,4 +50,14 @@ public AjajaResponse<FeedbackResponse.FeedbackInfo> getFeedbackInfo(@PathVariabl
 		FeedbackResponse.FeedbackInfo feedbackInfo = loadFeedbackInfoService.loadFeedbackInfoByPlanId(userId, planId);
 		return AjajaResponse.ok(feedbackInfo);
 	}
+
+	@Authorization
+	@GetMapping("/evaluables")
+	@ResponseStatus(OK)
+	public AjajaResponse<List<FeedbackResponse.EvaluableFeedback>> getEvaluableFeedbacks() {
+		Long userId = SecurityUtil.getUserId();
+		List<FeedbackResponse.EvaluableFeedback> feedbacks
+			= loadEvaluableFeedbacksService.loadEvaluableFeedbacksByUserId(userId);
+		return AjajaResponse.ok(feedbacks);
+	}
 }

src/main/java/me/ajaja/module/plan/adapter/out/persistence/FindEvaluablePlansAdapter.java

@@ -0,0 +1,33 @@
+package me.ajaja.module.plan.adapter.out.persistence;
+
+import static me.ajaja.module.plan.adapter.out.persistence.model.QPlanEntity.*;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import lombok.RequiredArgsConstructor;
+import me.ajaja.global.common.BaseTime;
+import me.ajaja.module.plan.application.port.out.FindEvaluablePlansPort;
+import me.ajaja.module.plan.domain.Plan;
+import me.ajaja.module.plan.mapper.PlanMapper;
+
+@Repository
+@RequiredArgsConstructor
+public class FindEvaluablePlansAdapter implements FindEvaluablePlansPort {
+	private final JPAQueryFactory queryFactory;
+	private final PlanMapper mapper;
+
+	@Override
+	public List<Plan> findEvaluablePlansByUserIdAndTime(Long id, BaseTime now) {
+		return queryFactory.selectFrom(planEntity)
+			.where(planEntity.userId.eq(id)
+				.and(planEntity.createdAt.year().eq(now.getYear())))
+			.fetch()
+			.stream()
+			.map(mapper::toDomain)
+			.toList();
+	}
+}

src/main/java/me/ajaja/module/plan/application/LoadEvaluablePlansService.java

@@ -0,0 +1,30 @@
+package me.ajaja.module.plan.application;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import lombok.RequiredArgsConstructor;
+import me.ajaja.global.common.BaseTime;
+import me.ajaja.module.feedback.application.LoadEvaluableTargetsService;
+import me.ajaja.module.feedback.application.model.UpdatableFeedback;
+import me.ajaja.module.plan.application.port.out.FindEvaluablePlansPort;
+import me.ajaja.module.plan.mapper.PlanMapper;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class LoadEvaluablePlansService implements LoadEvaluableTargetsService {
+	private FindEvaluablePlansPort findEvaluablePlansPort;
+	private PlanMapper mapper;
+
+	@Override
+	public List<UpdatableFeedback> findEvaluableTargetsByUserId(Long userId) {
+		BaseTime now = BaseTime.now();
+		return findEvaluablePlansPort.findEvaluablePlansByUserIdAndTime(userId, now).stream()
+			.filter(plan -> plan.isWithinPeriod(now))
+			.map(mapper::toFeedbackModel)
+			.toList();
+	}
+}

src/main/java/me/ajaja/module/plan/application/port/out/FindEvaluablePlansPort.java

@@ -0,0 +1,10 @@
+package me.ajaja.module.plan.application.port.out;
+
+import java.util.List;
+
+import me.ajaja.global.common.BaseTime;
+import me.ajaja.module.plan.domain.Plan;
+
+public interface FindEvaluablePlansPort {
+	List<Plan> findEvaluablePlansByUserIdAndTime(Long id, BaseTime now);
+}

src/main/java/me/ajaja/module/plan/domain/Message.java

@@ -7,6 +7,7 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import me.ajaja.global.common.BaseTime;
 import me.ajaja.global.common.SelfValidating;
 
 @Getter
@@ -26,4 +27,13 @@ public Message(String content, int remindMonth, int remindDay) {
 		this.remindDate = new RemindDate(remindMonth, remindDay);
 		this.validateSelf();
 	}
+
+	BaseTime parsePeriod(int year, int remindTime) {
+		return BaseTime.parse(
+			year,
+			remindDate.getRemindMonth(),
+			remindDate.getRemindDay(),
+			remindTime
+		);
+	}
 }

src/main/java/me/ajaja/module/plan/domain/Plan.java

@@ -142,20 +142,17 @@ public void disable() {
 		this.status = status.disable();
 	}
 
-	public BaseTime getFeedbackPeriod(BaseTime current) {
+	public BaseTime findFeedbackPeriod(BaseTime now) {
 		return this.messages.stream()
-			.filter(message -> current.isWithinAMonth(
-				BaseTime.parse(
-					this.createdAt.getYear(),
-					message.getRemindDate().getRemindMonth(),
-					message.getRemindDate().getRemindDay(),
-					this.getRemindTime()))
-			)
+			.filter(message -> isWithinPeriod(now))
 			.findAny()
-			.map(message -> BaseTime.parse(this.createdAt.getYear(),
-				message.getRemindDate().getRemindMonth(),
-				message.getRemindDate().getRemindDay(),
-				this.getRemindTime()))
+			.map(message -> message.parsePeriod(this.createdAt.getYear(), this.getRemindTime()))
 			.orElseThrow(() -> new AjajaException(EXPIRED_FEEDBACK));
 	}
+
+	public boolean isWithinPeriod(BaseTime now) {
+		return this.messages.stream().anyMatch(message -> now.isWithinAMonth(
+			message.parsePeriod(this.createdAt.getYear(), this.getRemindTime())
+		));
+	}
 }

src/main/java/me/ajaja/module/plan/domain/RemindInfo.java

@@ -6,11 +6,22 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import me.ajaja.global.common.SelfValidating;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class RemindInfo extends SelfValidating<RemindInfo> {
+	@Getter
+	@RequiredArgsConstructor
+	private enum RemindTime {
+		MORNING(9),
+		AFTERNOON(13),
+		EVENING(22);
+
+		private final int time;
+	}
+
 	@Positive
 	private int remindTotalPeriod;
 

src/main/java/me/ajaja/module/plan/mapper/PlanMapper.java

@@ -12,6 +12,7 @@
 import me.ajaja.module.ajaja.infra.AjajaEntity;
 import me.ajaja.module.feedback.application.model.FeedbackPeriod;
 import me.ajaja.module.feedback.application.model.PlanFeedbackInfo;
+import me.ajaja.module.feedback.application.model.UpdatableFeedback;
 import me.ajaja.module.plan.adapter.out.persistence.model.PlanEntity;
 import me.ajaja.module.plan.domain.Content;
 import me.ajaja.module.plan.domain.Message;
@@ -143,4 +144,13 @@ default List<FeedbackPeriod> getFeedbackPeriods(List<Message> messages) {
 			.map(remindDate -> new FeedbackPeriod(remindDate.getRemindMonth(), remindDate.getRemindDay()))
 			.toList();
 	}
+
+	@Mapping(source = "id", target = "planId")
+	@Mapping(source = "content.title", target = "title")
+	@Mapping(target = "period", expression = "java(getRemindPeriod(plan))")
+	UpdatableFeedback toFeedbackModel(Plan plan);
+
+	default BaseTime getRemindPeriod(Plan plan) {
+		return plan.findFeedbackPeriod(BaseTime.now());
+	}
 }

src/main/java/me/ajaja/module/remind/adapter/out/persistence/FindTargetRemindAdapter.java

@@ -24,7 +24,8 @@ public RemindResponse.RemindInfo findByUserIdAndPlanId(Long userId, Long planId)
 		Plan plan = findTargetPort.findByUserIdAndPlanId(userId, planId);
 
 		List<RemindResponse.Message> messages = plan.getMessages()
-			.stream().map(mapper::toMessage)
+			.stream().map(message ->
+				mapper.toMessage(message, plan.getCreatedAt().getYear(), plan.getRemindTime()))
 			.toList();
 
 		return mapper.toRemindInfo(plan, messages);