From e10d7f02e57aa22082cc59eb7c3cdeaa28f03125 Mon Sep 17 00:00:00 2001 From: Reza Date: Mon, 22 Jun 2026 19:42:41 +0330 Subject: [PATCH] complete --- .idea/.gitignore | 10 + .idea/compiler.xml | 13 ++ .idea/encodings.xml | 7 + .idea/inspectionProfiles/Project_Default.xml | 6 + .idea/jarRepositories.xml | 20 ++ .idea/misc.xml | 12 ++ .idea/vcs.xml | 6 + database.sql | 172 ++++-------------- src/main/java/dev/dao/MenuItemDao.java | 49 +++-- src/main/java/dev/dao/OrderDao.java | 43 ++++- src/main/java/dev/dao/OrderDetailDao.java | 44 +++-- src/main/java/dev/dao/UserDao.java | 39 +++- .../java/dev/database/DatabaseConnection.java | 14 +- src/main/java/dev/model/MenuItem.java | 37 +++- src/main/java/dev/model/Order.java | 37 +++- src/main/java/dev/model/OrderDetail.java | 46 ++++- src/main/java/dev/model/User.java | 37 +++- src/main/java/dev/service/AuthService.java | 36 +++- src/main/java/dev/service/MenuService.java | 17 +- src/main/java/dev/service/OrderService.java | 89 ++++++++- src/main/java/dev/ui/ConsoleMenu.java | 69 ++++++- 21 files changed, 569 insertions(+), 234 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..ab1f416 --- /dev/null +++ b/.idea/.gitignore @@ -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/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..bf2c501 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..5cb71ef --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a9076af --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..eba6e1f --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/database.sql b/database.sql index 2169346..5ebdd60 100644 --- a/database.sql +++ b/database.sql @@ -1,141 +1,39 @@ --- Restaurant Database Management System --- --- Instructions: --- 1. Create all required tables. --- 2. Design appropriate PRIMARY KEY and FOREIGN KEY relationships. --- 3. Add suitable constraints based on the requirements. --- 4. Insert initial mock data. --- 5. Insert at least 3 menu items. --- 6. The script should be executable from start to finish without errors. +CREATE TABLE users ( + id SERIAL PRIMARY KEY, + username VARCHAR(50) NOT NULL UNIQUE, + password VARCHAR(255) NOT NULL, + email VARCHAR(100) +); +CREATE TABLE menu_items ( + id SERIAL PRIMARY KEY, + name VARCHAR(100) NOT NULL, + description TEXT, + price DECIMAL(10,2) NOT NULL CHECK (price > 0), + category VARCHAR(50) +); +CREATE TABLE customer_orders ( + id SERIAL PRIMARY KEY, + user_id INTEGER NOT NULL, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + total_price DECIMAL(10,2) NOT NULL, + FOREIGN KEY (user_id) REFERENCES users(id) +); --- ======================================================= --- USER TABLE --- ======================================================= --- --- Represents customers using the system. --- --- Required information: --- - 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 ... +CREATE TABLE order_details ( + id SERIAL PRIMARY KEY, + order_id INTEGER NOT NULL, + menu_item_id INTEGER NOT NULL, + quantity INTEGER NOT NULL CHECK (quantity > 0), + price DECIMAL(10,2) NOT NULL, + FOREIGN KEY (order_id) REFERENCES customer_orders(id), + FOREIGN KEY (menu_item_id) REFERENCES menu_items(id) +); - - --- ======================================================= --- 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 ...; \ No newline at end of file +INSERT INTO menu_items (name, description, price, category) VALUES + ('Margherita Pizza', 'Classic tomato and mozzarella', 10.00, 'Pizza'), + ('Cheeseburger', 'Beef patty with cheddar cheese', 8.00, 'Burger'), + ('Spaghetti Carbonara', 'Pasta with egg, cheese, pancetta', 12.00, 'Pasta'), + ('Caesar Salad', 'Romaine lettuce with Caesar dressing', 7.00, 'Salad'), + ('Cola', 'Refreshing carbonated drink', 2.50, 'Drink'); \ No newline at end of file diff --git a/src/main/java/dev/dao/MenuItemDao.java b/src/main/java/dev/dao/MenuItemDao.java index 3bbebe9..04008f2 100644 --- a/src/main/java/dev/dao/MenuItemDao.java +++ b/src/main/java/dev/dao/MenuItemDao.java @@ -1,25 +1,52 @@ package dev.dao; +import dev.database.DatabaseConnection; import dev.model.MenuItem; - +import java.sql.*; +import java.util.ArrayList; import java.util.List; public class MenuItemDao { public List findAll() { - - // TODO: - // Retrieve all menu items - - return null; + List items = new ArrayList<>(); + String sql = "SELECT id, name, description, price, category FROM menu_items"; + try (Connection conn = DatabaseConnection.getConnection(); + Statement stmt = conn.createStatement(); + ResultSet rs = stmt.executeQuery(sql)) { + while (rs.next()) { + MenuItem item = new MenuItem(); + item.setId(rs.getInt("id")); + item.setName(rs.getString("name")); + item.setDescription(rs.getString("description")); + item.setPrice(rs.getDouble("price")); + item.setCategory(rs.getString("category")); + items.add(item); + } + } catch (SQLException e) { + e.printStackTrace(); + } + return items; } public MenuItem findById(int id) { - - // TODO: - // Find menu item by id - + String sql = "SELECT id, name, description, price, category FROM menu_items WHERE id = ?"; + try (Connection conn = DatabaseConnection.getConnection(); + PreparedStatement stmt = conn.prepareStatement(sql)) { + stmt.setInt(1, id); + ResultSet rs = stmt.executeQuery(); + if (rs.next()) { + MenuItem item = new MenuItem(); + item.setId(rs.getInt("id")); + item.setName(rs.getString("name")); + item.setDescription(rs.getString("description")); + item.setPrice(rs.getDouble("price")); + item.setCategory(rs.getString("category")); + return item; + } + } catch (SQLException e) { + e.printStackTrace(); + } return null; } - } \ No newline at end of file diff --git a/src/main/java/dev/dao/OrderDao.java b/src/main/java/dev/dao/OrderDao.java index 00999a2..2761ad1 100644 --- a/src/main/java/dev/dao/OrderDao.java +++ b/src/main/java/dev/dao/OrderDao.java @@ -1,25 +1,48 @@ package dev.dao; import dev.model.Order; - +import java.sql.*; import java.util.List; +import dev.database.DatabaseConnection; +import java.util.ArrayList; public class OrderDao { public int save(Order order) { - - // TODO: - // Insert order and return generated id - + String sql = "INSERT INTO customer_orders (user_id, total_price) VALUES (?, ?) RETURNING id"; + try (Connection conn = DatabaseConnection.getConnection(); + PreparedStatement stmt = conn.prepareStatement(sql)) { + stmt.setInt(1, order.getUserId()); + stmt.setDouble(2, order.getTotalPrice()); + ResultSet rs = stmt.executeQuery(); + if (rs.next()) { + return rs.getInt(1); + } + } catch (SQLException e) { + e.printStackTrace(); + } return -1; } public List findByUserId(int userId) { - - // TODO: - // Retrieve all orders of a user - - return null; + List orders = new ArrayList<>(); + String sql = "SELECT id, user_id, created_at, total_price FROM customer_orders WHERE user_id = ?"; + try (Connection conn = DatabaseConnection.getConnection(); + PreparedStatement stmt = conn.prepareStatement(sql)) { + stmt.setInt(1, userId); + ResultSet rs = stmt.executeQuery(); + while (rs.next()) { + Order order = new Order(); + order.setId(rs.getInt("id")); + order.setUserId(rs.getInt("user_id")); + order.setCreatedAt(rs.getTimestamp("created_at").toLocalDateTime()); + order.setTotalPrice(rs.getDouble("total_price")); + orders.add(order); + } + } catch (SQLException e) { + e.printStackTrace(); + } + return orders; } } \ No newline at end of file diff --git a/src/main/java/dev/dao/OrderDetailDao.java b/src/main/java/dev/dao/OrderDetailDao.java index ed42f56..f0f093a 100644 --- a/src/main/java/dev/dao/OrderDetailDao.java +++ b/src/main/java/dev/dao/OrderDetailDao.java @@ -1,24 +1,46 @@ package dev.dao; +import dev.database.DatabaseConnection; +import java.sql.*; +import java.util.ArrayList; import dev.model.OrderDetail; - import java.util.List; public class OrderDetailDao { public void save(OrderDetail detail) { - - // TODO: - // Insert order detail - + String sql = "INSERT INTO order_details (order_id, menu_item_id, quantity, price) VALUES (?, ?, ?, ?)"; + try (Connection conn = DatabaseConnection.getConnection(); + PreparedStatement stmt = conn.prepareStatement(sql)) { + stmt.setInt(1, detail.getOrderId()); + stmt.setInt(2, detail.getMenuItemId()); + stmt.setInt(3, detail.getQuantity()); + stmt.setDouble(4, detail.getPrice()); + stmt.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + } } public List findByOrderId(int orderId) { - - // TODO: - // Retrieve order details - - return null; + List details = new ArrayList<>(); + String sql = "SELECT id, order_id, menu_item_id, quantity, price FROM order_details WHERE order_id = ?"; + try (Connection conn = DatabaseConnection.getConnection(); + PreparedStatement stmt = conn.prepareStatement(sql)) { + stmt.setInt(1, orderId); + ResultSet rs = stmt.executeQuery(); + while (rs.next()) { + OrderDetail detail = new OrderDetail(); + detail.setId(rs.getInt("id")); + detail.setOrderId(rs.getInt("order_id")); + detail.setMenuItemId(rs.getInt("menu_item_id")); + detail.setQuantity(rs.getInt("quantity")); + detail.setPrice(rs.getDouble("price")); + details.add(detail); + } + } catch (SQLException e) { + e.printStackTrace(); + } + return details; } - } \ No newline at end of file diff --git a/src/main/java/dev/dao/UserDao.java b/src/main/java/dev/dao/UserDao.java index af08106..3d10608 100644 --- a/src/main/java/dev/dao/UserDao.java +++ b/src/main/java/dev/dao/UserDao.java @@ -1,23 +1,42 @@ package dev.dao; +import dev.database.DatabaseConnection; import dev.model.User; +import java.sql.*; public class UserDao { public boolean save(User user) { - - // TODO: - // Insert user into database - - return false; + String sql = "INSERT INTO users (username, password, email) VALUES (?, ?, ?)"; + try (Connection conn = DatabaseConnection.getConnection(); + PreparedStatement stmt = conn.prepareStatement(sql)) { + stmt.setString(1, user.getUsername()); + stmt.setString(2, user.getPassword()); + stmt.setString(3, user.getEmail()); + return stmt.executeUpdate() > 0; + } catch (SQLException e) { + e.printStackTrace(); + return false; + } } public User findByUsername(String username) { - - // TODO: - // Find a user by username - + String sql = "SELECT id, username, password, email FROM users WHERE username = ?"; + try (Connection conn = DatabaseConnection.getConnection(); + PreparedStatement stmt = conn.prepareStatement(sql)) { + stmt.setString(1, username); + ResultSet rs = stmt.executeQuery(); + if (rs.next()) { + User user = new User(); + user.setId(rs.getInt("id")); + user.setUsername(rs.getString("username")); + user.setPassword(rs.getString("password")); + user.setEmail(rs.getString("email")); + return user; + } + } catch (SQLException e) { + e.printStackTrace(); + } return null; } - } \ No newline at end of file diff --git a/src/main/java/dev/database/DatabaseConnection.java b/src/main/java/dev/database/DatabaseConnection.java index da45535..1095e35 100644 --- a/src/main/java/dev/database/DatabaseConnection.java +++ b/src/main/java/dev/database/DatabaseConnection.java @@ -2,14 +2,15 @@ package dev.database; import java.sql.Connection; import java.sql.SQLException; +import java.sql.DriverManager; public class DatabaseConnection { - private static final String URL = "jdbc:postgresql://localhost:5432/restaurant_db"; // DB Server + private static final String URL = "jdbc:postgresql://localhost:5432/restaurant_db"; - private static final String USER = "postgres"; // Your Username + private static final String USER = "postgres"; - private static final String PASSWORD = "password"; // Your Password + private static final String PASSWORD = "123456"; private DatabaseConnection() { @@ -17,11 +18,6 @@ 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/MenuItem.java b/src/main/java/dev/model/MenuItem.java index 265ecc1..71b3952 100644 --- a/src/main/java/dev/model/MenuItem.java +++ b/src/main/java/dev/model/MenuItem.java @@ -1,15 +1,42 @@ package dev.model; public class MenuItem { - private int id; - private String name; - private String description; - private double price; - private String category; + public MenuItem() {} + + public int getId() { + return id; + } + public void setId(int id) { + this.id = id; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public double getPrice() { + return price; + } + public void setPrice(double price) { + this.price = price; + } + public String getCategory() { + return category; + } + public void setCategory(String category) { + this.category = category; + } } \ No newline at end of file diff --git a/src/main/java/dev/model/Order.java b/src/main/java/dev/model/Order.java index 32049cb..704cf36 100644 --- a/src/main/java/dev/model/Order.java +++ b/src/main/java/dev/model/Order.java @@ -3,13 +3,42 @@ package dev.model; import java.time.LocalDateTime; public class Order { - private int id; - private int userId; - private LocalDateTime createdAt; - private double totalPrice; + public Order() {} + + public void setId(int id) { + this.id = id; + } + + public void setTotalPrice(double totalPrice) { + this.totalPrice = totalPrice; + } + + public void setCreatedAt(LocalDateTime createdAt) { + this.createdAt = createdAt; + } + + public void setUserId(int userId) { + this.userId = userId; + } + + public int getId() { + return id; + } + + public int getUserId() { + return userId; + } + + public LocalDateTime getCreatedAt() { + return createdAt; + } + + public double getTotalPrice() { + return totalPrice; + } } \ No newline at end of file diff --git a/src/main/java/dev/model/OrderDetail.java b/src/main/java/dev/model/OrderDetail.java index b5b8bbe..bc5f32b 100644 --- a/src/main/java/dev/model/OrderDetail.java +++ b/src/main/java/dev/model/OrderDetail.java @@ -1,15 +1,51 @@ package dev.model; public class OrderDetail { - private int id; - private int orderId; - private int menuItemId; - private int quantity; - private double price; + public OrderDetail() {} + + public void setId(int id) { + this.id = id; + } + + public void setPrice(double price) { + this.price = price; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } + + public void setMenuItemId(int menuItemId) { + this.menuItemId = menuItemId; + } + + public void setOrderId(int orderId) { + this.orderId = orderId; + } + + public int getId() { + return id; + } + + public double getPrice() { + return price; + } + + public int getQuantity() { + return quantity; + } + + public int getMenuItemId() { + return menuItemId; + } + + public int getOrderId() { + return orderId; + } } \ 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..bf947c8 100644 --- a/src/main/java/dev/model/User.java +++ b/src/main/java/dev/model/User.java @@ -1,13 +1,42 @@ package dev.model; public class User { - private int id; - private String username; - private String password; - 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 username) { + this.username = username; + } + public String getPassword() { + return password; + } + public void setPassword(String password) { + this.password = password; + } + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + } \ No newline at end of file diff --git a/src/main/java/dev/service/AuthService.java b/src/main/java/dev/service/AuthService.java index bee866a..2e6ed26 100644 --- a/src/main/java/dev/service/AuthService.java +++ b/src/main/java/dev/service/AuthService.java @@ -1,23 +1,41 @@ package dev.service; import dev.model.User; +import dev.dao.UserDao; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; public class AuthService { + private final UserDao userDao = new UserDao(); public boolean register(String username, String password, String email) { - - // TODO: - // Validate and register user - - return false; + if (userDao.findByUsername(username) != null) { + System.out.println("Username already exists."); + return false; + } + String hashed = hashPassword(password); + User user = new User(username, hashed, email); + return userDao.save(user); } public User login(String username, String password) { - - // TODO: - // Authenticate user - + User user = userDao.findByUsername(username); + if (user != null && user.getPassword().equals(hashPassword(password))) { + return user; + } return null; } + private String hashPassword(String password) { + try { + MessageDigest md = MessageDigest.getInstance("SHA-256"); + byte[] hash = md.digest(password.getBytes()); + StringBuilder sb = new StringBuilder(); + for (byte b : hash) sb.append(String.format("%02x", b)); + return sb.toString(); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("Hashing failed", e); + } + } + } \ No newline at end of file diff --git a/src/main/java/dev/service/MenuService.java b/src/main/java/dev/service/MenuService.java index 6dbf4da..99aa35c 100644 --- a/src/main/java/dev/service/MenuService.java +++ b/src/main/java/dev/service/MenuService.java @@ -1,12 +1,21 @@ package dev.service; +import dev.dao.MenuItemDao; +import dev.model.MenuItem; +import java.util.List; + public class MenuService { + private final MenuItemDao menuItemDao = new MenuItemDao(); public void showMenu() { - - // TODO: - // Display menu items - + List items = menuItemDao.findAll(); + System.out.println("\n===== MENU ====="); + for (MenuItem item : items) { + System.out.printf("%d. %-25s $%.2f%n", item.getId(), item.getName(), item.getPrice()); + } } + public MenuItem getItemById(int id) { + return menuItemDao.findById(id); + } } \ No newline at end of file diff --git a/src/main/java/dev/service/OrderService.java b/src/main/java/dev/service/OrderService.java index 14708f8..70004da 100644 --- a/src/main/java/dev/service/OrderService.java +++ b/src/main/java/dev/service/OrderService.java @@ -1,26 +1,99 @@ package dev.service; +import dev.dao.MenuItemDao; +import dev.dao.OrderDao; +import dev.dao.OrderDetailDao; +import dev.model.*; +import java.util.*; + public class OrderService { + private final OrderDao orderDao = new OrderDao(); + private final OrderDetailDao orderDetailDao = new OrderDetailDao(); + private final MenuItemDao menuItemDao = new MenuItemDao(); + private final Scanner scanner; + + public OrderService(Scanner scanner) { + this.scanner = scanner; + } public void placeOrder(int userId) { + List cart = new ArrayList<>(); + double total = 0; - // TODO: - // Create order + while (true) { + System.out.print("Enter menu item ID (0 to finish): "); + int itemId = scanner.nextInt(); + scanner.nextLine(); + if (itemId == 0) break; + MenuItem item = menuItemDao.findById(itemId); + if (item == null) { + System.out.println("Invalid item."); + continue; + } + + System.out.print("Enter quantity: "); + int qty = scanner.nextInt(); + scanner.nextLine(); + + OrderDetail detail = new OrderDetail(); + detail.setMenuItemId(itemId); + detail.setQuantity(qty); + detail.setPrice(item.getPrice()); + cart.add(detail); + total += item.getPrice() * qty; + } + + if (cart.isEmpty()) { + System.out.println("No items selected."); + return; + } + + Order order = new Order(); + order.setUserId(userId); + order.setTotalPrice(total); + int orderId = orderDao.save(order); + + for (OrderDetail detail : cart) { + detail.setOrderId(orderId); + orderDetailDao.save(detail); + } + + System.out.println("Order placed successfully! Order ID: " + orderId); + printReceipt(orderId); } public void printReceipt(int orderId) { + List details = orderDetailDao.findByOrderId(orderId); + MenuItemDao menuDao = new MenuItemDao(); - // TODO: - // Print order receipt + System.out.println("\n===== RECEIPT ====="); + System.out.printf("%-20s %5s %8s %8s%n", "Item", "Qty", "Unit", "Total"); + System.out.println("------------------------------------------"); + double grandTotal = 0; + for (OrderDetail d : details) { + MenuItem item = menuDao.findById(d.getMenuItemId()); + String name = (item != null) ? item.getName() : "Unknown"; + double lineTotal = d.getQuantity() * d.getPrice(); + grandTotal += lineTotal; + System.out.printf("%-20s %5d $%7.2f $%7.2f%n", name, d.getQuantity(), d.getPrice(), lineTotal); + } + System.out.println("------------------------------------------"); + System.out.printf("Total: $%.2f%n", grandTotal); } public void showOrderHistory(int userId) { - - // TODO: - // Display user's order history - + List orders = orderDao.findByUserId(userId); + if (orders.isEmpty()) { + System.out.println("No orders found."); + return; + } + System.out.println("\n===== ORDER HISTORY ====="); + for (Order o : orders) { + System.out.printf("Order #%d | Date: %s | Total: $%.2f%n", + o.getId(), o.getCreatedAt().toLocalDate(), o.getTotalPrice()); + } } } \ No newline at end of file diff --git a/src/main/java/dev/ui/ConsoleMenu.java b/src/main/java/dev/ui/ConsoleMenu.java index 663dc0c..36f589b 100644 --- a/src/main/java/dev/ui/ConsoleMenu.java +++ b/src/main/java/dev/ui/ConsoleMenu.java @@ -1,11 +1,17 @@ package dev.ui; import java.util.Scanner; +import dev.model.User; +import dev.service.AuthService; +import dev.service.MenuService; +import dev.service.OrderService; public class ConsoleMenu { - - private final Scanner scanner = - new Scanner(System.in); + private final AuthService authService = new AuthService(); + private final MenuService menuService = new MenuService(); + private final Scanner scanner = new Scanner(System.in); + private final OrderService orderService = new OrderService(scanner); + private User currentUser; public void start() { @@ -18,19 +24,19 @@ public class ConsoleMenu { System.out.println("3. Exit"); int choice = scanner.nextInt(); + scanner.nextLine(); switch (choice) { case 1: - // TODO + login(); break; case 2: - // TODO + register(); break; - case 3: - return; + case 3: { return; } default: System.out.println("Invalid choice"); @@ -40,5 +46,54 @@ public class ConsoleMenu { } } + private void login() { + System.out.print("Username: "); + String username = scanner.nextLine(); + System.out.print("Password: "); + String password = scanner.nextLine(); + currentUser = authService.login(username, password); + if (currentUser != null) { + System.out.println("Login successful!"); + mainMenu(); + } else { + System.out.println("Invalid credentials."); + } + } + + private void register() { + System.out.print("Username: "); + String username = scanner.nextLine(); + System.out.print("Password: "); + String password = scanner.nextLine(); + System.out.print("Email: "); + String email = scanner.nextLine(); + + if (authService.register(username, password, email)) { + System.out.println("Registration successful!"); + } else { + System.out.println("Registration failed."); + } + } + + private void mainMenu() { + while (true) { + System.out.println("\n===== MAIN MENU ====="); + System.out.println("1. View Menu"); + System.out.println("2. Place Order"); + System.out.println("3. View Order History"); + System.out.println("4. Logout"); + + int choice = scanner.nextInt(); + scanner.nextLine(); + + switch (choice) { + case 1 -> menuService.showMenu(); + case 2 -> orderService.placeOrder(currentUser.getId()); + case 3 -> orderService.showOrderHistory(currentUser.getId()); + case 4 -> { currentUser = null; return; } + default -> System.out.println("Invalid choice"); + } + } + } } \ No newline at end of file