diff --git a/.gitignore b/.gitignore index c2065bc..adc25dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +.db/ + + HELP.md .gradle build/ diff --git a/compose.yaml b/compose.yaml index 682bf8b..a52def6 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,9 +1,12 @@ services: postgres: - image: 'postgres:latest' + image: 'postgres:16' + container_name: etfo-db environment: - - 'POSTGRES_DB=mydatabase' - - 'POSTGRES_PASSWORD=secret' - - 'POSTGRES_USER=user' + - 'POSTGRES_DB=etfo-db' + - 'POSTGRES_PASSWORD=test' + - 'POSTGRES_USER=test' + volumes: + - .db:/var/lib/postgresql/data ports: - '5432:5432' diff --git a/src/main/java/dev/ksan/etfoglasiserver/EtfoglasiServerApplication.java b/src/main/java/dev/ksan/etfoglasiserver/EtfoglasiServerApplication.java index 2ec7400..8eab24f 100644 --- a/src/main/java/dev/ksan/etfoglasiserver/EtfoglasiServerApplication.java +++ b/src/main/java/dev/ksan/etfoglasiserver/EtfoglasiServerApplication.java @@ -1,45 +1,25 @@ package dev.ksan.etfoglasiserver; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.time.LocalDate; +import java.time.LocalDateTime; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.jdbc.core.JdbcTemplate; @SpringBootApplication public class EtfoglasiServerApplication { - public static void main(String[] args) { - System.out.println("EtfoglasiServerApplication starting..."); - SpringApplication.run(EtfoglasiServerApplication.class, args); + public static void main(String[] args) { + SpringApplication.run(EtfoglasiServerApplication.class, args); - String url = "jdbc:postgresql://localhost:5432/mydatabase"; // Update with your database info - String user = "user"; // Your PostgreSQL username - String password = "secret"; // Your PostgreSQL password - - // SQL INSERT query - String sql = "INSERT INTO employees (id, name, position) VALUES (?, ?, ?)"; - - // Try-with-resources to ensure automatic resource management - try (Connection conn = DriverManager.getConnection(url, user, password); - PreparedStatement stmt = conn.prepareStatement(sql)) { - - // Set parameters for the INSERT statement - stmt.setInt(1, 3); // id - stmt.setString(2, "Jane Doe"); // name - stmt.setString(3, "Who knows"); // position - - // Execute the insert - int rowsAffected = stmt.executeUpdate(); - - System.out.println(rowsAffected + " row(s) inserted."); - - } catch (SQLException e) { - e.printStackTrace(); - } - } + } } diff --git a/src/main/java/dev/ksan/etfoglasiserver/model/User.java b/src/main/java/dev/ksan/etfoglasiserver/model/User.java new file mode 100644 index 0000000..db7fe8b --- /dev/null +++ b/src/main/java/dev/ksan/etfoglasiserver/model/User.java @@ -0,0 +1,42 @@ +package dev.ksan.etfoglasiserver.model; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import java.util.UUID; + +@Entity +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private UUID id; + + @Column(nullable = false, unique = true) + private String email; + + @Column(nullable = false) + private String password; + + public UUID getId() { + return id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1c5f1fa..af97dc2 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,5 @@ spring.application.name=etfoglasi-server +spring.datasource.url=jdbc:postgresql://localhost:5432/etfo-db +spring.datasource.username=test +spring.datasource.password=test +spring.jpa.show-sql=true