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 @@ -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;
Expand All @@ -16,9 +15,7 @@
@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);

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 ExcursionReviewItemWriter {

private final ExcursionReviewRepository reviewRepository;

@Transactional(propagation = Propagation.REQUIRES_NEW)
public ExcursionReview writeItem(ExcursionReview review) {
return reviewRepository.save(review);
}
}
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 ExcursionReviewItemWriter 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.writeItem(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
Expand Up @@ -50,6 +50,8 @@ class ExcursionReviewAndAnalyticsTest {

@Mock
private ExcursionReviewRepository reviewRepository;
@Mock
private ExcursionReviewItemWriter reviewWriter;

@Mock
private ShoreExcursionRepository excursionRepository;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<java.version>21</java.version>
<maven.compiler.proc>full</maven.compiler.proc>
<jacoco.version>0.8.16</jacoco.version>
<sonar.version>5.8.0.7211</sonar.version>
<sonar.version>4.0.0.4121</sonar.version>
<pdfbox.version>3.0.8</pdfbox.version>

<!-- SonarCloud Quality Gate Configuration -->
Expand Down Expand Up @@ -99,7 +99,7 @@
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>${sonar.version}</version>
<version>4.0.0.4121</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
Loading