From 735139f4a4b395fae3254be9756d3f923d89e92a Mon Sep 17 00:00:00 2001 From: HadiSharifi Date: Mon, 29 Jun 2026 21:17:57 +0330 Subject: [PATCH] complete user class --- .../java/dev/database/DatabaseConnection.java | 6 ++--- src/main/java/dev/model/User.java | 25 +++++++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/dev/database/DatabaseConnection.java b/src/main/java/dev/database/DatabaseConnection.java index da45535..c49ec16 100644 --- a/src/main/java/dev/database/DatabaseConnection.java +++ b/src/main/java/dev/database/DatabaseConnection.java @@ -1,6 +1,7 @@ package dev.database; import java.sql.Connection; +import java.sql.DriverManager; import java.sql.SQLException; public class DatabaseConnection { @@ -18,10 +19,7 @@ public class DatabaseConnection { public static Connection getConnection() throws SQLException { - // TODO: - // Return a valid PostgreSQL connection - - return null; + return DriverManager.getConnection(URL, USER, PASSWORD); } } \ No newline at end of file diff --git a/src/main/java/dev/model/User.java b/src/main/java/dev/model/User.java index 0ab60c6..c09a76a 100644 --- a/src/main/java/dev/model/User.java +++ b/src/main/java/dev/model/User.java @@ -1,13 +1,28 @@ package dev.model; public class User { - private int id; - private String username; - - private String password; - + private String password; // holds the hash when loaded from DB private String email; + public User() {} + + public User(String username, String password, String email) { + this.username = username; + this.password = password; + this.email = email; + } + + public int getId(){ return id; } + public void setId(int id) { this.id = id; } + + public String getUsername(){ return username; } + public void setUsername(String u){ this.username = u; } + + public String getPassword() { return password; } + public void setPassword(String p){ this.password = p; } + + public String getEmail(){ return email; } + public void setEmail(String e){ this.email = e; } } \ No newline at end of file