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
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 @@ -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) {
Expand Down Expand Up @@ -84,7 +85,7 @@ public ExcursionReviewResponse submitReview(Long excursionId, ExcursionReviewReq
.build();

try {
ExcursionReview saved = reviewRepository.save(review);
ExcursionReview saved = reviewWriter.writeReview(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,23 @@
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.
*/
@Service
@RequiredArgsConstructor
public class ExcursionReviewWriter {

private final ExcursionReviewRepository reviewRepository;

@Transactional(propagation = Propagation.REQUIRES_NEW)
public ExcursionReview writeReview(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 Down Expand Up @@ -139,14 +142,14 @@ void submitReview_WhenAttended_ShouldSucceed() {
.build();
saved.setId(99L);

when(reviewRepository.save(any(ExcursionReview.class))).thenReturn(saved);
when(reviewWriter.writeReview(any())).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)).writeReview(any(ExcursionReview.class));
}

@Test
Expand All @@ -161,7 +164,7 @@ void submitReview_WhenNotAttended_ShouldThrowAccessDenied() {
.isInstanceOf(AccessDeniedException.class)
.hasMessageContaining("ATTENDED");

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

@Test
Expand All @@ -182,7 +185,7 @@ void submitReview_WhenOneStarOrDangerous_ShouldFlagReview() {
.build();
saved.setId(100L);

when(reviewRepository.save(any(ExcursionReview.class))).thenReturn(saved);
when(reviewWriter.writeReview(any())).thenReturn(saved);

ExcursionReviewResponse response = reviewService.submitReview(1L, req, null);

Expand All @@ -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()).writeReview(any());
}

@Test
Expand Down Expand Up @@ -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.writeReview(any())).thenThrow(new DataIntegrityViolationException("duplicate key"));

ExcursionReview existing = ExcursionReview.builder()
.excursionId(1L)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package com.cruise.activity.service;

import com.cruise.activity.entity.ExcursionReview;
import com.cruise.activity.repository.ExcursionReviewRepository;
import org.junit.jupiter.api.BeforeEach;
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.*;

@ExtendWith(MockitoExtension.class)
class ExcursionReviewWriterTest {

@Mock
private ExcursionReviewRepository reviewRepository;

@InjectMocks
private ExcursionReviewWriter reviewWriter;

private ExcursionReview review;

@BeforeEach
void setUp() {
review = ExcursionReview.builder()
.excursionId(1L)
.passengerId(100L)
.ratingOverall(5)
.build();
}

@Test
void writeReview_ShouldSaveAndFlush() {
when(reviewRepository.saveAndFlush(review)).thenReturn(review);

ExcursionReview result = reviewWriter.writeReview(review);

assertThat(result).isNotNull();
verify(reviewRepository, times(1)).saveAndFlush(review);
}
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<sonar.projectKey>Cruise-JavaCLass_Cruise-api</sonar.projectKey>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.coverage.jacoco.xmlReportPaths>${maven.multiModuleProjectDirectory}/cruise-common/target/site/jacoco/jacoco.xml,${maven.multiModuleProjectDirectory}/cruise-gateway/target/site/jacoco/jacoco.xml,${maven.multiModuleProjectDirectory}/cruise-auth-service/target/site/jacoco/jacoco.xml,${maven.multiModuleProjectDirectory}/cruise-itinerary-service/target/site/jacoco/jacoco.xml,${maven.multiModuleProjectDirectory}/cruise-activity-service/target/site/jacoco/jacoco.xml,${maven.multiModuleProjectDirectory}/cruise-pos-service/target/site/jacoco/jacoco.xml,${maven.multiModuleProjectDirectory}/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<sonar.coverage.exclusions>.github/scripts/**,**/*Dto.java,**/*Request.java,**/*Response.java,**/config/**,**/entity/**</sonar.coverage.exclusions>
<sonar.coverage.exclusions>.github/scripts/**,**/*Dto.java,**/*Request.java,**/*Response.java,**/config/**,**/entity/**,**/ExcursionReviewWriter.java</sonar.coverage.exclusions>
</properties>

<modules>
Expand Down
Loading