Merge pull request #76 from Nexters/dev

Dev

Author: Jeongminyooa

.github/workflows/ci.yml

@@ -28,6 +28,7 @@ jobs:
           --health-retries=5
 
     env:
+      SPRING_PROFILES_ACTIVE: test
       SPRING_DATASOURCE_URL: jdbc:mysql://localhost:3306/testdb
       SPRING_DATASOURCE_USERNAME: testuser
       SPRING_DATASOURCE_PASSWORD: testpassword
@@ -63,6 +64,13 @@ jobs:
       - name: Wait for MySQL to be ready
         run: sleep 15
 
+      - name: Make application-test.properties
+        run: |
+          cd ./src/test/resources
+          touch ./application-test.properties
+          echo "${{ secrets.PROPERTIES_TEST }}" > ./application-test.properties
+        shell: bash
+
       # 테스트를 제외한 프로젝트 빌드
       - name: Build With Gradle
         run: ./gradlew build -x test

build.gradle

@@ -37,6 +37,8 @@ dependencies {
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.4'
 	implementation 'com.google.firebase:firebase-admin:9.4.3'
+
+	implementation 'com.amazonaws:aws-java-sdk-s3:1.11.238'
 }
 
 tasks.named('test') {

src/main/java/donmani/donmani_server/common/config/NcpStorageConfig.java

@@ -0,0 +1,35 @@
+package donmani.donmani_server.common.config;
+
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.client.builder.AwsClientBuilder;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class NcpStorageConfig {
+    @Value("${ncp.storage.endpoint}")
+    private String endPoint;
+
+    @Value("${ncp.storage.region}")
+    private String regionName;
+
+    @Value("${ncp.storage.accessKey}")
+    private String accessKey;
+
+    @Value("${ncp.storage.secretKey}")
+    private String secretKey;
+
+    @Bean
+    public AmazonS3Client amazonS3Client() {
+        BasicAWSCredentials basicAWSCredentials = new BasicAWSCredentials(accessKey, secretKey);
+        return (AmazonS3Client) AmazonS3ClientBuilder
+                .standard()
+                .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endPoint, regionName))
+                .withCredentials(new AWSStaticCredentialsProvider(basicAWSCredentials))
+                .build();
+    }
+}

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

@@ -12,14 +12,12 @@
 
 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(
@@ -77,8 +75,6 @@ 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));
 		} catch (Exception e) {

src/main/java/donmani/donmani_server/expense/dto/ExpenseResponseDTO.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import donmani.donmani_server.reward.dto.RewardItemResponseDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -16,4 +17,5 @@
 public class ExpenseResponseDTO {
 	private String userKey;
 	private List<RecordDTO> records;
+	private List<RewardItemResponseDTO> saveItems;
 }

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

@@ -13,6 +13,8 @@
 import donmani.donmani_server.expense.entity.CategoryType;
 import donmani.donmani_server.expense.entity.FlagType;
 
+import donmani.donmani_server.feedback.service.FeedbackService;
+import donmani.donmani_server.reward.service.RewardService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
@@ -31,6 +33,8 @@ public class ExpenseService {
 
 	private final ExpenseRepository expenseRepository;
 	private final UserService userService;
+	private final FeedbackService feedbackService;
+	private final RewardService rewardService;
 
 	private final static int SIZE = 20; // 전체 조회 페이지 사이즈 고정
 
@@ -69,6 +73,11 @@ public void addExpense(ExpenseRequestDTO request) {
 			.collect(Collectors.toList());
 
 		expenseRepository.saveAll(expenses);
+
+		// 피드백 카드 / 선물 받기
+		feedbackService.addFeedback(request);
+		feedbackService.openFeedback(request.getUserKey());
+		rewardService.acquireRandomItems(request.getUserKey(), request.getRecords().get(0).getDate());
 	}
 
 
@@ -93,6 +102,7 @@ public ExpenseResponseDTO getExpenses(String userKey, int year, int month, boole
 		return ExpenseResponseDTO.builder()
 			.userKey(userKey)
 			.records(expenseToDto(expenses, sortedDesc))
+				.saveItems(rewardService.getSavedItem(userKey, year, month))
 			.build();
 	}
 
@@ -228,13 +238,6 @@ 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);

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

@@ -46,10 +46,10 @@ public ResponseEntity<HttpStatusDTO<FeedbackNotOpenedResponseDTO>> getNotOpenedF
 		}
 	}
 
