diff --git a/database.sql b/database.sql
index 2169346..f1a5527 100644
--- a/database.sql
+++ b/database.sql
@@ -1,141 +1,56 @@
-- 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.
+
+DROP TABLE IF EXISTS order_details CASCADE;
+DROP TABLE IF EXISTS orders CASCADE;
+DROP TABLE IF EXISTS menu_items CASCADE;
+DROP TABLE IF EXISTS users CASCADE;
-
--- =======================================================
--- 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 users (
+ id SERIAL PRIMARY KEY,
+ username VARCHAR(50) UNIQUE NOT NULL,
+ password VARCHAR(255) NOT NULL,
+ email VARCHAR(100)
+);
-
--- =======================================================
--- 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 ...
+CREATE TABLE menu_items (
+ id SERIAL PRIMARY KEY,
+ name VARCHAR(100) NOT NULL,
+ description TEXT,
+ price NUMERIC(10, 2) NOT NULL CHECK (price > 0),
+ category VARCHAR(50)
+);
-
--- =======================================================
--- 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 ...
+CREATE TABLE orders (
+ id SERIAL PRIMARY KEY,
+ user_id INT NOT NULL,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ total_price NUMERIC(10, 2) NOT NULL DEFAULT 0.00,
+ CONSTRAINT fk_orders_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+);
-
--- =======================================================
--- 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 ...
+CREATE TABLE order_details (
+ id SERIAL PRIMARY KEY,
+ order_id INT NOT NULL,
+ menu_item_id INT NOT NULL,
+ quantity INT NOT NULL CHECK (quantity > 0),
+ price_at_purchase NUMERIC(10, 2) NOT NULL,
+ CONSTRAINT fk_details_order FOREIGN KEY (order_id) REFERENCES orders(id) ON DELETE CASCADE,
+ CONSTRAINT fk_details_menu_item FOREIGN KEY (menu_item_id) REFERENCES menu_items(id) ON DELETE CASCADE
+);
-
--- =======================================================
--- INITIAL MENU DATA
--- =======================================================
---
--- Insert at least 3 food or drink items.
---
--- Example categories:
--- - Pizza
--- - Burger
--- - Pasta
--- - Drink
---
--- INSERT INTO ...
+INSERT INTO menu_items (name, description, price, category) VALUES
+ ('Pizza', 'Delicious cheese and tomato stone-baked pizza', 10.00, 'Pizza'),
+ ('Burger', 'Juicy beef patty with lettuce, tomato, and house sauce', 8.00, 'Burger'),
+ ('Pasta', 'Rich creamy Alfredo pasta with fresh herbs', 12.00, 'Pasta'),
+ ('Soda', 'Chilled refreshing carbonated beverage', 2.50, 'Drink');
-
--- =======================================================
--- 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
+SELECT * FROM users;
+SELECT * FROM menu_items;
+SELECT * FROM orders;
+SELECT * FROM order_details;
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 028ca50..0390277 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd">
-
4.0.0
dev
@@ -16,7 +15,7 @@
23
UTF-8
- 42.7.8
+ 42.7.11
@@ -29,4 +28,15 @@
+
+
+ not-the-central-repo
+ Bypass Mirror Repo
+ https://repo.maven.apache.org/maven2/
+
+ false
+
+
+
+
\ 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..53bcdc1 100644
--- a/src/main/java/dev/dao/MenuItemDao.java
+++ b/src/main/java/dev/dao/MenuItemDao.java
@@ -1,25 +1,62 @@
package dev.dao;
+import dev.database.DatabaseConnection;
import dev.model.MenuItem;
-
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.List;
public class MenuItemDao {
public List