From a8805ba48cf560a0cead7857c8118c671125edfc Mon Sep 17 00:00:00 2001 From: huytran2005 Date: Sun, 15 Nov 2026 16:20:04 +0700 Subject: [PATCH 1/2] [KAN-699] fix(itinerary/db): seed default ships, ports, tour #1 and map area policy root endpoint Seed default cruise ships, ports, tour #1, daily schedules, stops, deck zones, and cancellation policies for unseeded environments. Map GET /api/admin/cruise-area-policy root endpoint to resolve 500 and 404 errors during Postman integration tests. Refs: KAN-699 --- .../itinerary/config/ItineraryDataSeeder.java | 287 ++++++++++++++++++ .../CruiseAreaPolicyController.java | 7 + .../src/main/resources/application.yml | 63 ++-- .../main/resources/db/seed-itinerary-data.sql | 148 +++++++++ .../config/ItineraryDataSeederTest.java | 109 +++++++ .../CruiseAreaPolicyControllerTest.java | 21 ++ .../src/test/resources/application.yml | 37 ++- 7 files changed, 627 insertions(+), 45 deletions(-) create mode 100644 cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/ItineraryDataSeeder.java create mode 100644 cruise-itinerary-service/src/main/resources/db/seed-itinerary-data.sql create mode 100644 cruise-itinerary-service/src/test/java/com/cruise/itinerary/config/ItineraryDataSeederTest.java diff --git a/cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/ItineraryDataSeeder.java b/cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/ItineraryDataSeeder.java new file mode 100644 index 00000000..f5dbcd8a --- /dev/null +++ b/cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/ItineraryDataSeeder.java @@ -0,0 +1,287 @@ +package com.cruise.itinerary.config; + +import com.cruise.itinerary.entity.*; +import com.cruise.itinerary.enums.ShipStatus; +import com.cruise.itinerary.enums.TourStatus; +import com.cruise.itinerary.repository.*; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalTime; + +/** + * Data seeder for cruise-itinerary-service. + * Pre-populates default ships, ports, tour #1, daily schedules, stops, deck zones, + * and system policies for development, test, and containerized environments. + */ +@Component +@Profile("!prod") +@ConditionalOnProperty(name = "app.seeder.enabled", havingValue = "true", matchIfMissing = true) +@RequiredArgsConstructor +@Slf4j +public class ItineraryDataSeeder implements ApplicationRunner { + + private final CruiseShipRepository shipRepository; + private final PortRepository portRepository; + private final CruiseTourRepository tourRepository; + private final DailyItineraryRepository dailyItineraryRepository; + private final CruiseStopRepository stopRepository; + private final ShipDeckZoneRepository deckZoneRepository; + private final SystemCancellationPolicyRepository cancellationPolicyRepository; + + @Override + @Transactional + public void run(ApplicationArguments args) { + log.info("Checking itinerary seed data..."); + CruiseShip ship1 = seedShips(); + Port[] ports = seedPorts(); + Port port1 = ports[0]; + Port port2 = ports[1]; + + seedTours(ship1, port1, port2); + seedDeckZones(ship1); + seedCancellationPolicies(); + log.info("Itinerary seed check completed."); + } + + private CruiseShip seedShips() { + return shipRepository.findByCode("SHIP-001").orElseGet(() -> { + log.info("Seeding default cruise ship SHIP-001..."); + CruiseShip ship = CruiseShip.builder() + .name("Grand Pearl Voyager") + .code("SHIP-001") + .operator("Paradise Cruises") + .capacity(2500) + .crewCapacity(800) + .totalCabins(1200) + .totalDecks(14) + .manufacturingYear(2022) + .lengthMeters(315.5) + .beamMeters(38.0) + .draftMeters(8.5) + .status(ShipStatus.ACTIVE) + .description("Flagship luxury cruise liner operating coastal Vietnam routes.") + .amenities("Spa, Infinity Pool, Casino, Theater, Fitness Center, 5 Restaurants") + .imageUrl("https://images.unsplash.com/photo-1548574505-5e239809ee19") + .active(true) + .build(); + return shipRepository.save(ship); + }); + } + + private Port[] seedPorts() { + Port halongPort = portRepository.findByCodeIgnoreCase("VNHLG").orElseGet(() -> { + log.info("Seeding default port VNHLG..."); + return portRepository.save(Port.builder() + .name("Cảng Quốc Tế Hạ Long") + .code("VNHLG") + .country("Việt Nam") + .city("Quảng Ninh") + .timezone("Asia/Ho_Chi_Minh") + .latitude(new BigDecimal("20.9500000")) + .longitude(new BigDecimal("107.0300000")) + .description("Cảng tàu khách quốc tế chuyên dụng tại Vịnh Hạ Long") + .active(true) + .build()); + }); + + Port danangPort = portRepository.findByCodeIgnoreCase("VNDAD").orElseGet(() -> { + log.info("Seeding default port VNDAD..."); + return portRepository.save(Port.builder() + .name("Cảng Tiên Sa Đà Nẵng") + .code("VNDAD") + .country("Việt Nam") + .city("Đà Nẵng") + .timezone("Asia/Ho_Chi_Minh") + .latitude(new BigDecimal("16.1200000")) + .longitude(new BigDecimal("108.2200000")) + .description("Cảng biển nước sâu phục vụ tàu du lịch tại Đà Nẵng") + .active(true) + .build()); + }); + + return new Port[]{halongPort, danangPort}; + } + + private void seedTours(CruiseShip ship, Port port1, Port port2) { + if (tourRepository.count() == 0) { + log.info("Seeding Tour #1 and its schedule..."); + LocalDate startDate = LocalDate.now().plusDays(7); + LocalDate endDate = startDate.plusDays(3); + + CruiseTour tour1 = CruiseTour.builder() + .name("Hải Trình Kỳ Quan Hạ Long - Đà Nẵng") + .code("TOUR-001") + .description("Hải trình 3 ngày 2 đêm khám phá kỳ quan thiên nhiên miền Trung.") + .ship(ship) + .durationDays(3) + .durationNights(2) + .departurePort(port1 != null ? port1.getName() : "Cảng Quốc Tế Hạ Long") + .destinationPort(port2 != null ? port2.getName() : "Cảng Tiên Sa Đà Nẵng") + .startDate(startDate) + .endDate(endDate) + .maxCapacity(2000) + .basePrice(new BigDecimal("12500000.00")) + .currency("VND") + .itineraryOverview("Hạ Long -> Vịnh Bắc Bộ -> Đà Nẵng") + .imageUrl("https://images.unsplash.com/photo-1507525428034-b723cf961d3e") + .status(TourStatus.PUBLISHED) + .active(true) + .build(); + + CruiseTour savedTour = tourRepository.save(tour1); + + // Seed Daily Itineraries + dailyItineraryRepository.save(DailyItinerary.builder() + .tour(savedTour) + .dayNumber(1) + .itineraryDate(startDate) + .title("Khởi hành từ Cảng Hạ Long") + .description("Làm thủ tục lên tàu, diễn tập cứu sinh SOLAS và thưởng ngoạn Vịnh Hạ Long.") + .port(port1) + .portName(port1 != null ? port1.getName() : "Cảng Quốc Tế Hạ Long") + .arrivalTime(LocalTime.of(8, 0)) + .departureTime(LocalTime.of(12, 0)) + .allAboardTime(LocalTime.of(11, 30)) + .isSeaDay(false) + .weatherForecast("Nắng nhẹ, gió cấp 2-3, sóng êm") + .active(true) + .build()); + + dailyItineraryRepository.save(DailyItinerary.builder() + .tour(savedTour) + .dayNumber(2) + .itineraryDate(startDate.plusDays(1)) + .title("Hải trình trên Biển Đông") + .description("Ngày trên biển với các hoạt động giải trí, dạ tiệc thuyền trưởng và spa thư giãn.") + .isSeaDay(true) + .weatherForecast("Trời quang, tầm nhìn xa trên 10km") + .active(true) + .build()); + + dailyItineraryRepository.save(DailyItinerary.builder() + .tour(savedTour) + .dayNumber(3) + .itineraryDate(startDate.plusDays(2)) + .title("Cập cảng Tiên Sa Đà Nẵng") + .description("Cập cảng, tham quan danh thắng Ngũ Hành Sơn và kết thúc hải trình.") + .port(port2) + .portName(port2 != null ? port2.getName() : "Cảng Tiên Sa Đà Nẵng") + .arrivalTime(LocalTime.of(7, 30)) + .departureTime(LocalTime.of(16, 0)) + .allAboardTime(LocalTime.of(15, 30)) + .isSeaDay(false) + .weatherForecast("Nắng đẹp, nhiệt độ 28C") + .active(true) + .build()); + + // Seed Stops + if (port1 != null) { + stopRepository.save(CruiseStop.builder() + .tour(savedTour) + .port(port1) + .stopOrder(1) + .arrivalTime(startDate.atTime(8, 0)) + .departureTime(startDate.atTime(12, 0)) + .allAboardTime(startDate.atTime(11, 30)) + .description("Điểm khởi hành hành trình tại Hạ Long") + .active(true) + .build()); + } + + if (port2 != null) { + stopRepository.save(CruiseStop.builder() + .tour(savedTour) + .port(port2) + .stopOrder(2) + .arrivalTime(startDate.plusDays(2).atTime(7, 30)) + .departureTime(startDate.plusDays(2).atTime(16, 0)) + .allAboardTime(startDate.plusDays(2).atTime(15, 30)) + .description("Điểm kết thúc hành trình tại Đà Nẵng") + .active(true) + .build()); + } + } + } + + private void seedDeckZones(CruiseShip ship) { + if (ship != null && deckZoneRepository.findByShipIdOrderByDeckNumberAsc(ship.getId()).isEmpty()) { + log.info("Seeding deck zones for ship ID {}...", ship.getId()); + deckZoneRepository.save(ShipDeckZone.builder() + .shipId(ship.getId()) + .deckNumber(5) + .zoneName("Starlight Theater") + .zoneCode("DECK5-THEATER") + .maxSafetyCapacity(800) + .zoneType("THEATER") + .hasLifeboatAccess(false) + .isRestricted(false) + .build()); + + deckZoneRepository.save(ShipDeckZone.builder() + .shipId(ship.getId()) + .deckNumber(7) + .zoneName("Main Pool Deck") + .zoneCode("DECK7-POOL") + .maxSafetyCapacity(450) + .zoneType("POOL_DECK") + .hasLifeboatAccess(true) + .isRestricted(false) + .build()); + + deckZoneRepository.save(ShipDeckZone.builder() + .shipId(ship.getId()) + .deckNumber(9) + .zoneName("Bridge Navigation Deck") + .zoneCode("DECK9-BRIDGE") + .maxSafetyCapacity(30) + .zoneType("RESTRICTED_BRIDGE") + .hasLifeboatAccess(true) + .isRestricted(true) + .build()); + } + } + + private void seedCancellationPolicies() { + if (cancellationPolicyRepository.count() == 0) { + log.info("Seeding system cancellation policies..."); + cancellationPolicyRepository.save(SystemCancellationPolicy.builder() + .policyName("Chính Sách Hủy Excursion Chuẩn 24H") + .serviceType("EXCURSION") + .hoursBeforeCutoff(24) + .refundPercentage(100) + .cancellationFee(BigDecimal.ZERO) + .isActive(true) + .description("Hoàn tiền 100% nếu hủy trước 24 giờ") + .build()); + + cancellationPolicyRepository.save(SystemCancellationPolicy.builder() + .policyName("Chính Sách Hủy Tour Dài Ngày 72H") + .serviceType("TOUR") + .hoursBeforeCutoff(72) + .refundPercentage(80) + .cancellationFee(new BigDecimal("200000.00")) + .isActive(true) + .description("Hoàn 80% giá trị tour nếu hủy trước 72 giờ") + .build()); + + cancellationPolicyRepository.save(SystemCancellationPolicy.builder() + .policyName("Chính Sách Hoạt Động Onboard 6H") + .serviceType("ONBOARD_ACTIVITY") + .hoursBeforeCutoff(6) + .refundPercentage(100) + .cancellationFee(BigDecimal.ZERO) + .isActive(true) + .description("Hủy miễn phí trước 6 giờ hoạt động") + .build()); + } + } +} diff --git a/cruise-itinerary-service/src/main/java/com/cruise/itinerary/controller/CruiseAreaPolicyController.java b/cruise-itinerary-service/src/main/java/com/cruise/itinerary/controller/CruiseAreaPolicyController.java index 748d236c..dfe5bd7d 100644 --- a/cruise-itinerary-service/src/main/java/com/cruise/itinerary/controller/CruiseAreaPolicyController.java +++ b/cruise-itinerary-service/src/main/java/com/cruise/itinerary/controller/CruiseAreaPolicyController.java @@ -18,6 +18,13 @@ public class CruiseAreaPolicyController { private final CruiseAreaPolicyService areaPolicyService; + @GetMapping + public ApiResponse> getMaritimePolicies( + @RequestParam(required = false) String serviceType + ) { + return ApiResponse.ok("Lấy danh sách chính sách hàng hải thành công", areaPolicyService.getCancellationPolicies(serviceType)); + } + @GetMapping("/ships/{shipId}/deck-zones") public ApiResponse> getDeckZones(@PathVariable Long shipId) { return ApiResponse.ok("Lấy danh sách khu vực boong tàu thành công", areaPolicyService.getDeckZonesByShip(shipId)); diff --git a/cruise-itinerary-service/src/main/resources/application.yml b/cruise-itinerary-service/src/main/resources/application.yml index f67fe9d9..c19a013d 100644 --- a/cruise-itinerary-service/src/main/resources/application.yml +++ b/cruise-itinerary-service/src/main/resources/application.yml @@ -1,29 +1,34 @@ -server: - port: 8082 - -spring: - application: - name: cruise-itinerary-service - profiles: - active: ${SPRING_PROFILES_ACTIVE:postgres} - datasource: - url: ${DB_URL:jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:cruise_db}} - username: ${DB_USERNAME:cruise_admin} - password: ${DB_PASSWORD:cruise_password} - driver-class-name: org.postgresql.Driver - hikari: - pool-name: ItineraryHikariPool - minimum-idle: 2 - maximum-pool-size: 10 - idle-timeout: 300000 - max-lifetime: 1800000 - connection-timeout: 20000 - jpa: - database-platform: org.hibernate.dialect.PostgreSQLDialect - hibernate: - ddl-auto: update - show-sql: true - properties: - hibernate: - format_sql: true - open-in-view: false +server: + port: 8082 + +spring: + application: + name: cruise-itinerary-service + profiles: + active: ${SPRING_PROFILES_ACTIVE:postgres} + datasource: + url: ${DB_URL:jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:5432}/${DB_NAME:cruise_db}} + username: ${DB_USERNAME:cruise_admin} + password: ${DB_PASSWORD:cruise_password} + driver-class-name: org.postgresql.Driver + hikari: + pool-name: ItineraryHikariPool + minimum-idle: 2 + maximum-pool-size: 10 + idle-timeout: 300000 + max-lifetime: 1800000 + connection-timeout: 20000 + jpa: + database-platform: org.hibernate.dialect.PostgreSQLDialect + hibernate: + ddl-auto: update + show-sql: true + properties: + hibernate: + format_sql: true + open-in-view: false + +app: + seeder: + enabled: ${SEEDER_ENABLED:true} + diff --git a/cruise-itinerary-service/src/main/resources/db/seed-itinerary-data.sql b/cruise-itinerary-service/src/main/resources/db/seed-itinerary-data.sql new file mode 100644 index 00000000..ffd3d7d4 --- /dev/null +++ b/cruise-itinerary-service/src/main/resources/db/seed-itinerary-data.sql @@ -0,0 +1,148 @@ +-- ========================================================================= +-- Seed Data for Cruise Itinerary Service (KAN-699) +-- Purpose: Pre-populates default cruise ships, ports, tour #1, daily +-- itineraries, stops, deck zones, and maritime policies. +-- ========================================================================= + +-- 1. Cruise Ships +INSERT INTO cruise_ships ( + id, name, code, operator, capacity, crew_capacity, total_cabins, total_decks, + manufacturing_year, length_meters, beam_meters, draft_meters, status, + description, amenities, image_url, active, created_at, updated_at +) VALUES ( + 1, 'Grand Pearl Voyager', 'SHIP-001', 'Paradise Cruises', 2500, 800, 1200, 14, + 2022, 315.5, 38.0, 8.5, 'ACTIVE', + 'Flagship luxury cruise liner operating coastal Vietnam routes.', + 'Spa, Infinity Pool, Casino, Theater, Fitness Center, 5 Restaurants', + 'https://images.unsplash.com/photo-1548574505-5e239809ee19', true, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +-- 2. Ports of Call +INSERT INTO ports ( + id, name, code, country, city, timezone, latitude, longitude, + description, active, created_at, updated_at +) VALUES ( + 1, 'Cảng Quốc Tế Hạ Long', 'VNHLG', 'Việt Nam', 'Quảng Ninh', 'Asia/Ho_Chi_Minh', + 20.9500000, 107.0300000, 'Cảng tàu khách quốc tế chuyên dụng tại Vịnh Hạ Long', + true, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +INSERT INTO ports ( + id, name, code, country, city, timezone, latitude, longitude, + description, active, created_at, updated_at +) VALUES ( + 2, 'Cảng Tiên Sa Đà Nẵng', 'VNDAD', 'Việt Nam', 'Đà Nẵng', 'Asia/Ho_Chi_Minh', + 16.1200000, 108.2200000, 'Cảng biển nước sâu phục vụ tàu du lịch tại Đà Nẵng', + true, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +-- 3. Cruise Tour #1 +INSERT INTO cruise_tours ( + id, name, code, description, ship_id, duration_days, duration_nights, + departure_port, destination_port, start_date, end_date, max_capacity, + base_price, currency, itinerary_overview, image_url, status, active, + cancellation_reason, created_at, updated_at +) VALUES ( + 1, 'Hải Trình Kỳ Quan Hạ Long - Đà Nẵng', 'TOUR-001', + 'Hải trình 3 ngày 2 đêm khám phá kỳ quan thiên nhiên miền Trung.', + 1, 3, 2, 'Cảng Quốc Tế Hạ Long', 'Cảng Tiên Sa Đà Nẵng', + CURRENT_DATE + INTERVAL '7 day', CURRENT_DATE + INTERVAL '10 day', 2000, + 12500000.00, 'VND', 'Hạ Long -> Vịnh Bắc Bộ -> Đà Nẵng', + 'https://images.unsplash.com/photo-1507525428034-b723cf961d3e', 'PUBLISHED', true, + NULL, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +-- 4. Daily Itineraries for Tour #1 +INSERT INTO daily_itineraries ( + id, tour_id, day_number, itinerary_date, title, description, + port_id, port_name, arrival_time, departure_time, all_aboard_time, + is_sea_day, weather_forecast, is_affected, change_reason, change_type, + active, created_at, updated_at +) VALUES ( + 1, 1, 1, CURRENT_DATE + INTERVAL '7 day', 'Khởi hành từ Cảng Hạ Long', + 'Làm thủ tục lên tàu, diễn tập cứu sinh SOLAS và thưởng ngoạn Vịnh Hạ Long.', + 1, 'Cảng Quốc Tế Hạ Long', '08:00:00', '12:00:00', '11:30:00', + false, 'Nắng nhẹ, sóng êm', false, NULL, NULL, + true, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +INSERT INTO daily_itineraries ( + id, tour_id, day_number, itinerary_date, title, description, + port_id, port_name, arrival_time, departure_time, all_aboard_time, + is_sea_day, weather_forecast, is_affected, change_reason, change_type, + active, created_at, updated_at +) VALUES ( + 2, 1, 2, CURRENT_DATE + INTERVAL '8 day', 'Hải trình trên Biển Đông', + 'Ngày trên biển với các hoạt động giải trí, dạ tiệc thuyền trưởng và spa thư giãn.', + NULL, NULL, NULL, NULL, NULL, + true, 'Trời quang mây tạnh', false, NULL, NULL, + true, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +INSERT INTO daily_itineraries ( + id, tour_id, day_number, itinerary_date, title, description, + port_id, port_name, arrival_time, departure_time, all_aboard_time, + is_sea_day, weather_forecast, is_affected, change_reason, change_type, + active, created_at, updated_at +) VALUES ( + 3, 1, 3, CURRENT_DATE + INTERVAL '9 day', 'Cập cảng Tiên Sa Đà Nẵng', + 'Cập cảng, tham quan danh thắng Ngũ Hành Sơn và kết thúc hải trình.', + 2, 'Cảng Tiên Sa Đà Nẵng', '07:30:00', '16:00:00', '15:30:00', + false, 'Nắng đẹp 28C', false, NULL, NULL, + true, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +-- 5. Cruise Stops for Tour #1 +INSERT INTO cruise_stops ( + id, tour_id, port_id, stop_order, arrival_time, departure_time, + all_aboard_time, description, active, created_at, updated_at +) VALUES ( + 1, 1, 1, 1, + (CURRENT_DATE + INTERVAL '7 day') + TIME '08:00:00', + (CURRENT_DATE + INTERVAL '7 day') + TIME '12:00:00', + (CURRENT_DATE + INTERVAL '7 day') + TIME '11:30:00', + 'Điểm khởi hành hành trình tại Hạ Long', true, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +INSERT INTO cruise_stops ( + id, tour_id, port_id, stop_order, arrival_time, departure_time, + all_aboard_time, description, active, created_at, updated_at +) VALUES ( + 2, 1, 2, 2, + (CURRENT_DATE + INTERVAL '9 day') + TIME '07:30:00', + (CURRENT_DATE + INTERVAL '9 day') + TIME '16:00:00', + (CURRENT_DATE + INTERVAL '9 day') + TIME '15:30:00', + 'Điểm kết thúc hành trình tại Đà Nẵng', true, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +-- 6. Ship Deck Zones for Ship #1 +INSERT INTO ship_deck_zones ( + id, ship_id, deck_number, zone_name, zone_code, max_safety_capacity, + zone_type, has_lifeboat_access, is_restricted, created_at, updated_at +) VALUES ( + 1, 1, 5, 'Starlight Theater', 'DECK5-THEATER', 800, 'THEATER', false, false, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +INSERT INTO ship_deck_zones ( + id, ship_id, deck_number, zone_name, zone_code, max_safety_capacity, + zone_type, has_lifeboat_access, is_restricted, created_at, updated_at +) VALUES ( + 2, 1, 7, 'Main Pool Deck', 'DECK7-POOL', 450, 'POOL_DECK', true, false, NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +-- 7. System Cancellation Policies +INSERT INTO system_cancellation_policies ( + id, policy_name, service_type, hours_before_cutoff, refund_percentage, + cancellation_fee, is_active, description, created_at, updated_at +) VALUES ( + 1, 'Chính Sách Hủy Excursion Chuẩn 24H', 'EXCURSION', 24, 100, 0.00, true, + 'Hoàn tiền 100% nếu hủy trước 24 giờ', NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; + +INSERT INTO system_cancellation_policies ( + id, policy_name, service_type, hours_before_cutoff, refund_percentage, + cancellation_fee, is_active, description, created_at, updated_at +) VALUES ( + 2, 'Chính Sách Hủy Tour Dài Ngày 72H', 'TOUR', 72, 80, 200000.00, true, + 'Hoàn 80% giá trị tour nếu hủy trước 72 giờ', NOW(), NOW() +) ON CONFLICT (id) DO NOTHING; diff --git a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/config/ItineraryDataSeederTest.java b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/config/ItineraryDataSeederTest.java new file mode 100644 index 00000000..b84a4b92 --- /dev/null +++ b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/config/ItineraryDataSeederTest.java @@ -0,0 +1,109 @@ +package com.cruise.itinerary.config; + +import com.cruise.itinerary.entity.CruiseShip; +import com.cruise.itinerary.entity.CruiseTour; +import com.cruise.itinerary.entity.Port; +import com.cruise.itinerary.repository.*; +import org.junit.jupiter.api.DisplayName; +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 org.springframework.boot.DefaultApplicationArguments; + +import java.util.Collections; +import java.util.Optional; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +@DisplayName("ItineraryDataSeeder Unit Tests") +class ItineraryDataSeederTest { + + @Mock + private CruiseShipRepository shipRepository; + + @Mock + private PortRepository portRepository; + + @Mock + private CruiseTourRepository tourRepository; + + @Mock + private DailyItineraryRepository dailyItineraryRepository; + + @Mock + private CruiseStopRepository stopRepository; + + @Mock + private ShipDeckZoneRepository deckZoneRepository; + + @Mock + private SystemCancellationPolicyRepository cancellationPolicyRepository; + + @InjectMocks + private ItineraryDataSeeder dataSeeder; + + @Test + @DisplayName("run seeds initial data when repositories are empty") + void testRunSeedsWhenEmpty() { + when(shipRepository.findByCode("SHIP-001")).thenReturn(Optional.empty()); + CruiseShip mockShip = CruiseShip.builder().name("Grand Pearl Voyager").code("SHIP-001").build(); + mockShip.setId(1L); + when(shipRepository.save(any(CruiseShip.class))).thenReturn(mockShip); + + when(portRepository.findByCodeIgnoreCase("VNHLG")).thenReturn(Optional.empty()); + Port mockPort1 = Port.builder().name("Cảng Quốc Tế Hạ Long").code("VNHLG").build(); + mockPort1.setId(1L); + + when(portRepository.findByCodeIgnoreCase("VNDAD")).thenReturn(Optional.empty()); + Port mockPort2 = Port.builder().name("Cảng Tiên Sa Đà Nẵng").code("VNDAD").build(); + mockPort2.setId(2L); + + when(portRepository.save(any(Port.class))).thenReturn(mockPort1).thenReturn(mockPort2); + + when(tourRepository.count()).thenReturn(0L); + CruiseTour mockTour = CruiseTour.builder().name("Hải Trình Kỳ Quan Hạ Long - Đà Nẵng").code("TOUR-001").build(); + mockTour.setId(1L); + when(tourRepository.save(any(CruiseTour.class))).thenReturn(mockTour); + + when(deckZoneRepository.findByShipIdOrderByDeckNumberAsc(1L)).thenReturn(Collections.emptyList()); + when(cancellationPolicyRepository.count()).thenReturn(0L); + + dataSeeder.run(new DefaultApplicationArguments(new String[0])); + + verify(shipRepository, atLeastOnce()).save(any()); + verify(portRepository, atLeast(2)).save(any()); + verify(tourRepository, times(1)).save(any()); + verify(dailyItineraryRepository, times(3)).save(any()); + verify(stopRepository, times(2)).save(any()); + verify(deckZoneRepository, times(3)).save(any()); + verify(cancellationPolicyRepository, times(3)).save(any()); + } + + @Test + @DisplayName("run skips seeding when data already exists") + void testRunSkipsWhenPopulated() { + CruiseShip existingShip = CruiseShip.builder().name("Existing").code("SHIP-001").build(); + existingShip.setId(1L); + when(shipRepository.findByCode("SHIP-001")).thenReturn(Optional.of(existingShip)); + + Port existingPort = Port.builder().name("Existing Port").code("VNHLG").build(); + existingPort.setId(1L); + when(portRepository.findByCodeIgnoreCase("VNHLG")).thenReturn(Optional.of(existingPort)); + when(portRepository.findByCodeIgnoreCase("VNDAD")).thenReturn(Optional.of(existingPort)); + + when(tourRepository.count()).thenReturn(5L); + when(deckZoneRepository.findByShipIdOrderByDeckNumberAsc(1L)).thenReturn(Collections.singletonList(mock())); + when(cancellationPolicyRepository.count()).thenReturn(3L); + + dataSeeder.run(new DefaultApplicationArguments(new String[0])); + + verify(shipRepository, never()).save(any()); + verify(tourRepository, never()).save(any()); + verify(dailyItineraryRepository, never()).save(any()); + verify(stopRepository, never()).save(any()); + } +} diff --git a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/controller/CruiseAreaPolicyControllerTest.java b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/controller/CruiseAreaPolicyControllerTest.java index c2491caf..ebc9e98f 100644 --- a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/controller/CruiseAreaPolicyControllerTest.java +++ b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/controller/CruiseAreaPolicyControllerTest.java @@ -100,4 +100,25 @@ void testGetCancellationPolicies() throws Exception { .andExpect(jsonPath("$.data[0].policyName").value("Excursion Standard 24h")) .andExpect(jsonPath("$.data[0].refundPercentage").value(100)); } + + @Test + @DisplayName("GET /api/admin/cruise-area-policy returns general maritime policies") + void testGetMaritimePoliciesRoot() throws Exception { + SystemCancellationPolicyDto policy = SystemCancellationPolicyDto.builder() + .id(1L) + .policyName("Maritime Cabotage Policy") + .serviceType("MARITIME") + .hoursBeforeCutoff(48) + .refundPercentage(100) + .cancellationFee(BigDecimal.ZERO) + .isActive(true) + .build(); + + when(areaPolicyService.getCancellationPolicies(null)).thenReturn(List.of(policy)); + + mockMvc.perform(get("/api/admin/cruise-area-policy")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.success").value(true)) + .andExpect(jsonPath("$.data[0].policyName").value("Maritime Cabotage Policy")); + } } diff --git a/cruise-itinerary-service/src/test/resources/application.yml b/cruise-itinerary-service/src/test/resources/application.yml index 11017bf1..008db74b 100644 --- a/cruise-itinerary-service/src/test/resources/application.yml +++ b/cruise-itinerary-service/src/test/resources/application.yml @@ -1,16 +1,21 @@ -server: - port: 0 - -spring: - application: - name: cruise-itinerary-service-test - datasource: - url: jdbc:h2:mem:cruise_itinerary_test;DB_CLOSE_DELAY=-1;MODE=PostgreSQL - driver-class-name: org.h2.Driver - username: sa - password: "" - jpa: - database-platform: org.hibernate.dialect.H2Dialect - hibernate: - ddl-auto: create-drop - show-sql: false +server: + port: 0 + +spring: + application: + name: cruise-itinerary-service-test + datasource: + url: jdbc:h2:mem:cruise_itinerary_test;DB_CLOSE_DELAY=-1;MODE=PostgreSQL + driver-class-name: org.h2.Driver + username: sa + password: "" + jpa: + database-platform: org.hibernate.dialect.H2Dialect + hibernate: + ddl-auto: create-drop + show-sql: false + +app: + seeder: + enabled: false + From 0eaa022c928f5e2aaa79324e59a3af32d0d82d89 Mon Sep 17 00:00:00 2001 From: huytran2005 Date: Sun, 15 Nov 2026 16:32:50 +0700 Subject: [PATCH 2/2] [KAN-699] fix(itinerary/db): address CodeRabbit feedback on port matching by name, tour dates, and sql sequences - Match existing ports and ships by name fallback in ItineraryDataSeeder - Correct tour end date to startDate.plusDays(2) for 3-day/2-night tour - Advance identity sequences and resolve parent keys in SQL seed script - Derive daily itinerary dates and stop timestamps from stored tour start_date Refs: KAN-699 --- .../itinerary/config/ItineraryDataSeeder.java | 14 +- .../itinerary/repository/PortRepository.java | 76 ++++---- .../main/resources/db/seed-itinerary-data.sql | 182 ++++++++++++------ .../config/ItineraryDataSeederTest.java | 31 +++ 4 files changed, 200 insertions(+), 103 deletions(-) diff --git a/cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/ItineraryDataSeeder.java b/cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/ItineraryDataSeeder.java index f5dbcd8a..82ea112a 100644 --- a/cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/ItineraryDataSeeder.java +++ b/cruise-itinerary-service/src/main/java/com/cruise/itinerary/config/ItineraryDataSeeder.java @@ -53,7 +53,9 @@ public void run(ApplicationArguments args) { } private CruiseShip seedShips() { - return shipRepository.findByCode("SHIP-001").orElseGet(() -> { + return shipRepository.findByCode("SHIP-001") + .or(() -> shipRepository.findByName("Grand Pearl Voyager")) + .orElseGet(() -> { log.info("Seeding default cruise ship SHIP-001..."); CruiseShip ship = CruiseShip.builder() .name("Grand Pearl Voyager") @@ -78,7 +80,9 @@ private CruiseShip seedShips() { } private Port[] seedPorts() { - Port halongPort = portRepository.findByCodeIgnoreCase("VNHLG").orElseGet(() -> { + Port halongPort = portRepository.findByCodeIgnoreCase("VNHLG") + .or(() -> portRepository.findByNameIgnoreCase("Cảng Quốc Tế Hạ Long")) + .orElseGet(() -> { log.info("Seeding default port VNHLG..."); return portRepository.save(Port.builder() .name("Cảng Quốc Tế Hạ Long") @@ -93,7 +97,9 @@ private Port[] seedPorts() { .build()); }); - Port danangPort = portRepository.findByCodeIgnoreCase("VNDAD").orElseGet(() -> { + Port danangPort = portRepository.findByCodeIgnoreCase("VNDAD") + .or(() -> portRepository.findByNameIgnoreCase("Cảng Tiên Sa Đà Nẵng")) + .orElseGet(() -> { log.info("Seeding default port VNDAD..."); return portRepository.save(Port.builder() .name("Cảng Tiên Sa Đà Nẵng") @@ -115,7 +121,7 @@ private void seedTours(CruiseShip ship, Port port1, Port port2) { if (tourRepository.count() == 0) { log.info("Seeding Tour #1 and its schedule..."); LocalDate startDate = LocalDate.now().plusDays(7); - LocalDate endDate = startDate.plusDays(3); + LocalDate endDate = startDate.plusDays(2); CruiseTour tour1 = CruiseTour.builder() .name("Hải Trình Kỳ Quan Hạ Long - Đà Nẵng") diff --git a/cruise-itinerary-service/src/main/java/com/cruise/itinerary/repository/PortRepository.java b/cruise-itinerary-service/src/main/java/com/cruise/itinerary/repository/PortRepository.java index b78f5a6d..744879fe 100644 --- a/cruise-itinerary-service/src/main/java/com/cruise/itinerary/repository/PortRepository.java +++ b/cruise-itinerary-service/src/main/java/com/cruise/itinerary/repository/PortRepository.java @@ -1,37 +1,39 @@ -package com.cruise.itinerary.repository; - -import com.cruise.itinerary.entity.Port; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -@Repository -public interface PortRepository extends JpaRepository { - - boolean existsByCodeIgnoreCase(String code); - - boolean existsByNameIgnoreCase(String name); - - boolean existsByCodeIgnoreCaseAndIdNot(String code, Long id); - - boolean existsByNameIgnoreCaseAndIdNot(String name, Long id); - - Optional findByCodeIgnoreCase(String code); - - List findByActiveTrue(); - - @Query("SELECT p FROM Port p WHERE " + - "(:keyword IS NULL OR LOWER(p.name) LIKE LOWER(CONCAT('%', :keyword, '%')) " + - "OR LOWER(p.code) LIKE LOWER(CONCAT('%', :keyword, '%')) " + - "OR LOWER(p.city) LIKE LOWER(CONCAT('%', :keyword, '%'))) " + - "AND (:activeOnly IS NULL OR p.active = :activeOnly)") - Page searchPorts(@Param("keyword") String keyword, - @Param("activeOnly") Boolean activeOnly, - Pageable pageable); -} +package com.cruise.itinerary.repository; + +import com.cruise.itinerary.entity.Port; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +@Repository +public interface PortRepository extends JpaRepository { + + boolean existsByCodeIgnoreCase(String code); + + boolean existsByNameIgnoreCase(String name); + + boolean existsByCodeIgnoreCaseAndIdNot(String code, Long id); + + boolean existsByNameIgnoreCaseAndIdNot(String name, Long id); + + Optional findByCodeIgnoreCase(String code); + + Optional findByNameIgnoreCase(String name); + + List findByActiveTrue(); + + @Query("SELECT p FROM Port p WHERE " + + "(:keyword IS NULL OR LOWER(p.name) LIKE LOWER(CONCAT('%', :keyword, '%')) " + + "OR LOWER(p.code) LIKE LOWER(CONCAT('%', :keyword, '%')) " + + "OR LOWER(p.city) LIKE LOWER(CONCAT('%', :keyword, '%'))) " + + "AND (:activeOnly IS NULL OR p.active = :activeOnly)") + Page searchPorts(@Param("keyword") String keyword, + @Param("activeOnly") Boolean activeOnly, + Pageable pageable); +} diff --git a/cruise-itinerary-service/src/main/resources/db/seed-itinerary-data.sql b/cruise-itinerary-service/src/main/resources/db/seed-itinerary-data.sql index ffd3d7d4..305b7946 100644 --- a/cruise-itinerary-service/src/main/resources/db/seed-itinerary-data.sql +++ b/cruise-itinerary-service/src/main/resources/db/seed-itinerary-data.sql @@ -2,147 +2,205 @@ -- Seed Data for Cruise Itinerary Service (KAN-699) -- Purpose: Pre-populates default cruise ships, ports, tour #1, daily -- itineraries, stops, deck zones, and maritime policies. +-- Resolves parents by business codes and derives child dates from stored tour. -- ========================================================================= -- 1. Cruise Ships INSERT INTO cruise_ships ( - id, name, code, operator, capacity, crew_capacity, total_cabins, total_decks, + name, code, operator, capacity, crew_capacity, total_cabins, total_decks, manufacturing_year, length_meters, beam_meters, draft_meters, status, description, amenities, image_url, active, created_at, updated_at ) VALUES ( - 1, 'Grand Pearl Voyager', 'SHIP-001', 'Paradise Cruises', 2500, 800, 1200, 14, + 'Grand Pearl Voyager', 'SHIP-001', 'Paradise Cruises', 2500, 800, 1200, 14, 2022, 315.5, 38.0, 8.5, 'ACTIVE', 'Flagship luxury cruise liner operating coastal Vietnam routes.', 'Spa, Infinity Pool, Casino, Theater, Fitness Center, 5 Restaurants', 'https://images.unsplash.com/photo-1548574505-5e239809ee19', true, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +) ON CONFLICT (code) DO NOTHING; -- 2. Ports of Call INSERT INTO ports ( - id, name, code, country, city, timezone, latitude, longitude, + name, code, country, city, timezone, latitude, longitude, description, active, created_at, updated_at ) VALUES ( - 1, 'Cảng Quốc Tế Hạ Long', 'VNHLG', 'Việt Nam', 'Quảng Ninh', 'Asia/Ho_Chi_Minh', + 'Cảng Quốc Tế Hạ Long', 'VNHLG', 'Việt Nam', 'Quảng Ninh', 'Asia/Ho_Chi_Minh', 20.9500000, 107.0300000, 'Cảng tàu khách quốc tế chuyên dụng tại Vịnh Hạ Long', true, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +) ON CONFLICT (code) DO NOTHING; INSERT INTO ports ( - id, name, code, country, city, timezone, latitude, longitude, + name, code, country, city, timezone, latitude, longitude, description, active, created_at, updated_at ) VALUES ( - 2, 'Cảng Tiên Sa Đà Nẵng', 'VNDAD', 'Việt Nam', 'Đà Nẵng', 'Asia/Ho_Chi_Minh', + 'Cảng Tiên Sa Đà Nẵng', 'VNDAD', 'Việt Nam', 'Đà Nẵng', 'Asia/Ho_Chi_Minh', 16.1200000, 108.2200000, 'Cảng biển nước sâu phục vụ tàu du lịch tại Đà Nẵng', true, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +) ON CONFLICT (code) DO NOTHING; --- 3. Cruise Tour #1 +-- 3. Cruise Tour #1 (linked to SHIP-001) INSERT INTO cruise_tours ( - id, name, code, description, ship_id, duration_days, duration_nights, + name, code, description, ship_id, duration_days, duration_nights, departure_port, destination_port, start_date, end_date, max_capacity, base_price, currency, itinerary_overview, image_url, status, active, cancellation_reason, created_at, updated_at -) VALUES ( - 1, 'Hải Trình Kỳ Quan Hạ Long - Đà Nẵng', 'TOUR-001', +) +SELECT + 'Hải Trình Kỳ Quan Hạ Long - Đà Nẵng', 'TOUR-001', 'Hải trình 3 ngày 2 đêm khám phá kỳ quan thiên nhiên miền Trung.', - 1, 3, 2, 'Cảng Quốc Tế Hạ Long', 'Cảng Tiên Sa Đà Nẵng', - CURRENT_DATE + INTERVAL '7 day', CURRENT_DATE + INTERVAL '10 day', 2000, + s.id, 3, 2, 'Cảng Quốc Tế Hạ Long', 'Cảng Tiên Sa Đà Nẵng', + CURRENT_DATE + INTERVAL '7 day', CURRENT_DATE + INTERVAL '9 day', 2000, 12500000.00, 'VND', 'Hạ Long -> Vịnh Bắc Bộ -> Đà Nẵng', 'https://images.unsplash.com/photo-1507525428034-b723cf961d3e', 'PUBLISHED', true, NULL, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +FROM cruise_ships s +WHERE s.code = 'SHIP-001' +ON CONFLICT (code) DO NOTHING; --- 4. Daily Itineraries for Tour #1 +-- 4. Daily Itineraries for Tour #1 (derived from stored start_date) INSERT INTO daily_itineraries ( - id, tour_id, day_number, itinerary_date, title, description, + tour_id, day_number, itinerary_date, title, description, port_id, port_name, arrival_time, departure_time, all_aboard_time, is_sea_day, weather_forecast, is_affected, change_reason, change_type, active, created_at, updated_at -) VALUES ( - 1, 1, 1, CURRENT_DATE + INTERVAL '7 day', 'Khởi hành từ Cảng Hạ Long', +) +SELECT + t.id, 1, t.start_date, 'Khởi hành từ Cảng Hạ Long', 'Làm thủ tục lên tàu, diễn tập cứu sinh SOLAS và thưởng ngoạn Vịnh Hạ Long.', - 1, 'Cảng Quốc Tế Hạ Long', '08:00:00', '12:00:00', '11:30:00', + p.id, p.name, '08:00:00'::TIME, '12:00:00'::TIME, '11:30:00'::TIME, false, 'Nắng nhẹ, sóng êm', false, NULL, NULL, true, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +FROM cruise_tours t +CROSS JOIN ports p +WHERE t.code = 'TOUR-001' AND p.code = 'VNHLG' + AND NOT EXISTS ( + SELECT 1 FROM daily_itineraries di WHERE di.tour_id = t.id AND di.day_number = 1 + ); INSERT INTO daily_itineraries ( - id, tour_id, day_number, itinerary_date, title, description, + tour_id, day_number, itinerary_date, title, description, port_id, port_name, arrival_time, departure_time, all_aboard_time, is_sea_day, weather_forecast, is_affected, change_reason, change_type, active, created_at, updated_at -) VALUES ( - 2, 1, 2, CURRENT_DATE + INTERVAL '8 day', 'Hải trình trên Biển Đông', +) +SELECT + t.id, 2, t.start_date + INTERVAL '1 day', 'Hải trình trên Biển Đông', 'Ngày trên biển với các hoạt động giải trí, dạ tiệc thuyền trưởng và spa thư giãn.', NULL, NULL, NULL, NULL, NULL, true, 'Trời quang mây tạnh', false, NULL, NULL, true, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +FROM cruise_tours t +WHERE t.code = 'TOUR-001' + AND NOT EXISTS ( + SELECT 1 FROM daily_itineraries di WHERE di.tour_id = t.id AND di.day_number = 2 + ); INSERT INTO daily_itineraries ( - id, tour_id, day_number, itinerary_date, title, description, + tour_id, day_number, itinerary_date, title, description, port_id, port_name, arrival_time, departure_time, all_aboard_time, is_sea_day, weather_forecast, is_affected, change_reason, change_type, active, created_at, updated_at -) VALUES ( - 3, 1, 3, CURRENT_DATE + INTERVAL '9 day', 'Cập cảng Tiên Sa Đà Nẵng', +) +SELECT + t.id, 3, t.start_date + INTERVAL '2 day', 'Cập cảng Tiên Sa Đà Nẵng', 'Cập cảng, tham quan danh thắng Ngũ Hành Sơn và kết thúc hải trình.', - 2, 'Cảng Tiên Sa Đà Nẵng', '07:30:00', '16:00:00', '15:30:00', + p.id, p.name, '07:30:00'::TIME, '16:00:00'::TIME, '15:30:00'::TIME, false, 'Nắng đẹp 28C', false, NULL, NULL, true, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +FROM cruise_tours t +CROSS JOIN ports p +WHERE t.code = 'TOUR-001' AND p.code = 'VNDAD' + AND NOT EXISTS ( + SELECT 1 FROM daily_itineraries di WHERE di.tour_id = t.id AND di.day_number = 3 + ); --- 5. Cruise Stops for Tour #1 +-- 5. Cruise Stops for Tour #1 (derived from stored start_date) INSERT INTO cruise_stops ( - id, tour_id, port_id, stop_order, arrival_time, departure_time, + tour_id, port_id, stop_order, arrival_time, departure_time, all_aboard_time, description, active, created_at, updated_at -) VALUES ( - 1, 1, 1, 1, - (CURRENT_DATE + INTERVAL '7 day') + TIME '08:00:00', - (CURRENT_DATE + INTERVAL '7 day') + TIME '12:00:00', - (CURRENT_DATE + INTERVAL '7 day') + TIME '11:30:00', +) +SELECT + t.id, p.id, 1, + t.start_date + '08:00:00'::TIME, + t.start_date + '12:00:00'::TIME, + t.start_date + '11:30:00'::TIME, 'Điểm khởi hành hành trình tại Hạ Long', true, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +FROM cruise_tours t +CROSS JOIN ports p +WHERE t.code = 'TOUR-001' AND p.code = 'VNHLG' + AND NOT EXISTS ( + SELECT 1 FROM cruise_stops cs WHERE cs.tour_id = t.id AND cs.stop_order = 1 + ); INSERT INTO cruise_stops ( - id, tour_id, port_id, stop_order, arrival_time, departure_time, + tour_id, port_id, stop_order, arrival_time, departure_time, all_aboard_time, description, active, created_at, updated_at -) VALUES ( - 2, 1, 2, 2, - (CURRENT_DATE + INTERVAL '9 day') + TIME '07:30:00', - (CURRENT_DATE + INTERVAL '9 day') + TIME '16:00:00', - (CURRENT_DATE + INTERVAL '9 day') + TIME '15:30:00', +) +SELECT + t.id, p.id, 2, + (t.start_date + INTERVAL '2 day') + '07:30:00'::TIME, + (t.start_date + INTERVAL '2 day') + '16:00:00'::TIME, + (t.start_date + INTERVAL '2 day') + '15:30:00'::TIME, 'Điểm kết thúc hành trình tại Đà Nẵng', true, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +FROM cruise_tours t +CROSS JOIN ports p +WHERE t.code = 'TOUR-001' AND p.code = 'VNDAD' + AND NOT EXISTS ( + SELECT 1 FROM cruise_stops cs WHERE cs.tour_id = t.id AND cs.stop_order = 2 + ); -- 6. Ship Deck Zones for Ship #1 INSERT INTO ship_deck_zones ( - id, ship_id, deck_number, zone_name, zone_code, max_safety_capacity, + ship_id, deck_number, zone_name, zone_code, max_safety_capacity, zone_type, has_lifeboat_access, is_restricted, created_at, updated_at -) VALUES ( - 1, 1, 5, 'Starlight Theater', 'DECK5-THEATER', 800, 'THEATER', false, false, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +) +SELECT + s.id, 5, 'Starlight Theater', 'DECK5-THEATER', 800, 'THEATER', false, false, NOW(), NOW() +FROM cruise_ships s +WHERE s.code = 'SHIP-001' + AND NOT EXISTS ( + SELECT 1 FROM ship_deck_zones z WHERE z.ship_id = s.id AND z.zone_code = 'DECK5-THEATER' + ); INSERT INTO ship_deck_zones ( - id, ship_id, deck_number, zone_name, zone_code, max_safety_capacity, + ship_id, deck_number, zone_name, zone_code, max_safety_capacity, zone_type, has_lifeboat_access, is_restricted, created_at, updated_at -) VALUES ( - 2, 1, 7, 'Main Pool Deck', 'DECK7-POOL', 450, 'POOL_DECK', true, false, NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +) +SELECT + s.id, 7, 'Main Pool Deck', 'DECK7-POOL', 450, 'POOL_DECK', true, false, NOW(), NOW() +FROM cruise_ships s +WHERE s.code = 'SHIP-001' + AND NOT EXISTS ( + SELECT 1 FROM ship_deck_zones z WHERE z.ship_id = s.id AND z.zone_code = 'DECK7-POOL' + ); -- 7. System Cancellation Policies INSERT INTO system_cancellation_policies ( - id, policy_name, service_type, hours_before_cutoff, refund_percentage, + policy_name, service_type, hours_before_cutoff, refund_percentage, cancellation_fee, is_active, description, created_at, updated_at -) VALUES ( - 1, 'Chính Sách Hủy Excursion Chuẩn 24H', 'EXCURSION', 24, 100, 0.00, true, +) +SELECT + 'Chính Sách Hủy Excursion Chuẩn 24H', 'EXCURSION', 24, 100, 0.00, true, 'Hoàn tiền 100% nếu hủy trước 24 giờ', NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +WHERE NOT EXISTS ( + SELECT 1 FROM system_cancellation_policies WHERE policy_name = 'Chính Sách Hủy Excursion Chuẩn 24H' +); INSERT INTO system_cancellation_policies ( - id, policy_name, service_type, hours_before_cutoff, refund_percentage, + policy_name, service_type, hours_before_cutoff, refund_percentage, cancellation_fee, is_active, description, created_at, updated_at -) VALUES ( - 2, 'Chính Sách Hủy Tour Dài Ngày 72H', 'TOUR', 72, 80, 200000.00, true, +) +SELECT + 'Chính Sách Hủy Tour Dài Ngày 72H', 'TOUR', 72, 80, 200000.00, true, 'Hoàn 80% giá trị tour nếu hủy trước 72 giờ', NOW(), NOW() -) ON CONFLICT (id) DO NOTHING; +WHERE NOT EXISTS ( + SELECT 1 FROM system_cancellation_policies WHERE policy_name = 'Chính Sách Hủy Tour Dài Ngày 72H' +); + +-- 8. Advance Identity Sequences +SELECT setval(pg_get_serial_sequence('cruise_ships', 'id'), COALESCE((SELECT MAX(id) FROM cruise_ships), 1)); +SELECT setval(pg_get_serial_sequence('ports', 'id'), COALESCE((SELECT MAX(id) FROM ports), 1)); +SELECT setval(pg_get_serial_sequence('cruise_tours', 'id'), COALESCE((SELECT MAX(id) FROM cruise_tours), 1)); +SELECT setval(pg_get_serial_sequence('daily_itineraries', 'id'), COALESCE((SELECT MAX(id) FROM daily_itineraries), 1)); +SELECT setval(pg_get_serial_sequence('cruise_stops', 'id'), COALESCE((SELECT MAX(id) FROM cruise_stops), 1)); +SELECT setval(pg_get_serial_sequence('ship_deck_zones', 'id'), COALESCE((SELECT MAX(id) FROM ship_deck_zones), 1)); +SELECT setval(pg_get_serial_sequence('system_cancellation_policies', 'id'), COALESCE((SELECT MAX(id) FROM system_cancellation_policies), 1)); diff --git a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/config/ItineraryDataSeederTest.java b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/config/ItineraryDataSeederTest.java index b84a4b92..2055ee16 100644 --- a/cruise-itinerary-service/src/test/java/com/cruise/itinerary/config/ItineraryDataSeederTest.java +++ b/cruise-itinerary-service/src/test/java/com/cruise/itinerary/config/ItineraryDataSeederTest.java @@ -50,15 +50,18 @@ class ItineraryDataSeederTest { @DisplayName("run seeds initial data when repositories are empty") void testRunSeedsWhenEmpty() { when(shipRepository.findByCode("SHIP-001")).thenReturn(Optional.empty()); + when(shipRepository.findByName("Grand Pearl Voyager")).thenReturn(Optional.empty()); CruiseShip mockShip = CruiseShip.builder().name("Grand Pearl Voyager").code("SHIP-001").build(); mockShip.setId(1L); when(shipRepository.save(any(CruiseShip.class))).thenReturn(mockShip); when(portRepository.findByCodeIgnoreCase("VNHLG")).thenReturn(Optional.empty()); + when(portRepository.findByNameIgnoreCase("Cảng Quốc Tế Hạ Long")).thenReturn(Optional.empty()); Port mockPort1 = Port.builder().name("Cảng Quốc Tế Hạ Long").code("VNHLG").build(); mockPort1.setId(1L); when(portRepository.findByCodeIgnoreCase("VNDAD")).thenReturn(Optional.empty()); + when(portRepository.findByNameIgnoreCase("Cảng Tiên Sa Đà Nẵng")).thenReturn(Optional.empty()); Port mockPort2 = Port.builder().name("Cảng Tiên Sa Đà Nẵng").code("VNDAD").build(); mockPort2.setId(2L); @@ -83,6 +86,34 @@ void testRunSeedsWhenEmpty() { verify(cancellationPolicyRepository, times(3)).save(any()); } + @Test + @DisplayName("run reuses existing port by name even if code differs") + void testRunReusesPortByName() { + CruiseShip existingShip = CruiseShip.builder().name("Grand Pearl Voyager").code("SHIP-OLD").build(); + existingShip.setId(1L); + when(shipRepository.findByCode("SHIP-001")).thenReturn(Optional.empty()); + when(shipRepository.findByName("Grand Pearl Voyager")).thenReturn(Optional.of(existingShip)); + + Port existingPort1 = Port.builder().name("Cảng Quốc Tế Hạ Long").code("VN-HLG-OLD").build(); + existingPort1.setId(10L); + when(portRepository.findByCodeIgnoreCase("VNHLG")).thenReturn(Optional.empty()); + when(portRepository.findByNameIgnoreCase("Cảng Quốc Tế Hạ Long")).thenReturn(Optional.of(existingPort1)); + + Port existingPort2 = Port.builder().name("Cảng Tiên Sa Đà Nẵng").code("VN-DAD-OLD").build(); + existingPort2.setId(20L); + when(portRepository.findByCodeIgnoreCase("VNDAD")).thenReturn(Optional.empty()); + when(portRepository.findByNameIgnoreCase("Cảng Tiên Sa Đà Nẵng")).thenReturn(Optional.of(existingPort2)); + + when(tourRepository.count()).thenReturn(1L); + when(deckZoneRepository.findByShipIdOrderByDeckNumberAsc(1L)).thenReturn(Collections.emptyList()); + when(cancellationPolicyRepository.count()).thenReturn(1L); + + dataSeeder.run(new DefaultApplicationArguments(new String[0])); + + verify(shipRepository, never()).save(any()); + verify(portRepository, never()).save(any()); + } + @Test @DisplayName("run skips seeding when data already exists") void testRunSkipsWhenPopulated() {