From 78a1c5e6784839593042224dc693f27363fd4ce1 Mon Sep 17 00:00:00 2001 From: HadiSharifi Date: Mon, 29 Jun 2026 21:57:17 +0330 Subject: [PATCH] complete consoleMenu class --- src/main/java/dev/database/DatabaseConnection.java | 6 +++--- src/main/java/dev/service/OrderService.java | 11 +++++++---- src/main/java/dev/ui/ConsoleMenu.java | 8 ++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/dev/database/DatabaseConnection.java b/src/main/java/dev/database/DatabaseConnection.java index c49ec16..6d7af67 100644 --- a/src/main/java/dev/database/DatabaseConnection.java +++ b/src/main/java/dev/database/DatabaseConnection.java @@ -6,11 +6,11 @@ import java.sql.SQLException; 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 = "password"; private DatabaseConnection() { diff --git a/src/main/java/dev/service/OrderService.java b/src/main/java/dev/service/OrderService.java index c467914..5dbecd8 100644 --- a/src/main/java/dev/service/OrderService.java +++ b/src/main/java/dev/service/OrderService.java @@ -11,12 +11,15 @@ import java.util.*; public class OrderService { - private final MenuItemDao menuItemDao = new MenuItemDao(); - private final OrderDao orderDao = new OrderDao(); + private final MenuItemDao menuItemDao = new MenuItemDao(); + private final OrderDao orderDao = new OrderDao(); private final OrderDetailDao orderDetailDao = new OrderDetailDao(); - private final MenuService menuService = new MenuService(); - private final Scanner scanner = new Scanner(System.in); + private final MenuService menuService = new MenuService(); + private final Scanner scanner; + public OrderService(Scanner scanner) { + this.scanner = scanner; + } public void placeOrder(int userId) { menuService.showMenu(); diff --git a/src/main/java/dev/ui/ConsoleMenu.java b/src/main/java/dev/ui/ConsoleMenu.java index 1cef5c6..d58670f 100644 --- a/src/main/java/dev/ui/ConsoleMenu.java +++ b/src/main/java/dev/ui/ConsoleMenu.java @@ -9,10 +9,10 @@ import java.util.Scanner; 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 OrderService orderService = new OrderService(); + private final Scanner scanner = new Scanner(System.in); + private final AuthService authService = new AuthService(); + private final MenuService menuService = new MenuService(); + private final OrderService orderService = new OrderService(scanner); public void start() { while (true) {