From 8e436680cc054d3caec2f726840d0e1f9159d403 Mon Sep 17 00:00:00 2001 From: Phung Huu Thanh <102614541+phuuthanh2003@users.noreply.github.com> Date: Mon, 26 Aug 2024 01:01:50 +0700 Subject: [PATCH 1/4] a --- .github/workflows/build.yml | 15 ++- db/Dockerfile | 21 ++- db/init.sql | 4 +- db/init2.sql | 254 ++++++++++++++++++++++++++++++++++++ docker-compose.yml | 9 +- 5 files changed, 277 insertions(+), 26 deletions(-) create mode 100644 db/init2.sql diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee3dad8..2e49674 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,13 +11,13 @@ jobs: name: Run Tests runs-on: ubuntu-latest services: - sqlserver: - image: mcr.microsoft.com/mssql/server:2019-latest + mysql: + image: mysql:latest ports: - - "1433:1433" + - "3306:3306" env: - ACCEPT_EULA: Y - SA_PASSWORD: ${{ secrets.SQL_SA_PASSWORD }} + MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' + MYSQL_DATABASE: DB_AUCTION MSSQL_PID: Express steps: @@ -30,9 +30,12 @@ jobs: java-version: '17' distribution: 'temurin' + - name: Set up MySQL client + run: sudo apt-get install -y mysql-client + - name: Execute init.sql run: | - sqlcmd -S localhost -U sa -P ${{ secrets.SQL_SA_PASSWORD }} -i db/init.sql + mysql -h localhost -u root DB_AUCTION < db/init.sql - name: Run Unit Tests run: mvn test diff --git a/db/Dockerfile b/db/Dockerfile index f036ab0..59d46a0 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,14 +1,13 @@ -# Dùng official SQL Server 2019 image của Microsoft -FROM mcr.microsoft.com/mssql/server:2019-latest +# Use the official MySQL image +FROM mysql:latest -# Copy the SQL script vào container -COPY init.sql /usr/src/app/init.sql +# Set environment variables for MySQL +ENV MYSQL_ALLOW_EMPTY_PASSWORD yes +ENV MYSQL_DATABASE=DB_AUCTION +ENV MYSQL_COLLATION=utf8mb4_general_ci -# Chạy lệnh trong file sql -RUN /opt/mssql/bin/sqlservr & sleep 30 \ - && /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Thanhth@nh1 -i /usr/src/app/init.sql \ - && pkill sqlservr +# Copy the SQL script into the container +COPY init2.sql /docker-entrypoint-initdb.d/init2.sql -EXPOSE 1433 -# Khởi động sql server -CMD ["/opt/mssql/bin/sqlservr"] \ No newline at end of file +# Expose MySQL port +EXPOSE 3306 diff --git a/db/init.sql b/db/init.sql index df071df..1372f28 100644 --- a/db/init.sql +++ b/db/init.sql @@ -268,4 +268,6 @@ CREATE TABLE [dbo].[request_approval]( INSERT INTO [dbo].[request_approval] ([desired_price], [is_confirm], [note], [request_time], [response_time], [state], [valuation], [jewelry_id], [user_id_respond], [user_id_send], [staff_id]) VALUES -(1000000, 1, 'Nhẫn kim cương', '2024-05-01 17:30:00', '2024-05-01 17:30:00', 'ACTIVE', 1000000, 1, 1, 2, 1); \ No newline at end of file +(1000000, 1, 'Nhẫn kim cương', '2024-05-01 17:30:00', '2024-05-01 17:30:00', 'ACTIVE', 1000000, 1, 1, 2, 1); + + diff --git a/db/init2.sql b/db/init2.sql new file mode 100644 index 0000000..8f7d256 --- /dev/null +++ b/db/init2.sql @@ -0,0 +1,254 @@ +CREATE DATABASE IF NOT EXISTS DB_AUCTION DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;; +USE DB_AUCTION; + +-- Create the 'bank' table +CREATE TABLE bank ( + id INT PRIMARY KEY, + bank_name VARCHAR(100), + logo VARCHAR(255), + trading_name VARCHAR(100) +); + +-- Insert data into the 'bank' table +INSERT INTO bank (id, bank_name, logo, trading_name) +VALUES + (1, 'Ngân hàng Nông nghiệp và Phát triển Nông thôn Việt Nam', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/Agribank-logo-01-e1676880269189-300x124.png', 'Agribank'), + (2, 'Ngân hàng Xây dựng', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/CBbank-logo-1-01-e1585971864974-300x221.png', 'CB'), + (3, 'Ngân hàng Đại Dương', 'https://inhoangkien.vn/wp-content/uploads/2020/04/Oceanbank-logo-01-300x183.png', + 'Oceanbank'), + (4, 'Ngân hàng Dầu Khí Toàn Cầu', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/GPBANK-logo-01-300x183.png', 'GPBank'), + (5, 'Ngân hàng Đầu tư và Phát triển Việt Nam', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/BIDV-01-e1585972482948-300x126.png', 'BIDV'), + (6, 'Ngân hàng Công Thương Việt Nam', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/Vietinbank-01-e1585972297613-600x287.png', 'VietinBank'), + (7, 'Ngân hàng Ngoại thương Việt Nam', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/Vietcombank-01-e1585972386757-300x134.png', 'Vietcombank'), + (8, 'Ngân hàng Quân đội', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/logo-ngan-hang-MB-01-e1585972573949-300x193.png', 'MBBank'), + (9, 'Ngân hàng Kỹ Thương Việt Nam', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/Techcombank-01-e1585972434854-300x77.png', 'Techcombank'), + (10, 'Ngân hàng Á Châu', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/logo-ngan-hang-ACB-PNG-e1585972709842-300x148.png', 'ACB'); + +-- Create the 'jewelry_category' table +CREATE TABLE jewelry_category ( + id INT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(100) +); + +-- Insert data into the 'jewelry_category' table +INSERT INTO jewelry_category (name) +VALUES + ('Dây chuyền'), + ('Nhẫn'), + ('Vòng tay'), + ('Hoa tai'), + ('Mặt dây chuyền'); + +-- Create the 'user' table +CREATE TABLE `user` ( + id INT AUTO_INCREMENT PRIMARY KEY, + cccd VARCHAR(20) NOT NULL, + cccd_first TEXT NOT NULL, + cccd_last TEXT NOT NULL, + cccd_from VARCHAR(50) NOT NULL, + address VARCHAR(50) NOT NULL, + avatar TEXT, + bank_account_name VARCHAR(30) NOT NULL, + bank_account_number VARCHAR(30) NOT NULL, + city VARCHAR(50) NOT NULL, + district VARCHAR(50) NOT NULL, + email VARCHAR(50) NOT NULL, + first_name VARCHAR(50) NOT NULL, + last_name VARCHAR(50) NOT NULL, + password VARCHAR(100), + phone VARCHAR(15) NOT NULL, + role VARCHAR(255), + state VARCHAR(10) NOT NULL, + username VARCHAR(50) NOT NULL, + ward VARCHAR(50) NOT NULL, + year_of_birth VARCHAR(4) NOT NULL, + bank_id INT, + register_date DATETIME, + ban_reason VARCHAR(255) +); + +-- Insert data into the 'user' table +INSERT INTO `user` +(cccd, address, avatar, city, email, first_name, last_name, password, phone, district, ward, state, username, year_of_birth, role, bank_id, bank_account_number, bank_account_name, register_date, cccd_first, cccd_last, cccd_from, ban_reason) +VALUES + ('011234567890', '1 Lý Thường Kiệt', + 'https://scontent.fsgn2-7.fna.fbcdn.net/v/t39.30808-6/438275285_1101091104487039_4035794765477072253_n.jpg?_nc_cat=108&ccb=1-7&_nc_sid=5f2048&_nc_ohc=7MHTOamLKXgQ7kNvgGdad4i&_nc_ht=scontent.fsgn2-7.fna&oh=00_AYDZ0L0Y3_1M_tK5YBX-b1PhjuTPFeLod8Jz1UhW3t_Gkg&oe=6665416E', + 'Lâm Đồng', 'phuuthanh2003@gmail.com', 'Phùng', 'Thành', + '$2a$12$j/1n5Pjv4JgzG76ZG0hyH.MD6ftohJNbjuZjRHQFt31Ta/jViwKQ2', '0912345670', 'Hà Nội', 'Hoang', 'ACTIVE', + 'phuuthanh2003', '1985', 'ADMIN', 7, '1030293193991', 'PHUNG HUU THANH', '2024-05-01 17:30:00', + 'https://firebasestorage.googleapis.com/v0/b/auction-image-aecbe.appspot.com/o/images-cccd%2F49a92919-a92a-4d32-9f70-db2f641ccb51?alt=media&token=f50f52dc-8954-4a18-845e-16e855b076bb', + 'https://firebasestorage.googleapis.com/v0/b/auction-image-aecbe.appspot.com/o/images-cccd%2F79f370d3-d4ea-4690-903e-88a99ade8d38?alt=media&token=b728a278-36fd-4e96-bd64-f34a8b03e5a1', + 'CA MAU', ''); + +-- Create the 'jewelry' table +CREATE TABLE jewelry ( + id INT AUTO_INCREMENT PRIMARY KEY, + brand VARCHAR(20) NOT NULL, + description TEXT NOT NULL, + material VARCHAR(20) NOT NULL, + name VARCHAR(50) NOT NULL, + buy_now_price FLOAT, + state VARCHAR(20) NOT NULL, + weight FLOAT NOT NULL, + category_id INT, + user_id INT, + is_holding BOOLEAN, + received_date DATETIME, + delivery_date DATETIME, + create_date DATETIME +); + +-- Insert data into the 'jewelry' table +INSERT INTO jewelry +(brand, description, material, name, buy_now_price, state, weight, category_id, user_id, is_holding) +VALUES + ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN ĐÍNH HÔN KIM CƯƠNG ENR3111W', 44500000, 'ACTIVE', 15.5, 2, 1, 1), + ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN CƯỚI KIM CƯƠNG IWR163', 5000000, 'ACTIVE', 8.2, 2, 1, 1), + ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN KIM CƯƠNG FDR0257', 41130000, 'ACTIVE', 20.1, 2, 1, 1), + ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN KIM CƯƠNG DJR397-22', 37000000, 'ACTIVE', 10.0, 2, 1, 1), + ('Fine Jewelry', 'Dây chuyền kim cương', 'GOLD', 'Dây chuyền kim cương Y', 18000000, 'ACTIVE', 6.9, 1, 15, 1); + +-- Create table `auction` +CREATE TABLE `auction` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `deposit` FLOAT NOT NULL, + `description` TEXT NOT NULL, + `end_date` DATETIME(6) NOT NULL, + `first_price` FLOAT NOT NULL, + `last_price` FLOAT NULL, + `name` VARCHAR(50) NOT NULL, + `participation_fee` FLOAT NOT NULL, + `price_step` FLOAT NOT NULL, + `start_date` DATETIME(6) NOT NULL, + `state` VARCHAR(255) NULL, + `jewelry_id` INT NULL, + `staff_id` INT NULL, + `create_date` DATETIME(6) NULL, + `end_date_stored` DATETIME(6) NULL +); + +-- Insert data into `auction` +INSERT INTO `auction` (`deposit`, `description`, `first_price`, `end_date`, `last_price`, `name`, `participation_fee`, `price_step`, `start_date`, `state`, `jewelry_id`, `staff_id`, `create_date`) +VALUES + (10000000, 'NHẪN ĐÍNH HÔN KIM CƯƠNG ENR3111W', 44500000, '2023-05-19 14:00:00', 70500000, 'Đấu giá nhẫn kim cương ENR3111W', 500000, 1000000, '2023-05-19 10:00:00', 'FINISHED', 1, 1, '2023-05-19 01:00:00'), + (10000000, 'NHẪN CƯỚI KIM CƯƠNG IWR163', 5000000, '2024-05-25 21:00:00', NULL, 'Đấu giá NHẪN CƯỚI KIM CƯƠNG IWR163', 100000, 2000000, '2024-05-25 22:00:00', 'ONGOING', 2, 1, '2024-05-25 20:00:00'); + +-- Create table `auction_history` +CREATE TABLE `auction_history` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `price_given` FLOAT NOT NULL, + `time` DATETIME(6) NOT NULL, + `auction_id` INT NULL, + `user_id` INT NULL, + `bid_code` VARCHAR(20) NOT NULL, + `state` VARCHAR(255) NULL +); + +-- Insert data into `auction_history` +INSERT INTO `auction_history` (`price_given`, `time`, `auction_id`, `user_id`, `bid_code`, `state`) +VALUES + (2550750, '2024-05-01 17:30:00', 1, 1, 'BAS12', 'ACTIVE'), + (1000750, '2024-05-12 19:30:00', 2, 1, 'BAS22', 'ACTIVE'); + +-- Create table `token` +CREATE TABLE `token` ( + `id` BIGINT AUTO_INCREMENT PRIMARY KEY, + `created_time` DATETIME(6) NULL, + `device_info` VARCHAR(255) NULL, + `expired` BOOLEAN NOT NULL, + `ip_address` VARCHAR(255) NULL, + `refresh_token` VARCHAR(255) NULL, + `revoked` BOOLEAN NOT NULL, + `token` VARCHAR(255) NULL, + `token_type` VARCHAR(255) NULL, + `user_id` INT NULL +); + +-- Create table `image` +CREATE TABLE `image` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `data` TEXT NULL, + `icon` BOOLEAN NULL, + `link` VARCHAR(255) NULL, + `jewelry_id` INT NULL +); + +-- Insert data into `image` +INSERT INTO `image` (`data`, `icon`, `link`, `jewelry_id`) +VALUES + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/1.jpg', TRUE, '', 1), + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2.jpg', FALSE, '', 1), + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2-1.jpg', TRUE, '', 2), + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2-2.jpg', FALSE, '', 2), + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/6-1.jpg', TRUE, '', 3), + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/9-1.jpg', TRUE, '', 4); + +-- Create table `transaction` +CREATE TABLE `transaction` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `create_date` DATETIME(6) NOT NULL, + `fees_incurred` FLOAT NOT NULL, + `payment_method` VARCHAR(20) NULL, + `payment_time` DATETIME(6) NULL, + `transaction_state` VARCHAR(255) NOT NULL, + `total_price` FLOAT NOT NULL, + `transaction_type` VARCHAR(255) NOT NULL, + `auction_id` INT NULL, + `user_id` INT NULL, + `transaction_code` VARCHAR(255) NULL, + `bank_code` VARCHAR(255) NULL +); + +-- Insert data into `transaction` +INSERT INTO `transaction` (`create_date`, `fees_incurred`, `payment_method`, `payment_time`, `transaction_state`, `total_price`, `transaction_type`, `auction_id`, `user_id`, `transaction_code`, `bank_code`) +VALUES + ('2024-05-01 17:30:00', 100000, 'BANKING', '2024-05-01 17:30:00', 'SUCCEED', 1000000, 'REGISTRATION', 1, 1, 'BAS12', 'AGB'), + ('2024-05-12 19:30:00', 200000, 'BANKING', '2024-05-12 19:30:00', 'SUCCEED', 2000000, 'REGISTRATION', 2, 1, 'BAS22', 'NCB'); + +-- Create table `auction_registration` +CREATE TABLE `auction_registration` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `auction_registration_state` VARCHAR(255) NOT NULL, + `registration_date` DATETIME(6) NOT NULL, + `registration_fee` FLOAT NOT NULL, + `auction_id` INT NULL, + `transaction_id` INT NULL, + `user_id` INT NULL, + `kick_reason` TEXT NULL +); + +-- Insert data into `auction_registration` +INSERT INTO `auction_registration` (`auction_registration_state`, `registration_date`, `registration_fee`, `auction_id`, `transaction_id`, `user_id`) +VALUES + ('VALID', '2024-05-01 17:30:00', 1000000, 1, 1, 1), + ('VALID', '2024-05-12 19:30:00', 2000000, 2, 1, 1); + +-- Create table `request_approval` +CREATE TABLE `request_approval` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `desired_price` FLOAT NOT NULL, + `is_confirm` BOOLEAN NULL, + `note` TEXT NULL, + `request_time` DATETIME(6) NOT NULL, + `response_time` DATETIME(6) NULL, + `state` VARCHAR(255) NULL, + `valuation` FLOAT NULL, + `jewelry_id` INT NULL, + `user_id_respond` INT NULL, + `user_id_send` INT NULL, + `staff_id` INT NULL +); + +-- Insert data into `request_approval` +INSERT INTO `request_approval` (`desired_price`, `is_confirm`, `note`, `request_time`, `response_time`, `state`, `valuation`, `jewelry_id`, `user_id_respond`, `user_id_send`, `staff_id`) +VALUES + (1000000, TRUE, 'Nhẫn kim cương', '2024-05-01 17:30:00', '2024-05-01 17:30:00', 'ACTIVE', 1000000, 1, 1, 2, 1); diff --git a/docker-compose.yml b/docker-compose.yml index 6601745..0ac8b9d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,10 +4,7 @@ services: auction-database: image: ghcr.io/phuuthanh2003/auction-database:latest ports: - - "1433:1433" - environment: - SA_PASSWORD: "Thanhth@nh1" - ACCEPT_EULA: "Y" + - "3306:3306" auction-api: image: ghcr.io/phuuthanh2003/auction-api:latest @@ -15,7 +12,3 @@ services: - "8080:8080" depends_on: - auction-database - environment: - SPRING_DATASOURCE_URL: jdbc:sqlserver://auction-database:1433;encrypt=true;trustServerCertificate=true;databaseName=DB_AUCTION; - SPRING_DATASOURCE_USERNAME: sa - SPRING_DATASOURCE_PASSWORD: Thanhth@nh1 From da5622ff423d8632acebca8ce1cb3b89052aed53 Mon Sep 17 00:00:00 2001 From: Phung Huu Thanh <102614541+phuuthanh2003@users.noreply.github.com> Date: Mon, 26 Aug 2024 02:14:20 +0700 Subject: [PATCH 2/4] fix bugs --- .github/workflows/build.yml | 37 -- db/init.sql | 485 +++++++++++----------- db/init2.sql | 254 ----------- docker-compose.yml | 4 +- src/main/resources/application.properties | 2 +- 5 files changed, 236 insertions(+), 546 deletions(-) delete mode 100644 db/init2.sql diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e49674..03402b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,43 +10,6 @@ jobs: run-tests: name: Run Tests runs-on: ubuntu-latest - services: - mysql: - image: mysql:latest - ports: - - "3306:3306" - env: - MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' - MYSQL_DATABASE: DB_AUCTION - MSSQL_PID: Express - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Set up JDK 17 - uses: actions/setup-java@v2 - with: - java-version: '17' - distribution: 'temurin' - - - name: Set up MySQL client - run: sudo apt-get install -y mysql-client - - - name: Execute init.sql - run: | - mysql -h localhost -u root DB_AUCTION < db/init.sql - - - name: Run Unit Tests - run: mvn test - - - name: Run Integration Tests - run: mvn verify - - build: - name: Build - needs: run-tests - runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/db/init.sql b/db/init.sql index 1372f28..6f353fb 100644 --- a/db/init.sql +++ b/db/init.sql @@ -1,273 +1,254 @@ -USE master; -GO - -IF NOT EXISTS (SELECT [name] - FROM sys.databases - WHERE [name] = N'DB_AUCTION') -CREATE DATABASE DB_AUCTION; -GO - +CREATE DATABASE IF NOT EXISTS DB_AUCTION DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;; USE DB_AUCTION; -GO - -CREATE TABLE bank -( - id INT PRIMARY KEY, - bank_name NVARCHAR(100), - logo NVARCHAR(255), - trading_name NVARCHAR(100) +-- Create the 'bank' table +CREATE TABLE bank ( + id INT PRIMARY KEY, + bank_name VARCHAR(100), + logo LONGTEXT, + trading_name VARCHAR(100) ); -- Insert data into the 'bank' table INSERT INTO bank (id, bank_name, logo, trading_name) -VALUES (1, N'Ngân hàng Nông nghiệp và Phát triển Nông thôn Việt Nam', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/Agribank-logo-01-e1676880269189-300x124.png', 'Agribank'), - (2, N'Ngân hàng Xây dựng', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/CBbank-logo-1-01-e1585971864974-300x221.png', 'CB'), - (3, N'Ngân hàng Đại Dương', 'https://inhoangkien.vn/wp-content/uploads/2020/04/Oceanbank-logo-01-300x183.png', - 'Oceanbank'), - (4, N'Ngân hàng Dầu Khí Toàn Cầu', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/GPBANK-logo-01-300x183.png', 'GPBank'), - (5, N'Ngân hàng Đầu tư và Phát triển Việt Nam', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/BIDV-01-e1585972482948-300x126.png', 'BIDV'), - (6, N'Ngân hàng Công Thương Việt Nam', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/Vietinbank-01-e1585972297613-600x287.png', 'VietinBank'), - (7, N'Ngân hàng Ngoại thương Việt Nam', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/Vietcombank-01-e1585972386757-300x134.png', 'Vietcombank'), - (8, N'Ngân hàng Quân đội', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/logo-ngan-hang-MB-01-e1585972573949-300x193.png', 'MBBank'), - (9, N'Ngân hàng Kỹ Thương Việt Nam', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/Techcombank-01-e1585972434854-300x77.png', 'Techcombank'), - (10, N'Ngân hàng Á Châu', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/logo-ngan-hang-ACB-PNG-e1585972709842-300x148.png', 'ACB'); - --- Create the 'jewelry_category' table if it does not exist - -CREATE TABLE jewelry_category -( - id INT PRIMARY KEY IDENTITY, - name NVARCHAR(100) +VALUES + (1, 'Ngân hàng Nông nghiệp và Phát triển Nông thôn Việt Nam', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/Agribank-logo-01-e1676880269189-300x124.png', 'Agribank'), + (2, 'Ngân hàng Xây dựng', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/CBbank-logo-1-01-e1585971864974-300x221.png', 'CB'), + (3, 'Ngân hàng Đại Dương', 'https://inhoangkien.vn/wp-content/uploads/2020/04/Oceanbank-logo-01-300x183.png', + 'Oceanbank'), + (4, 'Ngân hàng Dầu Khí Toàn Cầu', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/GPBANK-logo-01-300x183.png', 'GPBank'), + (5, 'Ngân hàng Đầu tư và Phát triển Việt Nam', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/BIDV-01-e1585972482948-300x126.png', 'BIDV'), + (6, 'Ngân hàng Công Thương Việt Nam', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/Vietinbank-01-e1585972297613-600x287.png', 'VietinBank'), + (7, 'Ngân hàng Ngoại thương Việt Nam', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/Vietcombank-01-e1585972386757-300x134.png', 'Vietcombank'), + (8, 'Ngân hàng Quân đội', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/logo-ngan-hang-MB-01-e1585972573949-300x193.png', 'MBBank'), + (9, 'Ngân hàng Kỹ Thương Việt Nam', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/Techcombank-01-e1585972434854-300x77.png', 'Techcombank'), + (10, 'Ngân hàng Á Châu', + 'https://inhoangkien.vn/wp-content/uploads/2020/04/logo-ngan-hang-ACB-PNG-e1585972709842-300x148.png', 'ACB'); + +-- Create the 'jewelry_category' table +CREATE TABLE jewelry_category ( + id INT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(100) ); -- Insert data into the 'jewelry_category' table INSERT INTO jewelry_category (name) -VALUES (N'Dây chuyền'), - (N'Nhẫn'), - (N'Vòng tay'), - (N'Hoa tai'), - (N'Mặt dây chuyền'); - --- Create the user table if it does not exist - -CREATE TABLE [dbo].[user] -( - [id] [int] IDENTITY (1,1) NOT NULL, - [cccd] [varchar](20) NOT NULL, - [cccd_first] [varchar](MAX) NOT NULL, - [cccd_last] [varchar](MAX) NOT NULL, - [cccd_from] [nvarchar](50) NOT NULL, - [address] [nvarchar](50) NOT NULL, - [avatar] [varchar](max) NULL, - [bank_account_name] [varchar](30) NOT NULL, - [bank_account_number] [varchar](30) NOT NULL, - [city] [nvarchar](50) NOT NULL, - [district] [nvarchar](50) NOT NULL, - [email] [varchar](50) NOT NULL, - [first_name] [nvarchar](50) NOT NULL, - [last_name] [nvarchar](50) NOT NULL, - [password] [nvarchar](100) NULL, - [phone] [varchar](15) NOT NULL, - [role] [varchar](255) NULL, - [state] [varchar](10) NOT NULL, - [username] [varchar](50) NOT NULL, - [ward] [nvarchar](50) NOT NULL, - [year_of_birth] [varchar](4) NOT NULL, - [bank_id] [int] NULL, - [register_date] [datetime2](6) NULL, - [ban_reason] [varchar](255) NULL -) - --- Insert data into the user table - INSERT INTO [dbo].[user] -([cccd], [address], [avatar], [city], [email], [first_name], [last_name], [password], [phone], [district], [ward], - [state], [username], [year_of_birth], [role], [bank_id], [bank_account_number], [bank_account_name], [register_date], [cccd_first], [cccd_last], [cccd_from], [ban_reason]) - VALUES ('011234567890', N'1 Lý Thường Kiệt', - 'https://scontent.fsgn2-7.fna.fbcdn.net/v/t39.30808-6/438275285_1101091104487039_4035794765477072253_n.jpg?_nc_cat=108&ccb=1-7&_nc_sid=5f2048&_nc_ohc=7MHTOamLKXgQ7kNvgGdad4i&_nc_ht=scontent.fsgn2-7.fna&oh=00_AYDZ0L0Y3_1M_tK5YBX-b1PhjuTPFeLod8Jz1UhW3t_Gkg&oe=6665416E', - N'Lâm Đồng', 'phuuthanh2003@gmail.com', N'Phùng', N'Thành', - '$2a$12$j/1n5Pjv4JgzG76ZG0hyH.MD6ftohJNbjuZjRHQFt31Ta/jViwKQ2', '0912345670', N'Hà Nội', N'Hoang', 'ACTIVE', - 'phuuthanh2003', 1985, 'ADMIN', 7, '1030293193991', 'PHUNG HUU THANH', '2024-05-01 17:30:00', 'https://firebasestorage.googleapis.com/v0/b/auction-image-aecbe.appspot.com/o/images-cccd%2F49a92919-a92a-4d32-9f70-db2f641ccb51?alt=media&token=f50f52dc-8954-4a18-845e-16e855b076bb' - , 'https://firebasestorage.googleapis.com/v0/b/auction-image-aecbe.appspot.com/o/images-cccd%2F79f370d3-d4ea-4690-903e-88a99ade8d38?alt=media&token=b728a278-36fd-4e96-bd64-f34a8b03e5a1', - 'CA MAU', ''); - - -CREATE TABLE [dbo].[jewelry] -( - [id] [int] IDENTITY (1,1) NOT NULL, - [brand] [nvarchar](20) NOT NULL, - [description] [nvarchar](max) NOT NULL, - [material] [nvarchar](20) NOT NULL, - [name] [nvarchar](50) NOT NULL, - [buy_now_price] [float] NULL, - [state] [nvarchar](20) NOT NULL, - [weight] [float] NOT NULL, - [category_id] [int] NULL, - [user_id] [int] NULL, - [is_holding] [bit] NULL, - [received_date] [datetime2](6) NULL, - [delivery_date] [datetime2](6) NULL, - [create_date] [datetime2](6) NULL -) - - INSERT INTO [dbo].[jewelry] -([brand], [description], [material], [name], [buy_now_price], [state], [weight], [category_id], [user_id], [is_holding]) - VALUES (N'DOJI', N'Nhẫn đính hôn bằng kim cương.', 'SILVER', N'NHẪN ĐÍNH HÔN KIM CƯƠNG ENR3111W', 44500000, 'ACTIVE', - 15.5, 2, 1, 1), - (N'DOJI', N'Nhẫn đính hôn bằng kim cương.', 'SILVER', N'NHẪN CƯỚI KIM CƯƠNG IWR163', 5000000, 'ACTIVE', 8.2, 2, - 1, 1), - (N'DOJI', N'Nhẫn đính hôn bằng kim cương.', 'SILVER', N'NHẪN KIM CƯƠNG FDR0257', 41130000, 'ACTIVE', 20.1, 2, 1, 1), - (N'DOJI', N'Nhẫn đính hôn bằng kim cương.', 'SILVER', N'NHẪN KIM CƯƠNG DJR397-22', 37000000, 'ACTIVE', 10.0, 2, - 1, 1), - (N'Fine Jewelry', N'Dây chuyền kim cương', 'GOLD', N'Dây chuyền kim cương Y', 18000000, 'ACTIVE', 6.9, 1, 15, 1); - -CREATE TABLE [dbo].[auction] -( - [id] [int] IDENTITY (1,1) NOT NULL, - [deposit] [float] NOT NULL, - [description] [nvarchar](max) NOT NULL, - [end_date] [datetime2](6) NOT NULL, - [first_price] [float] NOT NULL, - [last_price] [float] NULL, - [name] [nvarchar](50) NOT NULL, - [participation_fee] [float] NOT NULL, - [price_step] [float] NOT NULL, - [start_date] [datetime2](6) NOT NULL, - [state] [varchar](255) NULL, - [jewelry_id] [int] NULL, - [staff_id] [int] NULL, - [create_date] [datetime2](6) NULL, - [end_date_stored] [datetime2](6) NULL -) +VALUES + ('Dây chuyền'), + ('Nhẫn'), + ('Vòng tay'), + ('Hoa tai'), + ('Mặt dây chuyền'); + +-- Create the 'user' table +CREATE TABLE `user` ( + id INT AUTO_INCREMENT PRIMARY KEY, + cccd VARCHAR(20) NOT NULL, + cccd_first LONGTEXT NOT NULL, + cccd_last LONGTEXT NOT NULL, + cccd_from VARCHAR(50) NOT NULL, + address VARCHAR(50) NOT NULL, + avatar LONGTEXT, + bank_account_name VARCHAR(30) NOT NULL, + bank_account_number VARCHAR(30) NOT NULL, + city VARCHAR(50) NOT NULL, + district VARCHAR(50) NOT NULL, + email VARCHAR(50) NOT NULL, + first_name VARCHAR(50) NOT NULL, + last_name VARCHAR(50) NOT NULL, + password VARCHAR(100), + phone VARCHAR(15) NOT NULL, + role VARCHAR(255), + state VARCHAR(10) NOT NULL, + username VARCHAR(50) NOT NULL, + ward VARCHAR(50) NOT NULL, + year_of_birth VARCHAR(4) NOT NULL, + bank_id INT, + register_date DATETIME, + ban_reason VARCHAR(255) +); - INSERT INTO [dbo].[auction] -([deposit], [description], [first_price], [end_date], [last_price], [name], [participation_fee], [price_step], - [start_date], [state], [jewelry_id], [staff_id], [create_date]) - VALUES (10000000, N'NHẪN ĐÍNH HÔN KIM CƯƠNG ENR3111W', 44500000, '2023-05-19 14:00:00', 70500000, - N'Đấu giá nhẫn kim cương ENR3111W', 500000, 1000000, '2023-05-19 10:00:00', 'FINISHED', 1, 1, '2023-05-19 01:00:00'), - (10000000, N'NHẪN CƯỚI KIM CƯƠNG IWR163', 5000000, '2024-05-25 21:00:00', NULL, - N'Đấu giá NHẪN CƯỚI KIM CƯƠNG IWR163', 100000, 2000000, '2024-05-25 22:00:00', 'ONGOING', 2, 1, '2024-05-25 20:00:00'); +-- Insert data into the 'user' table +INSERT INTO `user` +(cccd, address, avatar, city, email, first_name, last_name, password, phone, district, ward, state, username, year_of_birth, role, bank_id, bank_account_number, bank_account_name, register_date, cccd_first, cccd_last, cccd_from, ban_reason) +VALUES + ('011234567890', '1 Lý Thường Kiệt', + 'https://scontent.fsgn2-7.fna.fbcdn.net/v/t39.30808-6/438275285_1101091104487039_4035794765477072253_n.jpg?_nc_cat=108&ccb=1-7&_nc_sid=5f2048&_nc_ohc=7MHTOamLKXgQ7kNvgGdad4i&_nc_ht=scontent.fsgn2-7.fna&oh=00_AYDZ0L0Y3_1M_tK5YBX-b1PhjuTPFeLod8Jz1UhW3t_Gkg&oe=6665416E', + 'Lâm Đồng', 'phuuthanh2003@gmail.com', 'Phùng', 'Thành', + '$2a$12$j/1n5Pjv4JgzG76ZG0hyH.MD6ftohJNbjuZjRHQFt31Ta/jViwKQ2', '0912345670', 'Hà Nội', 'Hoang', 'ACTIVE', + 'phuuthanh2003', '1985', 'ADMIN', 7, '1030293193991', 'PHUNG HUU THANH', '2024-05-01 17:30:00', + 'https://firebasestorage.googleapis.com/v0/b/auction-image-aecbe.appspot.com/o/images-cccd%2F49a92919-a92a-4d32-9f70-db2f641ccb51?alt=media&token=f50f52dc-8954-4a18-845e-16e855b076bb', + 'https://firebasestorage.googleapis.com/v0/b/auction-image-aecbe.appspot.com/o/images-cccd%2F79f370d3-d4ea-4690-903e-88a99ade8d38?alt=media&token=b728a278-36fd-4e96-bd64-f34a8b03e5a1', + 'CA MAU', ''); + +-- Create the 'jewelry' table +CREATE TABLE jewelry ( + id INT AUTO_INCREMENT PRIMARY KEY, + brand VARCHAR(20) NOT NULL, + description TEXT NOT NULL, + material VARCHAR(20) NOT NULL, + name VARCHAR(50) NOT NULL, + buy_now_price FLOAT, + state VARCHAR(20) NOT NULL, + weight FLOAT NOT NULL, + category_id INT, + user_id INT, + is_holding BOOLEAN, + received_date DATETIME, + delivery_date DATETIME, + create_date DATETIME +); +-- Insert data into the 'jewelry' table +INSERT INTO jewelry +(brand, description, material, name, buy_now_price, state, weight, category_id, user_id, is_holding) +VALUES + ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN ĐÍNH HÔN KIM CƯƠNG ENR3111W', 44500000, 'ACTIVE', 15.5, 2, 1, 1), + ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN CƯỚI KIM CƯƠNG IWR163', 5000000, 'ACTIVE', 8.2, 2, 1, 1), + ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN KIM CƯƠNG FDR0257', 41130000, 'ACTIVE', 20.1, 2, 1, 1), + ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN KIM CƯƠNG DJR397-22', 37000000, 'ACTIVE', 10.0, 2, 1, 1), + ('Fine Jewelry', 'Dây chuyền kim cương', 'GOLD', 'Dây chuyền kim cương Y', 18000000, 'ACTIVE', 6.9, 1, 15, 1); + +-- Create table `auction` +CREATE TABLE `auction` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `deposit` FLOAT NOT NULL, + `description` LONGTEXT NOT NULL, + `end_date` DATETIME(6) NOT NULL, + `first_price` FLOAT NOT NULL, + `last_price` FLOAT NULL, + `name` VARCHAR(50) NOT NULL, + `participation_fee` FLOAT NOT NULL, + `price_step` FLOAT NOT NULL, + `start_date` DATETIME(6) NOT NULL, + `state` VARCHAR(255) NULL, + `jewelry_id` INT NULL, + `staff_id` INT NULL, + `create_date` DATETIME(6) NULL, + `end_date_stored` DATETIME(6) NULL +); -CREATE TABLE [dbo].[auction_history] -( - [id] [int] IDENTITY (1,1) NOT NULL, - [price_given] [float] NOT NULL, - [time] [datetime2](6) NOT NULL, - [auction_id] [int] NULL, - [user_id] [int] NULL, - [bid_code] [varchar](20) NOT NULL, - [state] [varchar](255) NULL, - ); +-- Insert data into `auction` +INSERT INTO `auction` (`deposit`, `description`, `first_price`, `end_date`, `last_price`, `name`, `participation_fee`, `price_step`, `start_date`, `state`, `jewelry_id`, `staff_id`, `create_date`) +VALUES + (10000000, 'NHẪN ĐÍNH HÔN KIM CƯƠNG ENR3111W', 44500000, '2023-05-19 14:00:00', 70500000, 'Đấu giá nhẫn kim cương ENR3111W', 500000, 1000000, '2023-05-19 10:00:00', 'FINISHED', 1, 1, '2023-05-19 01:00:00'), + (10000000, 'NHẪN CƯỚI KIM CƯƠNG IWR163', 5000000, '2024-05-25 21:00:00', NULL, 'Đấu giá NHẪN CƯỚI KIM CƯƠNG IWR163', 100000, 2000000, '2024-05-25 22:00:00', 'ONGOING', 2, 1, '2024-05-25 20:00:00'); + +-- Create table `auction_history` +CREATE TABLE `auction_history` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `price_given` FLOAT NOT NULL, + `time` DATETIME(6) NOT NULL, + `auction_id` INT NULL, + `user_id` INT NULL, + `bid_code` VARCHAR(20) NOT NULL, + `state` VARCHAR(255) NULL +); -INSERT INTO [dbo].[auction_history] -( [price_given] - , [time] - , [auction_id] - , [user_id] - , [bid_code] - , [state]) -VALUES (2550750, '2024-05-01 17:30:00', 1, 1, 'BAS12', 'ACTIVE'), +-- Insert data into `auction_history` +INSERT INTO `auction_history` (`price_given`, `time`, `auction_id`, `user_id`, `bid_code`, `state`) +VALUES + (2550750, '2024-05-01 17:30:00', 1, 1, 'BAS12', 'ACTIVE'), (1000750, '2024-05-12 19:30:00', 2, 1, 'BAS22', 'ACTIVE'); +-- Create table `token` +CREATE TABLE `token` ( + `id` BIGINT AUTO_INCREMENT PRIMARY KEY, + `created_time` DATETIME(6) NULL, + `device_info` VARCHAR(255) NULL, + `expired` BOOLEAN NOT NULL, + `ip_address` VARCHAR(255) NULL, + `refresh_token` VARCHAR(255) NULL, + `revoked` BOOLEAN NOT NULL, + `token` VARCHAR(255) NULL, + `token_type` VARCHAR(255) NULL, + `user_id` INT NULL +); -CREATE TABLE [dbo].[token] -( - [id] [bigint] IDENTITY (1,1) NOT NULL, - [created_time] [datetime2](6) NULL, - [device_info] [varchar](255) NULL, - [expired] [bit] NOT NULL, - [ip_address] [varchar](255) NULL, - [refresh_token] [varchar](255) NULL, - [revoked] [bit] NOT NULL, - [token] [varchar](255) NULL, - [token_type] [varchar](255) NULL, - [user_id] [int] NULL - ) - -CREATE TABLE [dbo].[image] -( - [id] [int] IDENTITY(1,1) NOT NULL, - [data] [varchar](max) NULL, - [icon] [bit] NULL, - [link] [varchar](255) NULL, - [jewelry_id] [int] NULL -) - - INSERT INTO [dbo].[image] ([data], [icon], [link], [jewelry_id]) - VALUES -('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/1.jpg', 1, '', 1), -('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2.jpg', 0, '', 1), -('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2-1.jpg', 1, '', 2), -('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2-2.jpg', 0, '', 2), -('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/6-1.jpg', 1, '', 3), -('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/9-1.jpg', 1, '', 4); - -CREATE TABLE [dbo].[transaction]( - [id] [int] IDENTITY(1,1) NOT NULL, - [create_date] [datetime2](6) NOT NULL, - [fees_incurred] [float] NOT NULL, - [payment_method] [varchar](20) NULL, - [payment_time] [datetime2](6) NULL, - [transaction_state] [varchar](255) NOT NULL, - [total_price] [float] NOT NULL, - [transaction_type] [varchar](255) NOT NULL, - [auction_id] [int] NULL, - [user_id] [int] NULL, - [transaction_code] [varchar](255) NULL, - [bank_code] [varchar](255) NULL -) - - INSERT INTO [dbo].[transaction] ([create_date], [fees_incurred], [payment_method], [payment_time], [transaction_state], [total_price], [transaction_type], [auction_id], [user_id], [transaction_code], [bank_code]) - VALUES -('2024-05-01 17:30:00', 100000, 'BANKING', '2024-05-01 17:30:00', 'SUCCEED', 1000000, 'REGISTRATION', 1, 1, 'BAS12', 'AGB'), -('2024-05-12 19:30:00', 200000, 'BANKING', '2024-05-12 19:30:00', 'SUCCEED', 2000000, 'REGISTRATION', 2, 1, 'BAS22', 'NCB'); - - - -CREATE TABLE [dbo].[auction_registration] -( - [id] [int] IDENTITY(1,1) NOT NULL, - [auction_registration_state] [varchar](255) NOT NULL, - [registration_date] [datetime2](6) NOT NULL, - [registration_fee] [float] NOT NULL, - [auction_id] [int] NULL, - [transaction_id] [int] NULL, - [user_id] [int] NULL, - [kick_reason] [nvarchar](255) NULL -) - - INSERT INTO [dbo].[auction_registration] ([auction_registration_state], [registration_date], [registration_fee], [auction_id], [transaction_id], [user_id]) - VALUES -('VALID', '2024-05-01 17:30:00', 1000000, 1, 1, 1), -('VALID', '2024-05-12 19:30:00', 2000000, 2, 1, 1); +-- Create table `image` +CREATE TABLE `image` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `data` LONGTEXT NULL, + `icon` BOOLEAN NULL, + `link` VARCHAR(255) NULL, + `jewelry_id` INT NULL +); -CREATE TABLE [dbo].[request_approval]( - [id] [int] IDENTITY(1,1) NOT NULL, - [desired_price] [float] NOT NULL, - [is_confirm] [bit] NULL, - [note] [nvarchar](255) NULL, - [request_time] [datetime2](6) NOT NULL, - [response_time] [datetime2](6) NULL, - [state] [varchar](255) NULL, - [valuation] [float] NULL, - [jewelry_id] [int] NULL, - [user_id_respond] [int] NULL, - [user_id_send] [int] NULL, - [staff_id] [int] NULL - ) +-- Insert data into `image` +INSERT INTO `image` (`data`, `icon`, `link`, `jewelry_id`) +VALUES + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/1.jpg', TRUE, '', 1), + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2.jpg', FALSE, '', 1), + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2-1.jpg', TRUE, '', 2), + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2-2.jpg', FALSE, '', 2), + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/6-1.jpg', TRUE, '', 3), + ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/9-1.jpg', TRUE, '', 4); + +-- Create table `transaction` +CREATE TABLE `transaction` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `create_date` DATETIME(6) NOT NULL, + `fees_incurred` FLOAT NOT NULL, + `payment_method` VARCHAR(20) NULL, + `payment_time` DATETIME(6) NULL, + `transaction_state` VARCHAR(255) NOT NULL, + `total_price` FLOAT NOT NULL, + `transaction_type` VARCHAR(255) NOT NULL, + `auction_id` INT NULL, + `user_id` INT NULL, + `transaction_code` VARCHAR(255) NULL, + `bank_code` VARCHAR(255) NULL +); - INSERT INTO [dbo].[request_approval] ([desired_price], [is_confirm], [note], [request_time], [response_time], [state], [valuation], [jewelry_id], [user_id_respond], [user_id_send], [staff_id]) - VALUES -(1000000, 1, 'Nhẫn kim cương', '2024-05-01 17:30:00', '2024-05-01 17:30:00', 'ACTIVE', 1000000, 1, 1, 2, 1); +-- Insert data into `transaction` +INSERT INTO `transaction` (`create_date`, `fees_incurred`, `payment_method`, `payment_time`, `transaction_state`, `total_price`, `transaction_type`, `auction_id`, `user_id`, `transaction_code`, `bank_code`) +VALUES + ('2024-05-01 17:30:00', 100000, 'BANKING', '2024-05-01 17:30:00', 'SUCCEED', 1000000, 'REGISTRATION', 1, 1, 'BAS12', 'AGB'), + ('2024-05-12 19:30:00', 200000, 'BANKING', '2024-05-12 19:30:00', 'SUCCEED', 2000000, 'REGISTRATION', 2, 1, 'BAS22', 'NCB'); + +-- Create table `auction_registration` +CREATE TABLE `auction_registration` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `auction_registration_state` VARCHAR(255) NOT NULL, + `registration_date` DATETIME(6) NOT NULL, + `registration_fee` FLOAT NOT NULL, + `auction_id` INT NULL, + `transaction_id` INT NULL, + `user_id` INT NULL, + `kick_reason` LONGTEXT NULL +); +-- Insert data into `auction_registration` +INSERT INTO `auction_registration` (`auction_registration_state`, `registration_date`, `registration_fee`, `auction_id`, `transaction_id`, `user_id`) +VALUES + ('VALID', '2024-05-01 17:30:00', 1000000, 1, 1, 1), + ('VALID', '2024-05-12 19:30:00', 2000000, 2, 1, 1); + +-- Create table `request_approval` +CREATE TABLE `request_approval` ( + `id` INT AUTO_INCREMENT PRIMARY KEY, + `desired_price` FLOAT NOT NULL, + `is_confirm` BOOLEAN NULL, + `note` LONGTEXT NULL, + `request_time` DATETIME(6) NOT NULL, + `response_time` DATETIME(6) NULL, + `state` VARCHAR(255) NULL, + `valuation` FLOAT NULL, + `jewelry_id` INT NULL, + `user_id_respond` INT NULL, + `user_id_send` INT NULL, + `staff_id` INT NULL +); +-- Insert data into `request_approval` +INSERT INTO `request_approval` (`desired_price`, `is_confirm`, `note`, `request_time`, `response_time`, `state`, `valuation`, `jewelry_id`, `user_id_respond`, `user_id_send`, `staff_id`) +VALUES + (1000000, TRUE, 'Nhẫn kim cương', '2024-05-01 17:30:00', '2024-05-01 17:30:00', 'ACTIVE', 1000000, 1, 1, 2, 1); diff --git a/db/init2.sql b/db/init2.sql deleted file mode 100644 index 8f7d256..0000000 --- a/db/init2.sql +++ /dev/null @@ -1,254 +0,0 @@ -CREATE DATABASE IF NOT EXISTS DB_AUCTION DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;; -USE DB_AUCTION; - --- Create the 'bank' table -CREATE TABLE bank ( - id INT PRIMARY KEY, - bank_name VARCHAR(100), - logo VARCHAR(255), - trading_name VARCHAR(100) -); - --- Insert data into the 'bank' table -INSERT INTO bank (id, bank_name, logo, trading_name) -VALUES - (1, 'Ngân hàng Nông nghiệp và Phát triển Nông thôn Việt Nam', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/Agribank-logo-01-e1676880269189-300x124.png', 'Agribank'), - (2, 'Ngân hàng Xây dựng', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/CBbank-logo-1-01-e1585971864974-300x221.png', 'CB'), - (3, 'Ngân hàng Đại Dương', 'https://inhoangkien.vn/wp-content/uploads/2020/04/Oceanbank-logo-01-300x183.png', - 'Oceanbank'), - (4, 'Ngân hàng Dầu Khí Toàn Cầu', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/GPBANK-logo-01-300x183.png', 'GPBank'), - (5, 'Ngân hàng Đầu tư và Phát triển Việt Nam', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/BIDV-01-e1585972482948-300x126.png', 'BIDV'), - (6, 'Ngân hàng Công Thương Việt Nam', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/Vietinbank-01-e1585972297613-600x287.png', 'VietinBank'), - (7, 'Ngân hàng Ngoại thương Việt Nam', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/Vietcombank-01-e1585972386757-300x134.png', 'Vietcombank'), - (8, 'Ngân hàng Quân đội', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/logo-ngan-hang-MB-01-e1585972573949-300x193.png', 'MBBank'), - (9, 'Ngân hàng Kỹ Thương Việt Nam', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/Techcombank-01-e1585972434854-300x77.png', 'Techcombank'), - (10, 'Ngân hàng Á Châu', - 'https://inhoangkien.vn/wp-content/uploads/2020/04/logo-ngan-hang-ACB-PNG-e1585972709842-300x148.png', 'ACB'); - --- Create the 'jewelry_category' table -CREATE TABLE jewelry_category ( - id INT AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(100) -); - --- Insert data into the 'jewelry_category' table -INSERT INTO jewelry_category (name) -VALUES - ('Dây chuyền'), - ('Nhẫn'), - ('Vòng tay'), - ('Hoa tai'), - ('Mặt dây chuyền'); - --- Create the 'user' table -CREATE TABLE `user` ( - id INT AUTO_INCREMENT PRIMARY KEY, - cccd VARCHAR(20) NOT NULL, - cccd_first TEXT NOT NULL, - cccd_last TEXT NOT NULL, - cccd_from VARCHAR(50) NOT NULL, - address VARCHAR(50) NOT NULL, - avatar TEXT, - bank_account_name VARCHAR(30) NOT NULL, - bank_account_number VARCHAR(30) NOT NULL, - city VARCHAR(50) NOT NULL, - district VARCHAR(50) NOT NULL, - email VARCHAR(50) NOT NULL, - first_name VARCHAR(50) NOT NULL, - last_name VARCHAR(50) NOT NULL, - password VARCHAR(100), - phone VARCHAR(15) NOT NULL, - role VARCHAR(255), - state VARCHAR(10) NOT NULL, - username VARCHAR(50) NOT NULL, - ward VARCHAR(50) NOT NULL, - year_of_birth VARCHAR(4) NOT NULL, - bank_id INT, - register_date DATETIME, - ban_reason VARCHAR(255) -); - --- Insert data into the 'user' table -INSERT INTO `user` -(cccd, address, avatar, city, email, first_name, last_name, password, phone, district, ward, state, username, year_of_birth, role, bank_id, bank_account_number, bank_account_name, register_date, cccd_first, cccd_last, cccd_from, ban_reason) -VALUES - ('011234567890', '1 Lý Thường Kiệt', - 'https://scontent.fsgn2-7.fna.fbcdn.net/v/t39.30808-6/438275285_1101091104487039_4035794765477072253_n.jpg?_nc_cat=108&ccb=1-7&_nc_sid=5f2048&_nc_ohc=7MHTOamLKXgQ7kNvgGdad4i&_nc_ht=scontent.fsgn2-7.fna&oh=00_AYDZ0L0Y3_1M_tK5YBX-b1PhjuTPFeLod8Jz1UhW3t_Gkg&oe=6665416E', - 'Lâm Đồng', 'phuuthanh2003@gmail.com', 'Phùng', 'Thành', - '$2a$12$j/1n5Pjv4JgzG76ZG0hyH.MD6ftohJNbjuZjRHQFt31Ta/jViwKQ2', '0912345670', 'Hà Nội', 'Hoang', 'ACTIVE', - 'phuuthanh2003', '1985', 'ADMIN', 7, '1030293193991', 'PHUNG HUU THANH', '2024-05-01 17:30:00', - 'https://firebasestorage.googleapis.com/v0/b/auction-image-aecbe.appspot.com/o/images-cccd%2F49a92919-a92a-4d32-9f70-db2f641ccb51?alt=media&token=f50f52dc-8954-4a18-845e-16e855b076bb', - 'https://firebasestorage.googleapis.com/v0/b/auction-image-aecbe.appspot.com/o/images-cccd%2F79f370d3-d4ea-4690-903e-88a99ade8d38?alt=media&token=b728a278-36fd-4e96-bd64-f34a8b03e5a1', - 'CA MAU', ''); - --- Create the 'jewelry' table -CREATE TABLE jewelry ( - id INT AUTO_INCREMENT PRIMARY KEY, - brand VARCHAR(20) NOT NULL, - description TEXT NOT NULL, - material VARCHAR(20) NOT NULL, - name VARCHAR(50) NOT NULL, - buy_now_price FLOAT, - state VARCHAR(20) NOT NULL, - weight FLOAT NOT NULL, - category_id INT, - user_id INT, - is_holding BOOLEAN, - received_date DATETIME, - delivery_date DATETIME, - create_date DATETIME -); - --- Insert data into the 'jewelry' table -INSERT INTO jewelry -(brand, description, material, name, buy_now_price, state, weight, category_id, user_id, is_holding) -VALUES - ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN ĐÍNH HÔN KIM CƯƠNG ENR3111W', 44500000, 'ACTIVE', 15.5, 2, 1, 1), - ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN CƯỚI KIM CƯƠNG IWR163', 5000000, 'ACTIVE', 8.2, 2, 1, 1), - ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN KIM CƯƠNG FDR0257', 41130000, 'ACTIVE', 20.1, 2, 1, 1), - ('DOJI', 'Nhẫn đính hôn bằng kim cương.', 'SILVER', 'NHẪN KIM CƯƠNG DJR397-22', 37000000, 'ACTIVE', 10.0, 2, 1, 1), - ('Fine Jewelry', 'Dây chuyền kim cương', 'GOLD', 'Dây chuyền kim cương Y', 18000000, 'ACTIVE', 6.9, 1, 15, 1); - --- Create table `auction` -CREATE TABLE `auction` ( - `id` INT AUTO_INCREMENT PRIMARY KEY, - `deposit` FLOAT NOT NULL, - `description` TEXT NOT NULL, - `end_date` DATETIME(6) NOT NULL, - `first_price` FLOAT NOT NULL, - `last_price` FLOAT NULL, - `name` VARCHAR(50) NOT NULL, - `participation_fee` FLOAT NOT NULL, - `price_step` FLOAT NOT NULL, - `start_date` DATETIME(6) NOT NULL, - `state` VARCHAR(255) NULL, - `jewelry_id` INT NULL, - `staff_id` INT NULL, - `create_date` DATETIME(6) NULL, - `end_date_stored` DATETIME(6) NULL -); - --- Insert data into `auction` -INSERT INTO `auction` (`deposit`, `description`, `first_price`, `end_date`, `last_price`, `name`, `participation_fee`, `price_step`, `start_date`, `state`, `jewelry_id`, `staff_id`, `create_date`) -VALUES - (10000000, 'NHẪN ĐÍNH HÔN KIM CƯƠNG ENR3111W', 44500000, '2023-05-19 14:00:00', 70500000, 'Đấu giá nhẫn kim cương ENR3111W', 500000, 1000000, '2023-05-19 10:00:00', 'FINISHED', 1, 1, '2023-05-19 01:00:00'), - (10000000, 'NHẪN CƯỚI KIM CƯƠNG IWR163', 5000000, '2024-05-25 21:00:00', NULL, 'Đấu giá NHẪN CƯỚI KIM CƯƠNG IWR163', 100000, 2000000, '2024-05-25 22:00:00', 'ONGOING', 2, 1, '2024-05-25 20:00:00'); - --- Create table `auction_history` -CREATE TABLE `auction_history` ( - `id` INT AUTO_INCREMENT PRIMARY KEY, - `price_given` FLOAT NOT NULL, - `time` DATETIME(6) NOT NULL, - `auction_id` INT NULL, - `user_id` INT NULL, - `bid_code` VARCHAR(20) NOT NULL, - `state` VARCHAR(255) NULL -); - --- Insert data into `auction_history` -INSERT INTO `auction_history` (`price_given`, `time`, `auction_id`, `user_id`, `bid_code`, `state`) -VALUES - (2550750, '2024-05-01 17:30:00', 1, 1, 'BAS12', 'ACTIVE'), - (1000750, '2024-05-12 19:30:00', 2, 1, 'BAS22', 'ACTIVE'); - --- Create table `token` -CREATE TABLE `token` ( - `id` BIGINT AUTO_INCREMENT PRIMARY KEY, - `created_time` DATETIME(6) NULL, - `device_info` VARCHAR(255) NULL, - `expired` BOOLEAN NOT NULL, - `ip_address` VARCHAR(255) NULL, - `refresh_token` VARCHAR(255) NULL, - `revoked` BOOLEAN NOT NULL, - `token` VARCHAR(255) NULL, - `token_type` VARCHAR(255) NULL, - `user_id` INT NULL -); - --- Create table `image` -CREATE TABLE `image` ( - `id` INT AUTO_INCREMENT PRIMARY KEY, - `data` TEXT NULL, - `icon` BOOLEAN NULL, - `link` VARCHAR(255) NULL, - `jewelry_id` INT NULL -); - --- Insert data into `image` -INSERT INTO `image` (`data`, `icon`, `link`, `jewelry_id`) -VALUES - ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/1.jpg', TRUE, '', 1), - ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2.jpg', FALSE, '', 1), - ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2-1.jpg', TRUE, '', 2), - ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/2-2.jpg', FALSE, '', 2), - ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/6-1.jpg', TRUE, '', 3), - ('https://raw.githubusercontent.com/phuuthanh2003/FE_Deploy/main/public/assets/images/product/small-size/9-1.jpg', TRUE, '', 4); - --- Create table `transaction` -CREATE TABLE `transaction` ( - `id` INT AUTO_INCREMENT PRIMARY KEY, - `create_date` DATETIME(6) NOT NULL, - `fees_incurred` FLOAT NOT NULL, - `payment_method` VARCHAR(20) NULL, - `payment_time` DATETIME(6) NULL, - `transaction_state` VARCHAR(255) NOT NULL, - `total_price` FLOAT NOT NULL, - `transaction_type` VARCHAR(255) NOT NULL, - `auction_id` INT NULL, - `user_id` INT NULL, - `transaction_code` VARCHAR(255) NULL, - `bank_code` VARCHAR(255) NULL -); - --- Insert data into `transaction` -INSERT INTO `transaction` (`create_date`, `fees_incurred`, `payment_method`, `payment_time`, `transaction_state`, `total_price`, `transaction_type`, `auction_id`, `user_id`, `transaction_code`, `bank_code`) -VALUES - ('2024-05-01 17:30:00', 100000, 'BANKING', '2024-05-01 17:30:00', 'SUCCEED', 1000000, 'REGISTRATION', 1, 1, 'BAS12', 'AGB'), - ('2024-05-12 19:30:00', 200000, 'BANKING', '2024-05-12 19:30:00', 'SUCCEED', 2000000, 'REGISTRATION', 2, 1, 'BAS22', 'NCB'); - --- Create table `auction_registration` -CREATE TABLE `auction_registration` ( - `id` INT AUTO_INCREMENT PRIMARY KEY, - `auction_registration_state` VARCHAR(255) NOT NULL, - `registration_date` DATETIME(6) NOT NULL, - `registration_fee` FLOAT NOT NULL, - `auction_id` INT NULL, - `transaction_id` INT NULL, - `user_id` INT NULL, - `kick_reason` TEXT NULL -); - --- Insert data into `auction_registration` -INSERT INTO `auction_registration` (`auction_registration_state`, `registration_date`, `registration_fee`, `auction_id`, `transaction_id`, `user_id`) -VALUES - ('VALID', '2024-05-01 17:30:00', 1000000, 1, 1, 1), - ('VALID', '2024-05-12 19:30:00', 2000000, 2, 1, 1); - --- Create table `request_approval` -CREATE TABLE `request_approval` ( - `id` INT AUTO_INCREMENT PRIMARY KEY, - `desired_price` FLOAT NOT NULL, - `is_confirm` BOOLEAN NULL, - `note` TEXT NULL, - `request_time` DATETIME(6) NOT NULL, - `response_time` DATETIME(6) NULL, - `state` VARCHAR(255) NULL, - `valuation` FLOAT NULL, - `jewelry_id` INT NULL, - `user_id_respond` INT NULL, - `user_id_send` INT NULL, - `staff_id` INT NULL -); - --- Insert data into `request_approval` -INSERT INTO `request_approval` (`desired_price`, `is_confirm`, `note`, `request_time`, `response_time`, `state`, `valuation`, `jewelry_id`, `user_id_respond`, `user_id_send`, `staff_id`) -VALUES - (1000000, TRUE, 'Nhẫn kim cương', '2024-05-01 17:30:00', '2024-05-01 17:30:00', 'ACTIVE', 1000000, 1, 1, 2, 1); diff --git a/docker-compose.yml b/docker-compose.yml index 0ac8b9d..cf43725 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,12 +2,12 @@ version: '3.0' services: auction-database: - image: ghcr.io/phuuthanh2003/auction-database:latest + image: ghcr.io/phuuthanh-dev/auction-database:latest ports: - "3306:3306" auction-api: - image: ghcr.io/phuuthanh2003/auction-api:latest + image: ghcr.io/phuuthanh-dev/auction-api:latest ports: - "8080:8080" depends_on: diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 91042db..83f50f8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -12,7 +12,7 @@ spring.datasource.username=root spring.datasource.password=BxfkFKmKqporMffimTRuTptjFAunLXKh #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver # Config create table automatically -spring.jpa.hibernate.ddl-auto=update +spring.jpa.hibernate.ddl-auto=none # Config email spring.mail.host=smtp.gmail.com From f861f23271315ae0c3759501e420ba8d88bbb405 Mon Sep 17 00:00:00 2001 From: Phung Huu Thanh <102614541+phuuthanh2003@users.noreply.github.com> Date: Mon, 26 Aug 2024 02:15:21 +0700 Subject: [PATCH 3/4] fix bugs --- db/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/Dockerfile b/db/Dockerfile index 59d46a0..965f0ac 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -7,7 +7,7 @@ ENV MYSQL_DATABASE=DB_AUCTION ENV MYSQL_COLLATION=utf8mb4_general_ci # Copy the SQL script into the container -COPY init2.sql /docker-entrypoint-initdb.d/init2.sql +COPY init.sql /docker-entrypoint-initdb.d/init.sql # Expose MySQL port EXPOSE 3306 From 58b72ed337b4b494ef290958272e0e0786b9fbd6 Mon Sep 17 00:00:00 2001 From: Phung Huu Thanh <102614541+phuuthanh2003@users.noreply.github.com> Date: Mon, 26 Aug 2024 02:17:13 +0700 Subject: [PATCH 4/4] fix bugs --- db/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/Dockerfile b/db/Dockerfile index 965f0ac..1300668 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,5 +1,5 @@ # Use the official MySQL image -FROM mysql:latest +FROM mysql:8.2.0 # Set environment variables for MySQL ENV MYSQL_ALLOW_EMPTY_PASSWORD yes