Skip to content

feat: 감정일기 v2 #112 #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions default/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@ plugins {
id("java")
id("org.springframework.boot") version "3.4.2"
id("io.spring.dependency-management") version "1.1.7"
id("org.sonarqube") version "4.4.1.3373"
}

sonarqube {
properties {
property("sonar.exclusions", "**/JwtProvider.java,**/JwtAuthenticationFilter.java,...")
property("sonar.duplication.exclusions", "**/JwtProvider.java,**/JwtAuthenticationFilter.java,...")
}
}

group = "org.dfbf"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ public class EmotionRecordController {
@PostMapping
@Operation(
summary = "감정 기록 작성/저장 API",
description = "작성한 감정 기록을 저장합니다."
description = "작성한 감정 기록을 저장 & Idempotency Key를 사용하여 중복 요청을 방지"
)
public ResponseResult saveEmotionWithMusic(
public ResponseResult saveEmotionWithMusicAndIdempotency(
@RequestHeader(name = "Idempotency-Key") String idempotencyKey,
@AuthenticationPrincipal Long userId,
@Valid @RequestBody EmotionRecordRequestDTO request) {
return emotionRecordService.saveEmotionRecordWithMusic(userId, request);
return emotionRecordService.saveEmotionRecordWithMusicAndIdempotent(idempotencyKey, userId, request);
}

@GetMapping
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.dfbf.soundlink.domain.emotionRecord.service;

import com.fasterxml.jackson.databind.ObjectMapper;
import feign.Response;
import jakarta.persistence.OptimisticLockException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -26,13 +28,15 @@
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.retry.annotation.Backoff;
import org.springframework.retry.annotation.Recover;
import org.springframework.retry.annotation.Retryable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.concurrent.TimeUnit;

@Service
@RequiredArgsConstructor
Expand All @@ -47,6 +51,8 @@ public class EmotionRecordService {
// private final EmotionRecordCacheService emotionRecordCacheService;
private final ChatRoomRepository chatRoomRepository;

private final RedisTemplate<String, Object> redisTemplate;

@Transactional
public ResponseResult saveEmotionRecordWithMusic(Long userId, EmotionRecordRequestDTO request) {

Expand Down Expand Up @@ -74,8 +80,8 @@ public ResponseResult saveEmotionRecordWithMusic(Long userId, EmotionRecordReque
.build();
emotionRecordRepository.save(emotionRecord);

/* // 게시글 생성 시, 해당 조건에 맞는 캐시 키 삭제
emotionRecordCacheService.evictEmotionRecordCache(
// 게시글 생성 시, 해당 조건에 맞는 캐시 키 삭제
/*emotionRecordCacheService.evictEmotionRecordCache(
userId,
request.spotifyId(),
request.emotion().name()
Expand All @@ -95,6 +101,23 @@ public ResponseResult saveEmotionRecordWithMusic(Long userId, EmotionRecordReque
}
}

// 감정일기 추가
// 중복 요청 방지 기능 추가 (멱등성 보장)
@Transactional
public ResponseResult saveEmotionRecordWithMusicAndIdempotent(String idempotencyKey, Long userId, EmotionRecordRequestDTO request) {
if (idempotencyKey != null && !redisTemplate.keys("EmotionRecord:" + idempotencyKey).isEmpty()) {
ObjectMapper mapper = new ObjectMapper();
return mapper.convertValue(redisTemplate.opsForValue().get("EmotionRecord:" + idempotencyKey), ResponseResult.class);
}

ResponseResult responseResult = saveEmotionRecordWithMusic(userId, request);
if (idempotencyKey != null) {
redisTemplate.opsForValue().set("EmotionRecord:" + idempotencyKey, responseResult, 10, TimeUnit.SECONDS);
}

return responseResult;
}

@Transactional(readOnly = true)
public ResponseResult getEmotionRecordsByUserId(Long userId, int page, int size) {
ResponseResult pageValidationResult = validateAndCreatePageable(page, size);
Expand Down Expand Up @@ -122,7 +145,6 @@ public ResponseResult getEmotionRecordsByUserId(Long userId, int page, int size)
}
}


@Transactional(readOnly = true)
public ResponseResult getEmotionRecordsByLoginId(String userTag, int page, int size) {
ResponseResult pageValidationResult = validateAndCreatePageable(page, size);
Expand Down