diff --git a/Server/src/main/java/com/todolist/domain/Card.java b/Server/src/main/java/com/todolist/domain/Card.java index 379ce833b..b6ee3030e 100644 --- a/Server/src/main/java/com/todolist/domain/Card.java +++ b/Server/src/main/java/com/todolist/domain/Card.java @@ -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; diff --git a/Server/src/main/java/com/todolist/repository/CardRepository.java b/Server/src/main/java/com/todolist/repository/CardRepository.java index 98c2c6156..834217dd1 100644 --- a/Server/src/main/java/com/todolist/repository/CardRepository.java +++ b/Server/src/main/java/com/todolist/repository/CardRepository.java @@ -18,8 +18,7 @@ public CardRepository(JdbcTemplate jdbcTemplate) { } public List findAllCards() { - String sql = "SELECT * from card"; - + String sql = "SELECT * FROM card WHERE remove = 0"; return jdbcTemplate.query(sql, cardRowMapper()); } @@ -33,7 +32,6 @@ private RowMapper cardRowMapper() { resultSet.getInt("internalOrder"), resultSet.getString("boardName") ); - return card; }; } diff --git a/Server/src/main/resources/schema.sql b/Server/src/main/resources/schema.sql index 6f1008e05..c5a33c49e 100644 --- a/Server/src/main/resources/schema.sql +++ b/Server/src/main/resources/schema.sql @@ -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 );