Skip to content

Commit

Permalink
feat(13): Updated new files.
Browse files Browse the repository at this point in the history
  • Loading branch information
bang-ngo committed Sep 4, 2021
1 parent ed67ff8 commit 7459b7e
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 4 deletions.
75 changes: 75 additions & 0 deletions src/META-INF/equip-database.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
create database equipments_management;

create table equipment_categories
(
category_id int identity
primary key,
category_name nvarchar(100) not null
unique
)
go

create table equipments
(
equipment_id int identity
primary key,
equipment_name nvarchar(100) not null
unique,
equipment_color nvarchar(100) not null,
equipment_created_date bigint not null,
equipment_quantity int not null,
equipment_category_id int
references equipment_categories
)
go

create table roles
(
role_id int not null
primary key,
name varchar(100) not null
unique
)
go

create table users
(
user_id varchar(100) not null
primary key,
password varchar(100) not null,
fullname nvarchar(100) not null,
email varchar(100) not null
unique,
phone varchar(100) not null,
address varchar(200) not null,
created_date bigint not null,
is_activated bit not null,
role_id int
references roles,
otp varchar(6) not null
)
go

create table equipments_request
(
equipments_request_id int identity
primary key,
requester varchar(100)
references users,
assignee varchar(100)
references users,
request_status varchar(100) not null,
requested_date bigint not null,
equipment_id int
references equipments
)
go

create table equipments_request_history
(
equipments_request_history_id int identity
primary key,
equipments_request_id int
references equipments_request
)
go
6 changes: 6 additions & 0 deletions src/bangmaple/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import bangmaple.dao.UsersDAO;
import bangmaple.dto.UsersDTO;
import bangmaple.jdbc.dao.base.Store;
import bangmaple.jdbc.paging.PageRequest;
import bangmaple.jdbc.paging.Pageable;
import bangmaple.jdbc.repository.JdbcRepository;
import bangmaple.jdbc.utils.ConnectionManager;

Expand Down Expand Up @@ -51,6 +53,10 @@ public static void main(String[] args) throws Exception {
System.out.println(dao.count());
dao.deleteAll();
dao.deleteAllByIds(Arrays.asList("1", "2", "3", "4"));
System.out.println(dao.findAll(PageRequest.of(1, 5)));
System.out.println(dao.findAll(PageRequest.of(0, 4, Pageable.SORT_DESC)));
System.out.println(dao.findAll(PageRequest.of(0, 4, Pageable.SORT_DESC, "username", "fullname")));
System.out.println(dao.findAll(Pageable.SORT_DESC));
}

}
2 changes: 1 addition & 1 deletion src/bangmaple/dto/EquipmentsDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* @author bangmaple
*/
@Table(name = "equipments", catalog = "LAB231_1")
@Table(name = "equipments", catalog = "equipments_management")
public class EquipmentsDTO {

@Id
Expand Down
1 change: 0 additions & 1 deletion src/bangmaple/jdbc/paging/PageRequest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package bangmaple.jdbc.paging;

import java.io.Serializable;
import java.util.Arrays;

public class PageRequest extends AbstractPageRequest implements Serializable {

Expand Down
2 changes: 0 additions & 2 deletions src/bangmaple/jdbc/paging/Pageable.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package bangmaple.jdbc.paging;

import java.util.Optional;

public interface Pageable {

boolean SORT_ASC = true;
Expand Down

0 comments on commit 7459b7e

Please sign in to comment.