login&register

This commit is contained in:
2026-06-30 09:57:48 +03:30
parent 00f990c653
commit acb1983ae3
13 changed files with 295 additions and 159 deletions
+10
View File
@@ -0,0 +1,10 @@
# Default ignored files
/shelf/
/workspace.xml
# Ignored default folder with query files
/queries/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="WS-10-Database" />
</profile>
</annotationProcessing>
</component>
</project>
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://maven.devneeds.ir/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="25" project-jdk-type="JavaSDK" />
</project>
Generated
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
+45 -135
View File
@@ -1,141 +1,51 @@
-- Restaurant Database Management System CREATE TABLE users(
-- id BIGSERIAL PRIMARY KEY,
-- Instructions: username VARCHAR(20) NOT NULL UNIQUE,
-- 1. Create all required tables. password_hash VARCHAR(256) NOT NULL,
-- 2. Design appropriate PRIMARY KEY and FOREIGN KEY relationships. email VARCHAR(50)
-- 3. Add suitable constraints based on the requirements. );
-- 4. Insert initial mock data.
-- 5. Insert at least 3 menu items. CREATE TABLE menu_items(
-- 6. The script should be executable from start to finish without errors. id BIGSERIAL PRIMARY KEY,
name VARCHAR(50) NOT NULL,
description VARCHAR(100),
price DECIMAL NOT NULL CHECK (price > 0),
category VARCHAR(50)
);
CREATE TABLE customer_orders(
id BIGSERIAL PRIMARY KEY,
user_id BIGINT NOT NULL,
time TIMESTAMP DEFAULT CURRENT_TIMESTAMP ,
total_price DECIMAL(10 , 2),
CONSTRAINT fk_user_id
FOREIGN KEY (user_id)
REFERENCES users(id)
);
CREATE TABLE order_details (
id BIGSERIAL PRIMARY KEY,
order_id BIGINT NOT NULL,
menu_item_id BIGINT NOT NULL,
quantity INTEGER NOT NULL CHECK (quantity > 0),
unit_price DECIMAL(10 , 2) NOT NULL,
-- ======================================================= CONSTRAINT fk_order
-- USER TABLE FOREIGN KEY (order_id)
-- ======================================================= REFERENCES customer_orders(id) ,
--
-- Represents customers using the system. CONSTRAINT fk_menu_item
-- FOREIGN KEY (menu_item_id)
-- Required information: REFERENCES menu_items(id)
-- - Unique identifier
-- - Username );
-- - Password
-- - Email (optional)
--
-- Requirements:
-- - Each user must have a unique identifier.
-- - Usernames must be unique.
-- - Username and password are required.
-- - Passwords should not be stored in plain text.
--
-- CREATE TABLE ...
INSERT INTO menu_items(name, description ,price, category) VALUES ('Margherita Pizza', 'Classic pizza with tomato and mozzarella', 12.99, 'Pizza'),
('Pepperoni Pizza', 'Pizza with pepperoni and cheese', 14.99, 'Pizza'),
('Cheeseburger', 'Beef burger with cheddar cheese', 10.99, 'Burger'),
('Spaghetti Carbonara', 'Pasta with eggs, cheese, and pancetta', 13.99, 'Pasta'),
('Coca-Cola', 'Classic carbonated soft drink', 3.99, 'Drink'),
('Sparkling Water', 'Natural sparkling mineral water', 2.99, 'Drink');
-- =======================================================
-- MENU ITEM TABLE
-- =======================================================
--
-- Represents available food and drink items.
--
-- Required information:
-- - Unique identifier
-- - Name
-- - Description (optional)
-- - Price
-- - Category (optional)
--
-- Requirements:
-- - Each menu item must have a unique identifier.
-- - Name is required.
-- - Price must always be positive.
--
-- CREATE TABLE ...
-- =======================================================
-- ORDER TABLE
-- =======================================================
--
-- Represents orders placed by customers.
--
-- Required information:
-- - Unique identifier
-- - Reference to customer
-- - Creation date and time
-- - Total price
--
-- Requirements:
-- - Each order must belong to exactly one user.
-- - A user can have multiple orders.
-- - The relationship between User and Order must be implemented.
--
-- Note:
-- Avoid using reserved SQL keywords as table names.
-- Consider using a name such as "orders" or "customer_orders".
--
-- CREATE TABLE ...
-- =======================================================
-- ORDER DETAIL TABLE
-- =======================================================
--
-- Represents items inside an order.
--
-- Required information:
-- - Unique identifier
-- - Reference to an order
-- - Reference to a menu item
-- - Quantity
-- - Item price at purchase time
--
-- Requirements:
-- - Each detail record must belong to one order.
-- - Each detail record must reference one menu item.
-- - Quantity must always be greater than zero.
-- - Store the item's price at the moment of purchase.
--
-- CREATE TABLE ...
-- =======================================================
-- INITIAL MENU DATA
-- =======================================================
--
-- Insert at least 3 food or drink items.
--
-- Example categories:
-- - Pizza
-- - Burger
-- - Pasta
-- - Drink
--
-- INSERT INTO ...
-- =======================================================
-- OPTIONAL TEST DATA
-- =======================================================
--
-- You may insert sample users and orders for testing.
-- This section is optional.
--
-- INSERT INTO ...
-- =======================================================
-- VERIFICATION QUERIES
-- =======================================================
--
-- Uncomment these queries to verify your database.
--
-- SELECT * FROM ...;
-- SELECT * FROM ...;
-- SELECT * FROM ...;
-- SELECT * FROM ...;
+6
View File
@@ -27,6 +27,12 @@
<version>${postgresql.version}</version> <version>${postgresql.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>
<version>0.4</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
+51 -5
View File
@@ -1,23 +1,69 @@
package dev.dao; package dev.dao;
import dev.database.DatabaseConnection;
import dev.model.User; import dev.model.User;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import org.mindrot.jbcrypt.BCrypt;
public class UserDao { public class UserDao {
public boolean save(User user) { public boolean save(User user) {
// TODO: String hashedPassword = BCrypt.hashpw(user.getPassword(), BCrypt.gensalt());
// Insert user into database String query ="INSERT INTO users (username, password_hash, email) VALUES (?, ?, ?)";
try(Connection c = DatabaseConnection.getConnection();
PreparedStatement pst = c.prepareStatement(query)) {
pst.setString(1 , user.getUsername());
pst.setString(2 , hashedPassword);
pst.setString(3 , user.getEmail());
int result = pst.executeUpdate();
if(result==1){
return true;
}
} catch (SQLException e) {
System.out.println(e.getMessage());
};
return false; return false;
} }
public User findByUsername(String username) { public User findByUsername(String userName) {
// TODO: String query = "SELECT * FROM users WHERE username = ?";
// Find a user by username
try (Connection c = DatabaseConnection.getConnection();
PreparedStatement pst = c.prepareStatement(query)) {
pst.setString(1, userName);
try (ResultSet rst = pst.executeQuery()) {
if (rst.next()) {
User user = new User(rst.getInt("id"),
rst.getString("username"),
rst.getString("password_hash"),
rst.getString("email"));
return user;
}
}
} catch (SQLException e) {
System.out.println(e.getMessage());
}
return null; return null;
} }
} }
@@ -1,6 +1,7 @@
package dev.database; package dev.database;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException; import java.sql.SQLException;
public class DatabaseConnection { public class DatabaseConnection {
@@ -9,19 +10,18 @@ public class DatabaseConnection {
private static final String USER = "postgres"; // Your Username private static final String USER = "postgres"; // Your Username
private static final String PASSWORD = "password"; // Your Password private static final String PASSWORD = "12345678"; // Your Password
private DatabaseConnection() { private DatabaseConnection() {
} }
public static Connection getConnection() public static Connection getConnection() throws SQLException {
throws SQLException {
// TODO: Connection con = DriverManager.getConnection(URL , USER , PASSWORD);
// Return a valid PostgreSQL connection
return null;
return con;
} }
} }
+21 -3
View File
@@ -3,11 +3,29 @@ package dev.model;
public class User { public class User {
private int id; private int id;
private String username; private String username;
private String password; private String password;
private String email; private String email;
public User (int id, String username, String password, String email) {
this.id = id;
this.username = username;
this.password = password;
this.email = email;
}
public User (String username, String password, String email) {
this.username = username;
this.password = password;
this.email = email;
}
public int getId() { return id; }
public String getUsername() { return username; }
public String getPassword() { return password; }
public String getEmail() { return email; }
} }
+33 -5
View File
@@ -1,23 +1,51 @@
package dev.service; package dev.service;
import dev.dao.UserDao;
import dev.model.User; import dev.model.User;
import org.mindrot.jbcrypt.BCrypt;
public class AuthService { public class AuthService {
private UserDao userDao = new UserDao();
public boolean register(String username, String password, String email) { public boolean register(String username, String password, String email) {
// TODO: if(userDao.findByUsername(username) == null){
// Validate and register user User user = new User (username , password , email);
if(userDao.save(user)){
System.out.println("successfully register");
return true;
}else {
System.out.println("register failed");
return false; return false;
} }
}
else {
System.out.println("Username already exists.");
return false;
}
}
public User login(String username, String password) { public User login(String username, String password) {
// TODO: User user = userDao.findByUsername(username);
// Authenticate user
if(user == null){
System.out.println("Username not found.");
return null;
}else {
String storedHash = user.getPassword();
if (BCrypt.checkpw(password, storedHash)) {
return user;
} else {
System.out.println("Incorrect password.");
return null; return null;
} }
}
}
} }
+64 -4
View File
@@ -1,11 +1,16 @@
package dev.ui; package dev.ui;
import dev.model.User;
import dev.service.AuthService;
import java.util.Scanner; import java.util.Scanner;
public class ConsoleMenu { public class ConsoleMenu {
private final Scanner scanner = private final Scanner scanner = new Scanner(System.in);
new Scanner(System.in); private final AuthService authService = new AuthService();
private User user;
public void start() { public void start() {
@@ -16,18 +21,46 @@ public class ConsoleMenu {
System.out.println("1. Login"); System.out.println("1. Login");
System.out.println("2. Register"); System.out.println("2. Register");
System.out.println("3. Exit"); System.out.println("3. Exit");
System.out.println("======================================= \n" +
"Choose an option: ");
int choice = scanner.nextInt(); int choice = scanner.nextInt();
switch (choice) { switch (choice) {
case 1: case 1:
// TODO {
System.out.println("Enter username:");
String username =scanner.next();
System.out.println("Enter password:");
String password = scanner.next();
user = authService.login(username,password);
if(user == null){
System.out.println("Try again");
}
else {
System.out.println("Login success");
}
break; break;
}
case 2: case 2:
// TODO {
System.out.println("Enter username:");
String username =scanner.next();
System.out.println("Enter password:");
String password = scanner.next();
System.out.println("Enter email:");
String email = scanner.next();
authService.register(username,password,email);
break; break;
}
case 3: case 3:
return; return;
@@ -39,6 +72,33 @@ public class ConsoleMenu {
} }
}
public void menu(){
while (true){
System.out.println();
System.out.println("========\uD83C\uDF7D\uFE0F MAIN MENU \uD83C\uDF7D\uFE0F========");
System.out.println("1. View Menu");
System.out.println("2. Place a New Order");
System.out.println("3. View Order History ");
System.out.println("4. Logout");
System.out.println("======================================= \n" +
"Choose an option: ");
int choice = scanner.nextInt();
}
} }
} }