Docker compose

docker-compose.yaml

@@ -0,0 +1,9 @@
+services:
+  database:
+    image: postgres:latest
+    ports:
+      - 6543:5432
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: 8258
+      POSTGRES_DB: postgres

pom.xml

@@ -16,6 +16,11 @@
     <properties>
         <java.version>17</java.version>
     </properties>
+
+
+
+
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -67,19 +72,72 @@
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
         </dependency>
+        <!--
+                <dependency>
+                    <groupId>com.h2database</groupId>
+                    <artifactId>h2</artifactId>
+                    <scope>test</scope>
+                </dependency>
+        -->
+
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>1.18.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>1.18.3</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
+
+
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>com.dkanejs.maven.plugins</groupId>
+                <artifactId>docker-compose-maven-plugin</artifactId>
+                <version>4.0.0</version>
+
+                <executions>
+                    <execution>
+                        <id>up</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>up</goal>
+                        </goals>
+                        <configuration>
+
+                            <composeFile>${project.basedir}/docker-compose.yaml</composeFile>
+                            <detachedMode>true</detachedMode>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>down</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>down</goal>
+                        </goals>
+                        <configuration>
+
+                            <composeFile>${project.basedir}/docker-compose.yaml</composeFile>
+                            <detachedMode>true</detachedMode>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/example/weblibrary/config/SecurityConfig.java

