Merge pull request #74 from Nexters/dev

동기부여 관련 신규 기능 개발

Author: k906506

src/main/java/donmani/donmani_server/expense/controller/ExpenseController.java

@@ -12,12 +12,14 @@
 
 import donmani.donmani_server.common.httpStatus.HttpStatusDTO;
 import donmani.donmani_server.expense.service.ExpenseService;
+import donmani.donmani_server.feedback.service.FeedbackService;
 import lombok.RequiredArgsConstructor;
 
 @RestController
 @RequiredArgsConstructor
 public class ExpenseController {
 	private final ExpenseService expenseService;
+	private final FeedbackService feedbackService;
 
 	@GetMapping("expenses/calendar/{userKey}")
 	public ResponseEntity<ExpenseResponseDTO> getExpensesCalendar(
@@ -75,6 +77,7 @@ public ResponseEntity<Void> addExpense(@RequestBody ExpenseRequestDTO request) {
 	public ResponseEntity<HttpStatusDTO<Void>> addExpenseV1(@RequestBody ExpenseRequestDTO request) {
 		try {
 			expenseService.addExpense(request);
+			feedbackService.addFeedback(request);
 
 			// 1. 소비 기록 성공 -> 201
 			return ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.CREATED.value(), "성공", null));

src/main/java/donmani/donmani_server/expense/entity/Expense.java

@@ -1,9 +1,12 @@
 package donmani.donmani_server.expense.entity;
 
+import donmani.donmani_server.feedback.entity.Feedback;
 import jakarta.persistence.*;
 import lombok.*;
 import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+
 @Entity
 @Getter
 @Setter
@@ -34,4 +37,12 @@ public class Expense {
 	*/
 	private LocalDateTime createdDate; // 서버에 기록된 일자
 	private LocalDateTime updateDate;
+
+	/*
+	 - 2025.05.25
+	 - feedback 양방향 연관 관계 추가
+	*/
+	@OneToOne(mappedBy = "expense")
+	@JsonManagedReference
+	private Feedback feedback;
 }

src/main/java/donmani/donmani_server/expense/repository/ExpenseRepository.java

@@ -22,4 +22,15 @@ public interface ExpenseRepository extends JpaRepository<Expense, Long> {
 
 	@Query("SELECT e FROM Expense e WHERE e.createdAt IN :localDateTimes ORDER BY e.createdAt DESC")
 	List<Expense> findByCreatedAtIn(@Param("userId") Long userId, List<LocalDateTime> localDateTimes);
+
+	// 소비가 GOOD, BAD 모두 존재하는 경우 랜덤으로 하나만 피드백 카드 생성
+	@Query("SELECT e FROM Expense e WHERE e.userId = :userId AND DATE_FORMAT(e.createdAt, '%Y%m%d') = DATE_FORMAT(:date, '%Y%m%d') ORDER BY RAND() LIMIT 1")
+	Expense findExpenseByUserIdAndAndCreatedAt(Long userId, LocalDateTime date);
+
+	// @Query("SELECT DISTINCT e.createdAt FROM Expense e WHERE DATE_FORMAT(e.createdAt, '%Y%m%d') >= DATE_FORMAT('20250525', '%Y%m%d') AND e.userId = :userId")
+	@Query("SELECT DISTINCT e.createdAt FROM Expense e WHERE e.userId = :userId")
+	List<LocalDateTime> findTotalExpensesCount(Long userId);
+
+	Expense findExpenseById(Long id);
+
 }

src/main/java/donmani/donmani_server/expense/service/ExpenseService.java

@@ -12,13 +12,15 @@
 import donmani.donmani_server.expense.dto.*;
 import donmani.donmani_server.expense.entity.CategoryType;
 import donmani.donmani_server.expense.entity.FlagType;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import donmani.donmani_server.expense.entity.Expense;
 import donmani.donmani_server.expense.repository.ExpenseRepository;
+import donmani.donmani_server.user.entity.User;
 import donmani.donmani_server.user.service.UserService;
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
@@ -49,6 +51,7 @@ public void addExpense(ExpenseRequestDTO request) {
 						.userId(userId)
 						.createdAt(record.getDate().atStartOfDay())
 						.createdDate(localDateTime)
+						.updateDate(localDateTime)
 						.build());
 				}
 
@@ -57,6 +60,7 @@ public void addExpense(ExpenseRequestDTO request) {
 					.userId(userId)
 					.createdAt(record.getDate().atStartOfDay())
 					.createdDate(localDateTime)
+					.updateDate(localDateTime)
 					.flag(content.getFlag())
 					.category(content.getCategory())
 					.memo(content.getMemo())
@@ -224,4 +228,32 @@ public CategoryStatisticsDTO getCategoryStatistics(String userKey, int year, int
 				.build();
 	}
 
+	@Transactional(readOnly = true)
+	public Expense getExpenseSubmitToday(Long userId, LocalDateTime date) {
+		Expense expense = expenseRepository.findExpenseByUserIdAndAndCreatedAt(userId, date);
+
+		return expense;
+	}
+
+	public Integer getTotalExpensesCount(String userKey) {
+		// 1. 유저 정보 확인
+		User user = userService.getUser(userKey);
+
+		// 오늘 기록된 소비 확인
+		// ver 2.0.0 이후로 기록된 소비만
+		LocalDateTime baseTime = LocalDateTime.of(2025, 5, 26, 0, 0);  // 2025-05-30 00:00
+
+		List<LocalDateTime> createdAts = expenseRepository.findTotalExpensesCount(user.getId());
+
+		createdAts
+			.stream()
+			.filter(createdAt -> createdAt.isEqual(baseTime) || createdAt.isAfter(baseTime))
+			.collect(Collectors.toList());
+
+		return createdAts == null || createdAts.isEmpty() ? 0 : createdAts.size();
+	}
+
+	public Expense getExpense(Long id) {
+		return expenseRepository.findExpenseById(id);
+	}
 }

src/main/java/donmani/donmani_server/feedback/controller/FeedbackController.java

@@ -0,0 +1,61 @@
+package donmani.donmani_server.feedback.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import donmani.donmani_server.common.httpStatus.HttpStatusDTO;
+import donmani.donmani_server.expense.service.ExpenseService;
+import donmani.donmani_server.feedback.dto.FeedbackNotOpenedResponseDTO;
+import donmani.donmani_server.feedback.dto.FeedbackOpenResponseDTO;
+import donmani.donmani_server.feedback.service.FeedbackService;
+
+import jakarta.validation.Valid;
+import lombok.AllArgsConstructor;
+
+@RestController
+@AllArgsConstructor
+public class FeedbackController {
+	private final FeedbackService feedbackService;
+	private final ExpenseService expenseService;
+
+	@GetMapping("api/v1/feedback/{userKey}")
+	public ResponseEntity<HttpStatusDTO<FeedbackNotOpenedResponseDTO>> getNotOpenedFeedbackV1(@Valid @PathVariable String userKey) {
+		try {
+			// 1. 아직 열지 않은 피드백이 하나라도 있으면 true, 모든 피드백을 열었으면 false
+			//  - 최근 생성된 피드백부터 내림차순으로 정렬
+			Boolean isNotOpened = feedbackService.isNotOpenedFeedback(userKey);
+
+			// 2. 피드백을 처음 여는 상황이면 true, 이미 열은 피드백이 하나라도 있으면 false
+			//  - 최근 생성된 피드백부터 내림차순으로 정렬
+			Boolean isFirstOpened = feedbackService.isFirstOpenedFeedback(userKey);
+
+			// 3. ver 2.0.0 이후로 기록된 소비 확인
+			Integer totalCount = expenseService.getTotalExpensesCount(userKey);
+
+			FeedbackNotOpenedResponseDTO feedbackNotOpenedResponseDTO = new FeedbackNotOpenedResponseDTO(isNotOpened, isFirstOpened, totalCount);
+
+			// 1. 피드백 조회 성공 -> 200
+			return ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.OK.value(), "성공", feedbackNotOpenedResponseDTO));
+		} catch (Exception e) {
+			// 2. 피드백 조회 실패 -> 500
+			return ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.INTERNAL_SERVER_ERROR.value(), "모든 피드백을 열었습니다.", null));
+		}
+	}
+
+	@PostMapping("api/v1/feedback/{userKey}")
+	public ResponseEntity<HttpStatusDTO<FeedbackOpenResponseDTO>> openFeedbackV1(@Valid @PathVariable String userKey) {
+		try {
+			FeedbackOpenResponseDTO response = feedbackService.openFeedback(userKey);
+
+			// 1. 피드백 열기 성공 -> 201
+			return ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.CREATED.value(), "성공", response));
+		} catch (Exception e) {
+			// 2. 피드백 열기 실패 -> 500
+			return ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.INTERNAL_SERVER_ERROR.value(), "모든 피드백을 열었습니다.", null));
+		}
+	}
+}

