diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 223be11d..386450bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: uses: actions/setup-java@v6 with: distribution: 'temurin' - java-version: '25' + java-version: '21' cache: 'maven' - name: Cache SonarCloud Packages @@ -47,7 +47,7 @@ jobs: CI: true - name: SonarCloud Code Analysis & Quality Gate Check - if: env.SONAR_TOKEN != '' + if: ${{ env.SONAR_TOKEN != '' }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: > 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..b187f8b4 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 @@ -38,6 +38,7 @@ public class ExcursionReviewService { private final ExcursionReviewRepository reviewRepository; private final ShoreExcursionRepository excursionRepository; private final ExcursionPassengerRepository passengerRepository; + private final ExcursionReviewWriter reviewWriter; @Transactional public ExcursionReviewResponse submitReview(Long excursionId, ExcursionReviewRequest request, String idempotencyKey) { @@ -84,7 +85,7 @@ public ExcursionReviewResponse submitReview(Long excursionId, ExcursionReviewReq .build(); try { - ExcursionReview saved = reviewRepository.save(review); + ExcursionReview saved = reviewWriter.writeItem(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..8408a513 --- /dev/null +++ b/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewWriter.java @@ -0,0 +1,26 @@ +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 ExcursionReview + * 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 writeItem(ExcursionReview review) { + return reviewRepository.save(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..02aaaa26 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 @@ -63,6 +63,9 @@ class ExcursionReviewAndAnalyticsTest { @Mock private ExcursionGuideRepository guideRepository; + @Mock + private ExcursionReviewWriter reviewWriter; + @InjectMocks private ExcursionReviewService reviewService; @@ -77,6 +80,7 @@ class ExcursionReviewAndAnalyticsTest { void setUp() { fleetAggregator = new FleetOccupancyAggregator(excursionRepository, vehicleRepository); opsAnalyticsService = new ExcursionOpsAnalyticsService(excursionRepository, reviewRepository, guideRepository); + reviewService = new ExcursionReviewService(reviewRepository, excursionRepository, passengerRepository, reviewWriter); mockExcursion = ShoreExcursion.builder() .tourId(10L) @@ -139,14 +143,14 @@ void submitReview_WhenAttended_ShouldSucceed() { .build(); saved.setId(99L); - when(reviewRepository.save(any(ExcursionReview.class))).thenReturn(saved); + when(reviewWriter.writeItem(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)).writeItem(any(ExcursionReview.class)); } @Test @@ -182,7 +186,7 @@ void submitReview_WhenOneStarOrDangerous_ShouldFlagReview() { .build(); saved.setId(100L); - when(reviewRepository.save(any(ExcursionReview.class))).thenReturn(saved); + when(reviewWriter.writeItem(any(ExcursionReview.class))).thenReturn(saved); ExcursionReviewResponse response = reviewService.submitReview(1L, req, null); @@ -237,7 +241,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.writeItem(any())).thenThrow(new DataIntegrityViolationException("duplicate key")); ExcursionReview existing = ExcursionReview.builder() .excursionId(1L)