@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -28,6 +29,7 @@
 @Configuration
 @RequiredArgsConstructor
 public class SecurityConfig {
+
     @Autowired
     // Внедряем зависимость UserDetailsService
     // для работы с данными пользователя.

src/main/java/com/example/weblibrary/model/Position.java

@@ -17,7 +17,7 @@
 public class Position implements Serializable {
     @Id
     @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.AUTO)
+//    @GeneratedValue(strategy = GenerationType.AUTO)
     private Integer positionId;
     private String positionName;
 

src/main/java/com/example/weblibrary/security/AuthUser.java

@@ -15,7 +15,7 @@ public class AuthUser {
     // Создаем поле id для хранения идентификатора пользователя.
     @Id
     // Используем AUTO-генерацию идентификаторов.
-    @GeneratedValue(strategy = GenerationType.AUTO)
+//    @GeneratedValue(strategy = GenerationType.AUTO)
     private Integer id;
 
     // Создаем поле username для хранения имени пользователя.

src/main/java/com/example/weblibrary/security/Role.java

@@ -13,7 +13,7 @@ public class Role {
     // Создаем поле id-идентификатор.
     @Id
     // Используем AUTO-генерацию идентификаторов.
-    @GeneratedValue(strategy = GenerationType.AUTO)
+//    @GeneratedValue(strategy = GenerationType.AUTO)
     private Integer id;
     private String role;
 //    @ManyToOne(fetch = FetchType.LAZY)

src/test/java/com/example/weblibrary/controller/EmployeeTest.java

@@ -23,7 +23,6 @@
 
 @SpringBootTest
 @AutoConfigureMockMvc
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
 public class EmployeeTest {
 
     @Autowired
@@ -36,6 +35,7 @@ public class EmployeeTest {
     @Test
     @WithMockUser(username = "admin", roles = "ADMIN", password = "1234")
     void givenNoBody_whenEmptyJsonArray() throws Exception {
+        employeeRepository.deleteAll();
         // Имитируем GET-запрос к "/user"
         mockMvc.perform(get("/admin/employees/all"))
                 // Проверяем, что статус ответа — 200 (OK)
@@ -50,6 +50,7 @@ void givenNoBody_whenEmptyJsonArray() throws Exception {
     @Test
     @WithMockUser(username = "admin", roles = "ADMIN", password = "1234")
     void getEmployeesTest() throws Exception {
+        employeeRepository.deleteAll();
         createEmployees();
         mockMvc.perform(get("/admin/employees/all"))
                 .andExpect(status().isOk())
@@ -64,6 +65,7 @@ void getEmployeesTest() throws Exception {
     @Test
     @WithMockUser(username = "admin", roles = "USER", password = "1234")
     void getEmployeeWithHighestSalary() throws Exception {
+        employeeRepository.deleteAll();
         createEmployees();
         mockMvc.perform(get("/employees/withHighestSalary"))
                 .andExpect(status().isOk())
@@ -73,6 +75,7 @@ void getEmployeeWithHighestSalary() throws Exception {
     @Test
     @WithMockUser(username = "admin", roles = "USER", password = "1234")
     void getEmployeeWithsalaryHigherThan_Test() throws Exception {
+        employeeRepository.deleteAll();
         createEmployees();
         mockMvc.perform(get("/employees/salaryHigherThan?salary=15000"))
                 .andExpect(status().isOk())
@@ -107,16 +110,18 @@ void addEmployeeFromFile() throws Exception {
                 .andExpect(status().isOk());
         mockMvc.perform(get("/admin/employees/all"))
                 .andExpect(status().isOk())
-                .andExpect(jsonPath("$[3].name").value("Следующий"));
+                .andExpect(jsonPath("$.length()").value(4));
     }
 
 
     @Test
     @WithMockUser(username = "admin", roles = "ADMIN", password = "1234")
     void deleteEmployee_Test() throws Exception {
+        employeeRepository.deleteAll();
         createEmployees();
         mockMvc.perform(delete("/admin/employees/3"))
                 .andExpect(status().isOk());
+
         mockMvc.perform(get("/admin/employees/all"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$").isArray())
@@ -128,6 +133,7 @@ void deleteEmployee_Test() throws Exception {
     @Test
     @WithMockUser(username = "admin", roles = "USER", password = "1234")
     void getEmployeeByPage() throws Exception {
+        employeeRepository.deleteAll();
         createEmployees();
         mockMvc.perform(get("/employees/page?page=0")
                         .param("page", String.valueOf(0)))

src/test/java/com/example/weblibrary/controller/ReportTest.java

@@ -8,6 +8,7 @@
 
 import com.example.weblibrary.model.Employee;
 import com.example.weblibrary.repository.EmployeeRepository;
+import com.example.weblibrary.repository.ReportRepository;
 import com.example.weblibrary.service.ReportService;
 import com.example.weblibrary.model.Position;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -24,25 +25,29 @@
 
 @SpringBootTest
 @AutoConfigureMockMvc
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+
 public class ReportTest {
     @Autowired
     MockMvc mockMvc;
 
     @Autowired
     private EmployeeRepository employeeRepository;
 
+    @Autowired
+    private ReportRepository reportRepository;
+
 
     @Autowired
     private ReportService reportService;
 
     @Test
     @WithMockUser(username = "admin", roles = "USER", password = "1234")
     void getReport() throws Exception {
+        reportRepository.deleteAll();
+        employeeRepository.deleteAll();
         createEmployees();
         mockMvc.perform(post("/report"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$").value(1));
+                .andExpect(status().isOk());
     }
 
     @Test

src/test/resources/application.properties

@@ -1,3 +1,7 @@
-spring.datasource.url=jdbc:h2:mem:test;NON_KEYWORDS=USER
+#spring.datasource.url=jdbc:h2:mem:test;NON_KEYWORDS=USER
 spring.liquibase.change-log=classpath:../classes/liquibase/changelog-master.yml
-app.env = test
+app.env = test
+
+spring.datasource.url=jdbc:postgresql://localhost:6543/postgres
+spring.datasource.username=postgres
+spring.datasource.password=8258

target/classes/application-test.properties

@@ -0,0 +1,9 @@
+spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+spring.datasource.username=postgres
+spring.datasource.password=8258
+spring.datasource.driver = org.postgresql.Driver
+# Hibernate ddl auto (create, create-drop, validate, update)
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.format_sql=true
+app.env = test

target/classes/application.properties

@@ -0,0 +1,10 @@
+spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+spring.datasource.username=postgres
+spring.datasource.password=8258
+spring.datasource.driver = org.postgresql.Driver
+# Hibernate ddl auto (create, create-drop, validate, update)
+spring.jpa.hibernate.ddl-auto=validate
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.format_sql=true
+app.env = dev
+spring.liquibase.change-log=classpath:liquibase/changelog-master.yml