From aee69f158c38a6b29bf7a4e2698a4238dcdf2ff5 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2026 11:50:50 +0000 Subject: [PATCH 1/4] [KAN-382] fix: remove @Transactional(propagation = Propagation.REQUIRES_NEW) from ExcursionReviewRepository.save Refactored ExcursionReviewService to use a dedicated ExcursionReviewItemWriter component to isolate transactions for duplicate/constraint violation resilience without modifying the transaction semantics of the Spring Data JPA repository. Added tests to verify changes. Co-authored-by: huytran2005 <126896896+huytran2005@users.noreply.github.com> --- .../repository/ExcursionReviewRepository.java | 5 +-- .../service/ExcursionReviewItemWriter.java | 20 +++++++++++ .../service/ExcursionReviewService.java | 3 +- .../ExcursionReviewAndAnalyticsTest.java | 10 +++--- .../ExcursionReviewItemWriterTest.java | 34 +++++++++++++++++++ test_cleanup.sh | 3 ++ 6 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewItemWriter.java create mode 100644 cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewItemWriterTest.java create mode 100644 test_cleanup.sh 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..61f99365 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 @@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -16,9 +15,7 @@ @Repository public interface ExcursionReviewRepository extends JpaRepository { - @Override - @Transactional(propagation = Propagation.REQUIRES_NEW) - S save(S entity); + Optional findByExcursionIdAndPassengerId(Long excursionId, Long passengerId); diff --git a/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewItemWriter.java b/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewItemWriter.java new file mode 100644 index 00000000..34e01198 --- /dev/null +++ b/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewItemWriter.java @@ -0,0 +1,20 @@ +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; + +@Service +@RequiredArgsConstructor +public class ExcursionReviewItemWriter { + + 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/main/java/com/cruise/activity/service/ExcursionReviewService.java b/cruise-activity-service/src/main/java/com/cruise/activity/service/ExcursionReviewService.java index 1e90d5d3..10adf4a9 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 ExcursionReviewItemWriter 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.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/test/java/com/cruise/activity/service/ExcursionReviewAndAnalyticsTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewAndAnalyticsTest.java index c38e9a2c..bd215fb3 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 @@ -50,6 +50,8 @@ class ExcursionReviewAndAnalyticsTest { @Mock private ExcursionReviewRepository reviewRepository; + @Mock + private ExcursionReviewItemWriter reviewWriter; @Mock private ShoreExcursionRepository excursionRepository; @@ -139,14 +141,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 +184,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 +239,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) diff --git a/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewItemWriterTest.java b/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewItemWriterTest.java new file mode 100644 index 00000000..e4c37708 --- /dev/null +++ b/cruise-activity-service/src/test/java/com/cruise/activity/service/ExcursionReviewItemWriterTest.java @@ -0,0 +1,34 @@ +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 ExcursionReviewItemWriterTest { + + @Mock + private ExcursionReviewRepository reviewRepository; + + @InjectMocks + private ExcursionReviewItemWriter reviewWriter; + + @Test + void testWriteItem() { + ExcursionReview review = new ExcursionReview(); + when(reviewRepository.save(review)).thenReturn(review); + + ExcursionReview result = reviewWriter.writeItem(review); + + assertThat(result).isNotNull(); + verify(reviewRepository).save(review); + } +} diff --git a/test_cleanup.sh b/test_cleanup.sh new file mode 100644 index 00000000..e8e76e06 --- /dev/null +++ b/test_cleanup.sh @@ -0,0 +1,3 @@ +#!/bin/bash +sed -i '/ S save(S entity);/d' cruise-activity-service/src/main/java/com/cruise/activity/repository/ExcursionReviewRepository.java +sed -i '/@Override/d' cruise-activity-service/src/main/java/com/cruise/activity/repository/ExcursionReviewRepository.java From bf29cf6c1defbcd0b42e068c20644f86878e7b21 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2026 12:09:59 +0000 Subject: [PATCH 2/4] [KAN-382] fix: handle CI test failure in PosFolioSettlementControllerTest Removed `@Transactional(propagation = Propagation.REQUIRES_NEW)` from `ExcursionReviewRepository.save` in `cruise-activity-service` and moved isolation logic to a dedicated `ExcursionReviewItemWriter`. Additionally, specified `columnDefinition = "bytea"` for `fileData` (which is a byte array mapped as `@Lob`) on `ReportExportJob` in `cruise-pos-service` because H2 in PostgreSQL mode does not recognize "blob" appropriately and throws an unknown data type error when running tests that try to create `pos_report_export_jobs`. Co-authored-by: huytran2005 <126896896+huytran2005@users.noreply.github.com> --- .../src/main/java/com/cruise/pos/entity/ReportExportJob.java | 2 +- test_cleanup.sh | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 test_cleanup.sh diff --git a/cruise-pos-service/src/main/java/com/cruise/pos/entity/ReportExportJob.java b/cruise-pos-service/src/main/java/com/cruise/pos/entity/ReportExportJob.java index 5ab2a14c..142b5ab8 100644 --- a/cruise-pos-service/src/main/java/com/cruise/pos/entity/ReportExportJob.java +++ b/cruise-pos-service/src/main/java/com/cruise/pos/entity/ReportExportJob.java @@ -44,7 +44,7 @@ public class ReportExportJob extends BaseEntity { @com.fasterxml.jackson.annotation.JsonIgnore @Lob @Basic(fetch = FetchType.LAZY) - @Column(name = "file_data") + @Column(name = "file_data", columnDefinition = "bytea") private byte[] fileData; @Column(name = "error_message", length = 500) diff --git a/test_cleanup.sh b/test_cleanup.sh deleted file mode 100644 index e8e76e06..00000000 --- a/test_cleanup.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -sed -i '/ S save(S entity);/d' cruise-activity-service/src/main/java/com/cruise/activity/repository/ExcursionReviewRepository.java -sed -i '/@Override/d' cruise-activity-service/src/main/java/com/cruise/activity/repository/ExcursionReviewRepository.java From e8f125b9c6afc1ea07255089135dcd9bf6db3053 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2026 12:23:32 +0000 Subject: [PATCH 3/4] [KAN-382] fix: set java version to 21 in ci.yml Fixed CI by setting Java version from '25' to '21' as Java 21 LTS is used. Also removed `@Transactional(propagation = Propagation.REQUIRES_NEW)` from `ExcursionReviewRepository.save` in `cruise-activity-service` and moved isolation logic to a dedicated `ExcursionReviewItemWriter`. Additionally, specified `columnDefinition = "bytea"` for `fileData` (which is a byte array mapped as `@Lob`) on `ReportExportJob` in `cruise-pos-service` because H2 in PostgreSQL mode does not recognize "blob" appropriately and throws an unknown data type error when running tests that try to create `pos_report_export_jobs`. Co-authored-by: huytran2005 <126896896+huytran2005@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 223be11d..e1629211 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 From fded9485f7a59d72527792d5b5e4eb75fdd2bbc6 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2026 12:57:33 +0000 Subject: [PATCH 4/4] [KAN-382] fix: set java version to 21 in ci.yml and downgrade sonar plugin Fixed CI by setting Java version from '25' to '21' as Java 21 LTS is used. Downgraded `sonar-maven-plugin` to `4.0.0.4121` because version `5.8.0.7211` has a known issue where it attempts to query JRE metadata from SonarCloud (`https://api.sonarcloud.io/analysis/jres?os=linux&arch=x86_64`) and receives a 403 Forbidden error, causing the CI pipeline to fail during the SonarCloud analysis phase. Also removed `@Transactional(propagation = Propagation.REQUIRES_NEW)` from `ExcursionReviewRepository.save` in `cruise-activity-service` and moved isolation logic to a dedicated `ExcursionReviewItemWriter`. Additionally, specified `columnDefinition = "bytea"` for `fileData` (which is a byte array mapped as `@Lob`) on `ReportExportJob` in `cruise-pos-service` because H2 in PostgreSQL mode does not recognize "blob" appropriately and throws an unknown data type error when running tests that try to create `pos_report_export_jobs`. Co-authored-by: huytran2005 <126896896+huytran2005@users.noreply.github.com> --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e95e0f37..85ca2bc2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 21 full 0.8.16 - 5.8.0.7211 + 4.0.0.4121 3.0.8 @@ -99,7 +99,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin - ${sonar.version} + 4.0.0.4121