Skip to content

Commit

Permalink
feat: 테이블 구조 변경 (#6)
Browse files Browse the repository at this point in the history
- 특정 사용자에 대한 card만 가져올 수 있도록 user 테이블 추가
- 기존 board 테이블을 없애고, card에서 board 이름을 가지도록 변경
- "remove"를 통해 제거 여부를 표시하도록 변경
  • Loading branch information
leejohy-0223 committed Apr 6, 2022
1 parent eec3fbd commit 6cf0e3f
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 21 deletions.
15 changes: 8 additions & 7 deletions Server/src/main/java/com/todolist/domain/Card.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@

public class Card {

private final Integer cardId;
private final String cardTitle;
private final String cardContent;
private final LocalDateTime addDateTime;
private final Integer internalOrder;
private final String boardName;
private Integer cardId;
private String cardTitle;
private String cardContent;
private LocalDateTime addDateTime;
private Integer internalOrder;
private String boardName;
private boolean remove;

public Card(Integer cardId, String cardTitle, String cardContent,
LocalDateTime addDateTime, Integer internalOrder, String boardName) {
LocalDateTime addDateTime, Integer internalOrder, String boardName) {
this.cardId = cardId;
this.cardTitle = cardTitle;
this.cardContent = cardContent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ public CardRepository(JdbcTemplate jdbcTemplate) {
}

public List<Card> findAllCards() {
String sql = "SELECT * from card";

String sql = "SELECT * FROM card WHERE remove = 0";
return jdbcTemplate.query(sql, cardRowMapper());
}

Expand All @@ -33,7 +32,6 @@ private RowMapper<Card> cardRowMapper() {
resultSet.getInt("internalOrder"),
resultSet.getString("boardName")
);

return card;
};
}
Expand Down
43 changes: 32 additions & 11 deletions Server/src/main/resources/schema.sql
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
DROP TABLE IF EXISTS `user`;

create TABLE `user` (
userId VARCHAR(255) NOT NULL PRIMARY KEY,
password VARCHAR(255) NOT NULL,
name VARCHAR(255) NOT NULL,
email VARCHAR(255) NOT NULL
CREATE TABLE `user` (
`userId` VARCHAR(50) NOT NULL,
`password` VARCHAR(50) NOT NULL,
`remove` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`userId`)
);

DROP TABLE IF EXISTS article;
DROP TABLE IF EXISTS `card`;

create TABLE article (
id BIGINT(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
writer VARCHAR(255) NOT NULL,
title VARCHAR(255) NOT NULL,
contents VARCHAR(255) NOT NULL
CREATE TABLE `card` (
`cardId` INT NOT NULL AUTO_INCREMENT,
`userId` VARCHAR(50) NOT NULL,
`cardTitle` VARCHAR(50) NOT NULL,
`cardContent` VARCHAR(255) NOT NULL,
`boardName` VARCHAR(50) NOT NULL,
`internalOrder` INT NOT NULL,
`addDateTime` TIMESTAMP NOT NULL,
`remove` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`cardId`),
FOREIGN KEY (`userId`)
REFERENCES `user` (`userId`)
ON UPDATE CASCADE
);

DROP TABLE IF EXISTS `history`;

CREATE TABLE `history` (
`historyId` INT NOT NULL AUTO_INCREMENT,
`userId` VARCHAR(50) NOT NULL,
`actionHistory` VARCHAR(100) NOT NULL,
`actionTime` TIMESTAMP NOT NULL,
PRIMARY KEY (`historyId`),
FOREIGN KEY (`userId`)
REFERENCES `user` (`userId`)
ON UPDATE CASCADE
);

0 comments on commit 6cf0e3f

Please sign in to comment.