src/main/java/donmani/donmani_server/feedback/dto/FeedbackNotOpenedResponseDTO.java

@@ -0,0 +1,21 @@
+package donmani.donmani_server.feedback.dto;
+
+import java.util.List;
+
+import donmani.donmani_server.expense.dto.RecordDTO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class FeedbackNotOpenedResponseDTO {
+	private Boolean isNotOpened;
+	private Boolean isFirstOpen;
+	private Integer totalCount;
+}

src/main/java/donmani/donmani_server/feedback/dto/FeedbackOpenResponseDTO.java

@@ -0,0 +1,29 @@
+package donmani.donmani_server.feedback.dto;
+
+import donmani.donmani_server.expense.entity.CategoryType;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class FeedbackOpenResponseDTO {
+	private String title;
+
+	private String content;
+
+	private String name;
+
+	@Enumerated(EnumType.STRING)
+	private CategoryType category;
+
+	private boolean flagType;
+}

src/main/java/donmani/donmani_server/feedback/entity/Feedback.java

@@ -0,0 +1,53 @@
+package donmani.donmani_server.feedback.entity;
+
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+
+import donmani.donmani_server.expense.entity.Expense;
+import donmani.donmani_server.user.entity.User;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Feedback {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	private LocalDateTime createdDate;
+
+	private LocalDateTime updateDate;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "user_id")
+	@JsonBackReference
+	private User user;
+
+	@OneToOne
+	@JoinColumn(name = "expense_id")
+	@JsonBackReference
+	private Expense expense;
+
+	private boolean isOpened;
+
+	private String title;
+
+	private String content;
+}

src/main/java/donmani/donmani_server/feedback/provider/FeedbackTemplate.java

@@ -0,0 +1,12 @@
+package donmani.donmani_server.feedback.provider;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@AllArgsConstructor
+@ToString
+public class FeedbackTemplate {
+	private final String title;
+	private final String content;
+}