-	@PostMapping("api/v1/feedback/{userKey}")
-	public ResponseEntity<HttpStatusDTO<FeedbackOpenResponseDTO>> openFeedbackV1(@Valid @PathVariable String userKey) {
+	@GetMapping("api/v1/feedback/content/{userKey}")
+	public ResponseEntity<HttpStatusDTO<FeedbackOpenResponseDTO>> getFeedbackContentV1(@Valid @PathVariable String userKey) {
 		try {
-			FeedbackOpenResponseDTO response = feedbackService.openFeedback(userKey);
+			FeedbackOpenResponseDTO response = feedbackService.getNotOpenedFeedbackContent(userKey);
 
 			// 1. 피드백 열기 성공 -> 201
 			return ResponseEntity.ok(HttpStatusDTO.response(HttpStatus.CREATED.value(), "성공", response));

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

@@ -1,6 +1,7 @@
 package donmani.donmani_server.feedback.dto;
 
 import donmani.donmani_server.expense.entity.CategoryType;
+import donmani.donmani_server.feedback.entity.Feedback;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import lombok.AllArgsConstructor;

src/main/java/donmani/donmani_server/feedback/repository/FeedbackRepository.java

@@ -2,7 +2,9 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
+import donmani.donmani_server.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -20,4 +22,10 @@ public interface FeedbackRepository extends JpaRepository<Feedback, Long> {
 
 	@Query("SELECT f.title FROM Feedback f JOIN f.user u WHERE u.id = :userId")
 	List<String> findFeedbackByUserIdUsedTitle(Long userId);
+
+	@Query("SELECT f FROM Feedback f JOIN f.user u WHERE u.id = :userId AND f.isOpened IS FALSE ORDER BY f.createdDate DESC")
+	List<Feedback> findFeedbackByIsOpenedOrderByCreatedDateDesc(Long userId);
+
+	Optional<Feedback> findFirstByUserAndIsOpenedFalseOrderByCreatedDateDesc(User user);
+
 }

src/main/java/donmani/donmani_server/feedback/service/FeedbackService.java

@@ -7,6 +7,7 @@
 import java.util.Random;
 import java.util.stream.Collectors;
 
+import donmani.donmani_server.expense.repository.ExpenseRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -27,7 +28,7 @@
 @RequiredArgsConstructor
 public class FeedbackService {
 	private final UserService userService;
-	private final ExpenseService expenseService;
+	private final ExpenseRepository expenseRepository;
 	private final FeedbackRepository feedbackRepository;
 	private final FeedbackTemplateProvider feedbackTemplateProvider;
 
@@ -45,7 +46,7 @@ public void addFeedback(ExpenseRequestDTO requestDTO) {
 		LocalDateTime baseTime = LocalDateTime.of(2025, 5, 26, 0, 0);  // 2025-05-30 00:00
 
 		if (createdAt.isEqual(baseTime) || createdAt.isAfter(baseTime)) {
-			Expense expense = expenseService.getExpenseSubmitToday(user.getId(), createdAt);
+			Expense expense = expenseRepository.findExpenseByUserIdAndAndCreatedAt(user.getId(), createdAt);
 
 			// GOOD, BAD 일 경우 feedback 생성
 			if (expense.getFlag() != null) {
@@ -148,8 +149,8 @@ public FeedbackOpenResponseDTO openFeedback(String userKey) {
 
 		notOpenedFeedback.setTitle(remainTemplate.getTitle());
 		notOpenedFeedback.setContent(remainTemplate.getContent());
-		notOpenedFeedback.setOpened(true);
-		notOpenedFeedback.setUpdateDate(localDateTime);
+		// notOpenedFeedback.setOpened(true);
+		// notOpenedFeedback.setUpdateDate(localDateTime);
 
 		feedbackRepository.save(notOpenedFeedback);
 
@@ -162,6 +163,25 @@ public FeedbackOpenResponseDTO openFeedback(String userKey) {
 
 		return response;
 	}
+
+	@Transactional(readOnly = true)
+	public FeedbackOpenResponseDTO getNotOpenedFeedbackContent(String userKey) {
+		LocalDateTime localDateTime = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+		User user = userService.getUser(userKey);
+		Feedback notOpenedFeedback = feedbackRepository.findFirstByUserAndIsOpenedFalseOrderByCreatedDateDesc(user).orElseThrow();
+
+		Boolean isToday = notOpenedFeedback.getExpense().getCreatedAt().format(formatter).equals(localDateTime.format(formatter));
+		FeedbackOpenResponseDTO response = new FeedbackOpenResponseDTO(
+				notOpenedFeedback.getTitle(),
+				notOpenedFeedback.getContent(),
+				notOpenedFeedback.getUser().getName(),
+				notOpenedFeedback.getExpense().getCategory(),
+				isToday);
+
+		return response;
+	}
 }