tests

Author: fey

build.gradle.kts

@@ -52,6 +52,7 @@ dependencies {
     testImplementation(libs.junitJupiter)
     testRuntimeOnly(libs.junitPlatformLauncher)
     runtimeOnly("com.h2database:h2")
+    runtimeOnly(libs.postgresql)
 
     implementation(libs.jacksonDatabindNullable)
     implementation(libs.datafaker)
@@ -60,7 +61,7 @@ dependencies {
 tasks.test {
     useJUnitPlatform()
     testLogging {
-        exceptionFormat = TestExceptionFormat.FULL
+        exceptionFormat = TestExceptionFormat.SHORT
         events = setOf(
             TestLogEvent.FAILED,
             TestLogEvent.PASSED,

gradle/libs.versions.toml

@@ -53,6 +53,7 @@ mapstruct = "1.6.3"
 h2 = "2.3.232"
 junit-bom = "6.0.0"
 instancio = "5.5.1"
+postgresql = "42.7.5"
 
 [libraries]
 
@@ -82,3 +83,4 @@ jacksonDatabindNullable = { module = "org.openapitools:jackson-databind-nullable
 datafaker = { module = "net.datafaker:datafaker", version.ref = "datafaker" }
 instancioCore = { module = "org.instancio:instancio-core", version.ref = "instancio" }
 springdocOpenapi = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc-openapi-ui" }
+postgresql = { module = "org.postgresql:postgresql", version.ref = "postgresql" }

src/main/java/io/hexlet/project_devops_deploy/component/DataInitializer.java

@@ -2,26 +2,31 @@
 
 import io.hexlet.project_devops_deploy.repository.BulletinRepository;
 import io.hexlet.project_devops_deploy.util.ModelGenerator;
-import jakarta.annotation.PostConstruct;
 import java.util.stream.IntStream;
+import lombok.AllArgsConstructor;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
 @Component
-public class DataInitializer {
+@Profile("!test")
+@AllArgsConstructor
+public class DataInitializer implements ApplicationRunner {
 
     private static final int BULLETIN_SEED_COUNT = 10;
 
     private final BulletinRepository repository;
     private final ModelGenerator modelGenerator;
 
-    public DataInitializer(BulletinRepository repository, ModelGenerator modelGenerator) {
-        this.repository = repository;
-        this.modelGenerator = modelGenerator;
-    }
+    @Override
+    public void run(ApplicationArguments args) {
+        if (repository.count() > 0) {
+            return;
+        }
 
-    @PostConstruct
-    public void seedData() {
-        IntStream.range(0, BULLETIN_SEED_COUNT).mapToObj(i -> modelGenerator.generateBulletin())
+        IntStream.range(0, BULLETIN_SEED_COUNT)
+                .mapToObj(i -> modelGenerator.generateBulletin())
                 .forEach(repository::save);
     }
 }

src/main/java/io/hexlet/project_devops_deploy/config/JpaConfig.java

@@ -0,0 +1,9 @@
+package io.hexlet.project_devops_deploy.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+@Configuration
+@EnableJpaAuditing
+public class JpaConfig {
+}

src/main/java/io/hexlet/project_devops_deploy/controller/BulletinController.java

@@ -5,6 +5,7 @@
 import io.hexlet.project_devops_deploy.service.BulletinService;
 import jakarta.validation.Valid;
 import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,24 +21,19 @@
 @RequestMapping("/api")
 public class BulletinController {
 
-    private final BulletinService service;
+    private BulletinService service;
 
-    public BulletinController(BulletinService service) {
+    @Autowired
+    public void setService(BulletinService service) {
         this.service = service;
     }
 
-    @PostMapping("/bulletins2")
+    @PostMapping("/bulletins")
     @ResponseStatus(HttpStatus.CREATED)
     public BulletinDto create(@Valid @RequestBody BulletinRequest request) {
         return service.create(request);
     }
 
-    @DeleteMapping("/bulletins/{id}")
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    public void delete(@PathVariable Long id) {
-        service.delete(id);
-    }
-
     @GetMapping("/bulletins")
     public List<BulletinDto> index() {
         return service.findAll();
@@ -52,4 +48,11 @@ public BulletinDto show(@PathVariable Long id) {
     public BulletinDto update(@PathVariable Long id, @Valid @RequestBody BulletinRequest request) {
         return service.update(id, request);
     }
+
+
+    @DeleteMapping("/bulletins/{id}")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void delete(@PathVariable Long id) {
+        service.delete(id);
+    }
 }

src/main/java/io/hexlet/project_devops_deploy/model/Bulletin.java

@@ -2,15 +2,21 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
+import java.time.LocalDateTime;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 @Entity
 @Table(name = "bulletins")
+@EntityListeners(AuditingEntityListener.class)
 public class Bulletin {
 
     @Id
@@ -30,6 +36,14 @@ public class Bulletin {
     @Column(nullable = false)
     private String contact;
 
+    @CreatedDate
+    @Column(name = "created_at", nullable = false, updatable = false)
+    private LocalDateTime createdAt;
+
+    @LastModifiedDate
+    @Column(name = "updated_at", nullable = false)
+    private LocalDateTime updatedAt;
+
     public String getContact() {
         return contact;
     }
@@ -69,4 +83,20 @@ public void setState(BulletinState state) {
     public void setTitle(String title) {
         this.title = title;
     }
+
+    public LocalDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(LocalDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public LocalDateTime getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(LocalDateTime updatedAt) {
+        this.updatedAt = updatedAt;
+    }
 }

src/main/java/io/hexlet/project_devops_deploy/util/ModelGenerator.java

@@ -27,10 +27,14 @@ public Bulletin generateBulletin() {
 
     @PostConstruct
     private void init() {
-        bulletinModel = Instancio.of(Bulletin.class).ignore(Select.field(Bulletin::getId))
+        bulletinModel = Instancio.of(Bulletin.class)
+                .ignore(Select.field(Bulletin::getId))
+                .ignore(Select.field(Bulletin::getCreatedAt))
+                .ignore(Select.field(Bulletin::getUpdatedAt))
                 .supply(Select.field(Bulletin::getTitle), () -> faker.book().title())
                 .supply(Select.field(Bulletin::getDescription), () -> faker.lorem().paragraph(3))
                 .supply(Select.field(Bulletin::getState), () -> faker.options().option(BulletinState.values()))
-                .supply(Select.field(Bulletin::getContact), () -> faker.phoneNumber().phoneNumber()).toModel();
+                .supply(Select.field(Bulletin::getContact), () -> faker.phoneNumber().phoneNumber())
+                .toModel();
     }
 }

src/main/resources/application-prod.yml

@@ -0,0 +1,22 @@
+---
+spring:
+  config:
+    activate:
+      on-profile: prod
+  datasource:
+    url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/bulletins}
+    username: ${SPRING_DATASOURCE_USERNAME:postgres}
+    password: ${SPRING_DATASOURCE_PASSWORD:postgres}
+    driver-class-name: org.postgresql.Driver
+  jpa:
+    hibernate:
+      ddl-auto: validate
+    show-sql: false
+  flyway:
+    enabled: true
+  output:
+    ansi:
+      enabled: always
+  h2:
+    console:
+      enabled: false

src/main/resources/application.yml

@@ -7,6 +7,8 @@ logging:
     io.hexlet.project_devops_deploy: DEBUG
 
 spring:
+  profiles:
+    default: dev
   application:
     name: bulletins
   datasource:

src/main/resources/db/migration/V2__add_audit_columns.sql

@@ -0,0 +1,3 @@
+ALTER TABLE bulletins ADD COLUMN created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
+
+ALTER TABLE bulletins ADD COLUMN updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;