add test-containers tests

Author: Mardvey-UMA

WeatherCastApp/pom.xml

@@ -25,10 +25,10 @@
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
         <postgresql.version>42.7.5</postgresql.version>
         <spring-cloud.version>2024.0.1</spring-cloud.version>
-        <junit.version>5.10.2</junit.version>
         <feign-jackson.version>12.3</feign-jackson.version>
         <mockito.version>5.11.0</mockito.version>
-        <test-containers.version>1.19.8</test-containers.version>
+        <test-containers.version>1.21.0</test-containers.version>
+        <jakarta-validation.version>3.1.1</jakarta-validation.version>
     </properties>
 
     <dependencyManagement>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
-            <version>3.1.1</version>
+            <version>${jakarta-validation.version}</version>
         </dependency>
 
         <dependency>
@@ -99,7 +99,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -130,6 +129,19 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${test-containers.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId>

WeatherCastApp/src/test/java/tb/wca/AbstractContainerBaseTest.java

@@ -0,0 +1,44 @@
+package tb.wca;
+
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.utility.DockerImageName;
+
+public class AbstractContainerBaseTest {
+
+    private static final String DB_NAME = "testdb";
+    private static final String DB_USER = "testuser";
+    private static final String DB_PASSWORD = "testpass";
+
+    static final GenericContainer<?> postgres = new GenericContainer<>(
+            DockerImageName.parse("postgres:16-alpine"))
+            .withEnv("POSTGRES_DB", DB_NAME)
+            .withEnv("POSTGRES_USER", DB_USER)
+            .withEnv("POSTGRES_PASSWORD", DB_PASSWORD)
+            .withExposedPorts(5432);
+
+    static {
+        postgres.start();
+    }
+
+    @DynamicPropertySource
+    static void registerPgProperties(DynamicPropertyRegistry registry) {
+        String jdbcUrl = String.format(
+                "jdbc:postgresql://%s:%d/%s",
+                postgres.getHost(),
+                postgres.getMappedPort(5432),
+                DB_NAME
+        );
+
+        registry.add("spring.datasource.url", () -> jdbcUrl);
+        registry.add("spring.datasource.username", () -> DB_USER);
+        registry.add("spring.datasource.password", () -> DB_PASSWORD);
+
+        registry.add("spring.flyway.url", () -> jdbcUrl);
+        registry.add("spring.flyway.user", () -> DB_USER);
+        registry.add("spring.flyway.password", () -> DB_PASSWORD);
+        registry.add("spring.flyway.locations", () -> "classpath:db/migration");
+    }
+
+}

WeatherCastApp/src/test/java/tb/wca/client/WeatherApiClientTest.java

@@ -0,0 +1,62 @@
+package tb.wca.repository;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import tb.wca.AbstractContainerBaseTest;
+import tb.wca.entity.CityWeatherEntity;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@DataJpaTest
+@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
+class CityWeatherRepositoryTest extends AbstractContainerBaseTest {
+
+    @Autowired
+    private CityWeatherRepository cityWeatherRepository;
+
+    @AfterEach
+    void shutDown() {
+        cityWeatherRepository.deleteAll();
+    }
+
+    @Test
+    void findByCityNameAndDate_shouldReturnRecords() {
+        List<CityWeatherEntity> results = cityWeatherRepository.findByCity_NameAndDate(
+                "Обнинск", LocalDate.of(2025, 12, 1));
+
+        assertEquals(2, results.size());
+    }
+
+    @Test
+    void findByCityNameAndDateAndTime_shouldReturnSingleRecord() {
+        Optional<CityWeatherEntity> result = cityWeatherRepository.findByCity_NameAndDateAndTime(
+                "Обнинск",
+                LocalDate.of(2025, 12, 1),
+                LocalTime.of(6, 0)
+        );
+        assertTrue(result.isPresent());
+        assertEquals(LocalDate.of(2025, 12, 1), result.get().getDate());
+        assertEquals(LocalTime.of(6, 0), result.get().getTime());
+        assertEquals("Обнинск", result.get().getCity().getName());
+    }
+
+    @Test
+    void findByCityNameAndDateBetween_shouldReturnRange() {
+        List<CityWeatherEntity> results = cityWeatherRepository.findByCity_NameAndDateBetween(
+                "Саратов",
+                LocalDate.of(2025, 5, 1),
+                LocalDate.of(2025, 5, 31)
+        );
+
+        assertEquals(2, results.size());
+    }
+}

WeatherCastApp/src/test/java/tb/wca/client/YandexGeocodeClientTest.java

@@ -0,0 +1,3 @@
+spring.jpa.hibernate.ddl-auto=none
+spring.flyway.enabled=true
+spring.flyway.locations=classpath:db/migration

WeatherCastApp/src/test/java/tb/wca/client/mapper/WeatherProjectEolMapperTest.java

@@ -0,0 +1,39 @@
+TRUNCATE public.city_weather RESTART IDENTITY CASCADE;
+TRUNCATE public.weather       RESTART IDENTITY CASCADE;
+TRUNCATE public.city          RESTART IDENTITY CASCADE;
+
+INSERT INTO public.city (id, name, longitude, latitude) VALUES
+                                                            (1, 'Обнинск',            55.55, 55.55),
+                                                            (2, 'Петушки',  55.55, 55.55),
+                                                            (3, 'Саратов',       55.55, 55.55);
+
+INSERT INTO public.weather (
+    id, temperature, humidity, wind_speed, uv_index,
+    wind_direction, feels_like, pressure, created_at
+) VALUES
+      (1,  -5.0, 85, 3.5, 0.20, 180,  -9.0, 1015, '2025-06-06 06:00:00+00'),
+      (2,  -3.0, 80, 4.0, 0.30, 190,  -6.0, 1010, '2025-06-06 06:00:00+00'),
+      (3,  10.0, 60, 5.0, 3.20, 170,   8.0, 1005, '2025-06-06 06:00:00+00'),
+      (4,  12.0, 55, 4.2, 4.10, 160,  11.0, 1003, '2025-06-06 06:00:00+00'),
+      (5,  15.0, 50, 2.8, 5.50, 200,  14.0, 1008, '2025-06-06 06:00:00+00'),
+      (6,  17.0, 45, 3.0, 6.10, 210,  16.0, 1009, '2025-06-06 06:00:00+00'),
+      (7, -10.0, 90, 6.0, 0.10, 140, -15.0, 1020, '2025-06-06 06:00:00+00'),
+      (8,  -8.0, 88, 5.5, 0.15, 130, -12.0, 1018, '2025-06-06 06:00:00+00'),
+      (9,  20.0, 40, 2.0, 7.00, 220,  19.0, 1002, '2025-06-06 06:00:00+00'),
+      (10, 22.0, 38, 1.8, 7.50, 225,  21.0, 1001, '2025-06-06 06:00:00+00');
+
+INSERT INTO public.city_weather (
+    id, date,       time,      weather_id, city_id
+) VALUES
+      (1, '2025-12-01', '06:00:00',  1, 1),
+      (2, '2025-12-01', '09:00:00',  2, 1),
+      (3, '2025-06-02', '14:00:00',  9, 1),
+      (4, '2025-06-02', '15:00:00',  9, 1),
+
+      (5, '2025-04-15', '12:00:00',  3, 2),
+      (6, '2025-04-15', '15:00:00',  4, 2),
+      (7, '2025-01-20', '12:00:00',  8, 2),
+
+      (8, '2025-05-10', '12:00:00',  5, 3),
+      (9, '2025-05-10', '18:00:00',  6, 3),
+      (10, '2025-01-20', '06:00:00',  7, 3);