Skip to content
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
@Repository
public interface ExcursionReviewRepository extends JpaRepository<ExcursionReview, Long> {

@Override
@Transactional(propagation = Propagation.REQUIRES_NEW)
<S extends ExcursionReview> S save(S entity);

Optional<ExcursionReview> findByExcursionIdAndPassengerId(Long excursionId, Long passengerId);

boolean existsByExcursionIdAndPassengerId(Long excursionId, Long passengerId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class ExcursionReviewService {
);

private final ExcursionReviewRepository reviewRepository;
private final ExcursionReviewWriter reviewWriter;
private final ShoreExcursionRepository excursionRepository;
private final ExcursionPassengerRepository passengerRepository;

Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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 ExcursionReviewWriter {

private final ExcursionReviewRepository reviewRepository;

@Transactional(propagation = Propagation.REQUIRES_NEW)
public ExcursionReview saveReview(ExcursionReview review) {
return reviewRepository.saveAndFlush(review);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ class ExcursionReviewAndAnalyticsTest {
@Mock
private ExcursionReviewRepository reviewRepository;

@Mock
private ExcursionReviewWriter reviewWriter;

@Mock
private ShoreExcursionRepository excursionRepository;

Expand All @@ -76,6 +79,7 @@ class ExcursionReviewAndAnalyticsTest {
@BeforeEach
void setUp() {
fleetAggregator = new FleetOccupancyAggregator(excursionRepository, vehicleRepository);
reviewService = new ExcursionReviewService(reviewRepository, reviewWriter, excursionRepository, passengerRepository);
opsAnalyticsService = new ExcursionOpsAnalyticsService(excursionRepository, reviewRepository, guideRepository);

mockExcursion = ShoreExcursion.builder()
Expand Down Expand Up @@ -139,14 +143,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
Expand All @@ -161,7 +165,7 @@ void submitReview_WhenNotAttended_ShouldThrowAccessDenied() {
.isInstanceOf(AccessDeniedException.class)
.hasMessageContaining("ATTENDED");

verify(reviewRepository, never()).save(any());
verify(reviewWriter, never()).saveReview(any());
}

@Test
Expand All @@ -182,7 +186,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);

Expand All @@ -208,7 +212,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
Expand Down Expand Up @@ -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.saveReview(any())).thenThrow(new DataIntegrityViolationException("duplicate key"));

ExcursionReview existing = ExcursionReview.builder()
.excursionId(1L)
Expand Down
Loading