diff --git a/cruise-activity-service/src/main/java/com/cruise/activity/repository/ExcursionReviewRepository.java b/cruise-activity-service/src/main/java/com/cruise/activity/repository/ExcursionReviewRepository.java index ce3fcd31..95d93863 100644 --- a/cruise-activity-service/src/main/java/com/cruise/activity/repository/ExcursionReviewRepository.java +++ b/cruise-activity-service/src/main/java/com/cruise/activity/repository/ExcursionReviewRepository.java @@ -16,10 +16,6 @@ @Repository public interface ExcursionReviewRepository extends JpaRepository { - @Override - @Transactional(propagation = Propagation.REQUIRES_NEW) - S save(S entity); - Optional findByExcursionIdAndPassengerId(Long excursionId, Long passengerId); boolean existsByExcursionIdAndPassengerId(Long excursionId, Long passengerId); diff --git a/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewService.java b/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewService.java index 1e90d5d3..7e8b8e1c 100644 --- a/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewService.java +++ b/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewService.java @@ -36,6 +36,7 @@ public class ExcursionReviewService { ); private final ExcursionReviewRepository reviewRepository; + private final ExcursionReviewWriter reviewWriter; private final ShoreExcursionRepository excursionRepository; private final ExcursionPassengerRepository passengerRepository; @@ -84,7 +85,7 @@ public ExcursionReviewResponse submitReview(Long excursionId, ExcursionReviewReq .build(); try { - ExcursionReview saved = reviewRepository.save(review); + ExcursionReview saved = reviewWriter.saveReview(review); log.info("Excursion review submitted: excursionId={}, passengerId={}, overallRating={}, flagged={}", excursionId, request.passengerId(), request.ratingOverall(), isNegativeOrSafetyConcern); return mapToResponse(saved); diff --git a/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewWriter.java b/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewWriter.java new file mode 100644 index 00000000..69babfbf --- /dev/null +++ b/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewWriter.java @@ -0,0 +1,25 @@ +package com.cruise.activity.service; + +import com.cruise.activity.entity.ExcursionReview; +import com.cruise.activity.repository.ExcursionReviewRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +/** + * Helper writer that persists a single excursion review in an isolated REQUIRES_NEW transaction. + * This ensures that any database constraint violation (duplicate transaction or idempotency key) + * is isolated and does not mark the caller batch's transaction as rollback-only. + */ +@Service +@RequiredArgsConstructor +public class ExcursionReviewWriter { + + private final ExcursionReviewRepository reviewRepository; + + @Transactional(propagation = Propagation.REQUIRES_NEW) + public ExcursionReview saveReview(ExcursionReview review) { + return reviewRepository.saveAndFlush(review); + } +} diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewAndAnalyticsTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewAndAnalyticsTest.java index c38e9a2c..86b79b27 100644 --- a/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewAndAnalyticsTest.java +++ b/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewAndAnalyticsTest.java @@ -51,6 +51,9 @@ class ExcursionReviewAndAnalyticsTest { @Mock private ExcursionReviewRepository reviewRepository; + @Mock + private ExcursionReviewWriter reviewWriter; + @Mock private ShoreExcursionRepository excursionRepository; @@ -139,14 +142,14 @@ void submitReview_WhenAttended_ShouldSucceed() { .build(); saved.setId(99L); - when(reviewRepository.save(any(ExcursionReview.class))).thenReturn(saved); + when(reviewWriter.saveReview(any(ExcursionReview.class))).thenReturn(saved); ExcursionReviewResponse response = reviewService.submitReview(1L, req, "IDEM-1"); assertThat(response).isNotNull(); assertThat(response.ratingOverall()).isEqualTo(5); assertThat(response.isFlagged()).isFalse(); - verify(reviewRepository, times(1)).save(any(ExcursionReview.class)); + verify(reviewWriter, times(1)).saveReview(any(ExcursionReview.class)); } @Test @@ -161,7 +164,7 @@ void submitReview_WhenNotAttended_ShouldThrowAccessDenied() { .isInstanceOf(AccessDeniedException.class) .hasMessageContaining("ATTENDED"); - verify(reviewRepository, never()).save(any()); + verify(reviewWriter, never()).saveReview(any()); } @Test @@ -182,7 +185,7 @@ void submitReview_WhenOneStarOrDangerous_ShouldFlagReview() { .build(); saved.setId(100L); - when(reviewRepository.save(any(ExcursionReview.class))).thenReturn(saved); + when(reviewWriter.saveReview(any(ExcursionReview.class))).thenReturn(saved); ExcursionReviewResponse response = reviewService.submitReview(1L, req, null); @@ -208,7 +211,7 @@ void submitReview_IdempotentKey_ReturnsExisting() { ExcursionReviewResponse response = reviewService.submitReview(1L, req, "KEY-123"); assertThat(response.id()).isEqualTo(50L); - verify(reviewRepository, never()).save(any()); + verify(reviewWriter, never()).saveReview(any()); } @Test @@ -237,7 +240,7 @@ void submitReview_DataIntegrityViolation_Fallback() { when(excursionRepository.findById(1L)).thenReturn(Optional.of(mockExcursion)); when(passengerRepository.findByExcursionIdAndActiveTrue(1L)).thenReturn(List.of(attendedPassenger)); when(reviewRepository.existsByExcursionIdAndPassengerId(1L, 201L)).thenReturn(false); - when(reviewRepository.save(any())).thenThrow(new DataIntegrityViolationException("duplicate key")); + when(reviewWriter.saveReview(any())).thenThrow(new DataIntegrityViolationException("duplicate key")); ExcursionReview existing = ExcursionReview.builder() .excursionId(1L) diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewWriterTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewWriterTest.java new file mode 100644 index 00000000..c3966fdb --- /dev/null +++ b/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewWriterTest.java @@ -0,0 +1,36 @@ +package com.cruise.activity.service; + +import com.cruise.activity.entity.ExcursionReview; +import com.cruise.activity.repository.ExcursionReviewRepository; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class ExcursionReviewWriterTest { + + @Mock + private ExcursionReviewRepository reviewRepository; + + @InjectMocks + private ExcursionReviewWriter excursionReviewWriter; + + @Test + void saveReview_ShouldCallSaveAndFlush() { + ExcursionReview review = new ExcursionReview(); + review.setId(1L); + + when(reviewRepository.saveAndFlush(review)).thenReturn(review); + + ExcursionReview savedReview = excursionReviewWriter.saveReview(review); + + assertThat(savedReview).isEqualTo(review); + verify(reviewRepository).saveAndFlush(review); + } +}