[김승환] 피그마 요구사항 구현 및 동적 렌더링 구현

src/main/java/db/ArticleDatabase.java

@@ -1,18 +1,24 @@
 package db;
 
+import db.config.CustomJdbcTemplate;
+import db.config.RowMapper;
 import model.Article;
 
 import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.List;
 import java.util.Optional;
 
 public class ArticleDatabase {
 
     private final CustomJdbcTemplate jdbcTemplate;
     private static final String SELECT_SQL = "select * from ARTICLE where ARTICLE_ID = ?";
-    private static final String INSERT_SQL = "insert into ARTICLE (ARTICLE_ID, CONTENT, USER_ID, IMAGE_ID, LIKE_COUNT) values (?, ?, ?, ?, ?)";
-    private static final String UPDATE_SQL = "update ARTICLE set CONTENT = ?, USER_ID = ?, IMAGE_ID = ?, LIKE_COUNT = ? where ARTICLE_ID = ?";
+    private static final String SELECT_ALL_SQL = "select * from ARTICLE";
+    private static final String SELECT_RECENT_SQL = "select * from ARTICLE order by ARTICLE_ID desc limit 1";
+    private static final String SELECT_PREV_ARTICLE_SQL = "SELECT * FROM ARTICLE WHERE ARTICLE_ID > ? ORDER BY ARTICLE_ID ASC LIMIT 1";
+    private static final String SELECT_NEXT_ARTICLE_SQL = "SELECT * FROM ARTICLE WHERE ARTICLE_ID < ? ORDER  BY ARTICLE_ID DESC LIMIT 1";
+    private static final String INSERT_SQL = "insert into ARTICLE (CONTENT, USER_ID, IMAGE_ID, LIKE_COUNT) values (?, ?, ?, ?)";
     private static final String UPDATE_LIKE_COUNT_SQL = "update ARTICLE set LIKE_COUNT = LIKE_COUNT + 1 where ARTICLE_ID = ?";
 
     public ArticleDatabase(DataSource dataSource) {
@@ -21,41 +27,56 @@ public ArticleDatabase(DataSource dataSource) {
 
     public void save(Article article) {
         jdbcTemplate.update(INSERT_SQL,
-                article.articleId(),
-                article.content(),
-                article.userId(),
-                article.imageId(),
-                article.likeCount()
+                article.getContent(),
+                article.getUserId(),
+                article.getImageId(),
+                article.getLikeCount()
         );
     }
 
-    public void update(Article article) {
-        jdbcTemplate.update(UPDATE_SQL,
-                article.content(),
-                article.userId(),
-                article.imageId(),
-                article.articleId(),
-                article.likeCount()
-        );
+    public Long saveAndGetKey(Article article) {
+        return jdbcTemplate.updateAndGetKey(INSERT_SQL,
+                rs -> rs.getLong(1),
+                article.getContent(),
+                article.getUserId(),
+                article.getImageId(),
+                article.getLikeCount()
+        ).orElseThrow(() -> new RuntimeException("Failed to save article"));
     }
 
-    public Optional<Article> findById(String articleId) {
+    public Optional<Article> findById(Long articleId) {
         return jdbcTemplate.queryForObject(SELECT_SQL, new ArticleRowMapper(), articleId);
     }
 
-    public void addLikeCount(String articleId) {
+    public Optional<Article> findRecentArticle() {
+        return jdbcTemplate.queryForObject(SELECT_RECENT_SQL, new ArticleRowMapper());
+    }
+
+    public void addLikeCount(Long articleId) {
         jdbcTemplate.update(UPDATE_LIKE_COUNT_SQL, articleId);
     }
 
-    static class ArticleRowMapper implements RowMapper<Article>{
+    public Optional<Article> findPreviousArticle(Long articleId) {
+        return jdbcTemplate.queryForObject(SELECT_PREV_ARTICLE_SQL, new ArticleRowMapper(), articleId);
+    }
+
+    public Optional<Article> findNextArticle(Long articleId) {
+        return jdbcTemplate.queryForObject(SELECT_NEXT_ARTICLE_SQL, new ArticleRowMapper(), articleId);
+    }
+
+    public List<Article> findAll() {
+        return jdbcTemplate.query(SELECT_ALL_SQL, new ArticleRowMapper());
+    }
+
+    static class ArticleRowMapper implements RowMapper<Article> {
         @Override
         public Article mapRow(ResultSet rs) throws SQLException {
             return new Article(
-                    rs.getString("ARTICLE_ID"),
+                    rs.getLong("ARTICLE_ID"),
                     rs.getString("CONTENT"),
                     rs.getString("USER_ID"),
                     rs.getString("IMAGE_ID"),
-                    rs.getInt("LIKE_COUNT")
+                    rs.getLong("LIKE_COUNT")
             );
         }
     }

src/main/java/db/CommentDatabase.java

@@ -1,53 +1,44 @@
 package db;
 
+import db.config.CustomJdbcTemplate;
+import db.config.RowMapper;
 import model.Comment;
 
 import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Optional;
+import java.util.List;
 
 public class CommentDatabase {
 
     private final CustomJdbcTemplate jdbcTemplate;
-    private static final String INSERT_SQL = "insert into COMMENT (COMMENT_ID, CONTENT, USER_ID, ARTICLE_ID) values (?, ?, ?, ?)";
-    private static final String UPDATE_SQL = "update COMMENT set CONTENT = ?, USER_ID = ?, ARTICLE_ID = ? where COMMENT_ID = ?";
-    private static final String SELECT_SQL = "select * from COMMENT where COMMENT_ID = ?";
+    private static final String INSERT_SQL = "insert into COMMENT (CONTENT, USER_ID, ARTICLE_ID) values (?, ?, ?)";
+    private static final String SELECT_SQL_BY_ARTICLE_ID = "select * from COMMENT where ARTICLE_ID = ?";
 
     public CommentDatabase(DataSource dataSource) {
         jdbcTemplate = new CustomJdbcTemplate(dataSource);
     }
 
     public void save(Comment comment) {
         jdbcTemplate.update(INSERT_SQL,
-                comment.commentId(),
-                comment.content(),
-                comment.userId(),
-                comment.articleId()
+                comment.getContent(),
+                comment.getUserId(),
+                comment.getArticleId()
         );
     }
 
-    public void update(Comment comment) {
-        jdbcTemplate.update(UPDATE_SQL,
-                comment.content(),
-                comment.userId(),
-                comment.articleId(),
-                comment.commentId()
-        );
-    }
-
-    public Optional<Comment> findById(String commentId) {
-        return jdbcTemplate.queryForObject(SELECT_SQL, new CommentRowMapper(), commentId);
+    public List<Comment> findAllByArticleId(Long articleId) {
+        return jdbcTemplate.query(SELECT_SQL_BY_ARTICLE_ID, new CommentRowMapper(), articleId);
     }
 
-    static class CommentRowMapper implements RowMapper<Comment>{
+    static class CommentRowMapper implements RowMapper<Comment> {
         @Override
         public Comment mapRow(ResultSet rs) throws SQLException {
             return new Comment(
-                    rs.getString("COMMENT_ID"),
+                    rs.getLong("COMMENT_ID"),
                     rs.getString("CONTENT"),
                     rs.getString("USER_ID"),
-                    rs.getString("ARTICLE_ID")
+                    rs.getLong("ARTICLE_ID")
             );
         }
     }

src/main/java/db/ImageDatabase.java

@@ -1,13 +1,14 @@
 package db;
 
+import db.config.CustomJdbcTemplate;
+import db.config.RowMapper;
 import enums.ContentTypes;
 import exception.NotFoundException;
 import model.Image;
 
 import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Optional;
 
 public class ImageDatabase {
 
@@ -28,16 +29,12 @@ public void update(Image image){
         jdbcTemplate.update(UPDATE_SQL, image.bytes(), image.fileName(), image.contentType().getExtension(), image.imageId());
     }
 
-    public Optional<Image> findById(String imageId) {
-        return jdbcTemplate.queryForObject(SELECT_SQL, new ImageRowMapper(), imageId);
-    }
-
-    public Image findByIdOrThrow(String imageId) {
+    public Image findByIdOrElseThrow(String imageId) {
         return jdbcTemplate.queryForObject(SELECT_SQL, new ImageRowMapper(), imageId)
                 .orElseThrow(() -> new NotFoundException(imageId + " image not found"));
     }
 
-    static class ImageRowMapper implements RowMapper<Image>{
+    static class ImageRowMapper implements RowMapper<Image> {
         @Override
         public Image mapRow(ResultSet rs) throws SQLException {
             return new Image(

src/main/java/db/UserDatabase.java

@@ -1,10 +1,14 @@
 package db;
 
+import db.config.CustomJdbcTemplate;
+import db.config.RowMapper;
+import exception.NotFoundException;
 import model.User;
 
 import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.List;
 import java.util.Optional;
 
 public class UserDatabase {
@@ -13,6 +17,7 @@ public class UserDatabase {
     private static final String INSERT_SQL = "insert into USERS (USER_ID, PASSWORD, NAME, EMAIL, IMAGE_ID) values (?, ?, ?, ?, ?)";
     private static final String UPDATE_SQL = "update USERS set PASSWORD = ?, NAME = ?, EMAIL = ?, IMAGE_ID = ? where USER_ID = ?";
     private static final String SELECT_SQL = "select * from USERS u where u.USER_ID = ?";
+    private static final String SELECT_ALL_SQL = "select * from USERS";
     private static final String SELECT_SQL_BY_NAME = "select * from USERS where NAME = ?";
 
     public UserDatabase(DataSource dataSource) {
@@ -45,11 +50,20 @@ public Optional<User> findById(String userId) {
         return jdbcTemplate.queryForObject(SELECT_SQL, new UserRowMapper(), userId);
     }
 
+    public User findByIdOrElseThrow(String userId) {
+        return jdbcTemplate.queryForObject(SELECT_SQL, new UserRowMapper(), userId)
+                .orElseThrow(() -> new NotFoundException("user not found"));
+    }
+
     public Optional<User> findByName(String name) {
         return jdbcTemplate.queryForObject(SELECT_SQL_BY_NAME, new UserRowMapper(), name);
     }
 
-    static class UserRowMapper implements RowMapper<User>{
+    public List<User> findAll() {
+        return jdbcTemplate.query(SELECT_ALL_SQL, new UserRowMapper());
+    }
+
+    static class UserRowMapper implements RowMapper<User> {
         @Override
         public User mapRow(ResultSet rs) throws SQLException {
             return new User(

src/main/java/db/Cache.java → src/main/java/db/cache/Cache.java

@@ -1,4 +1,4 @@
-package db;
+package db.cache;
 
 public interface Cache<K, V> {
 

src/main/java/db/ConcurrentMapCache.java → src/main/java/db/cache/ConcurrentMapCache.java

@@ -1,4 +1,4 @@
-package db;
+package db.cache;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

src/main/java/db/SessionManager.java → src/main/java/db/cache/SessionManager.java

@@ -1,7 +1,8 @@
-package db;
+package db.cache;
 
 import java.util.Optional;
 import java.util.UUID;
+
 import model.User;
 
 public class SessionManager {

src/main/java/db/ConnectionConst.java → src/main/java/db/config/ConnectionConst.java

@@ -1,6 +1,10 @@
-package db;
+package db.config;
 
 public abstract class ConnectionConst {
+
+    private ConnectionConst(){
+    }
+
     public static final String URL = "jdbc:h2:tcp://localhost/~/test";
     public static final String USERNAME = "sa";
     public static final String PASSWORD = "";

src/main/java/db/CustomDataSource.java → src/main/java/db/config/CustomDataSource.java

@@ -1,4 +1,4 @@
-package db;
+package db.config;
 
 import javax.sql.DataSource;
 import java.io.PrintWriter;
@@ -8,7 +8,7 @@
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.logging.Logger;
 
-import static db.ConnectionConst.*;
+import static db.config.ConnectionConst.*;
 
 public class CustomDataSource implements DataSource {
     @Override

src/main/java/db/CustomJdbcTemplate.java → src/main/java/db/config/CustomJdbcTemplate.java

@@ -1,4 +1,4 @@
-package db;
+package db.config;
 
 import javax.sql.DataSource;
 import java.sql.*;
@@ -47,6 +47,26 @@ public int update(String sql, Object... args) {
         }
     }
 
+    public <K> Optional<K> updateAndGetKey(String sql, RowMapper<K> rowMapper, Object... args) {
+        try (Connection con = dataSource.getConnection();
+             PreparedStatement pstmt = con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
+
+            setParameters(pstmt, args);
+            pstmt.executeUpdate();
+
+            try (ResultSet rs = pstmt.getGeneratedKeys()) {
+                if (rs.next()) {
+                    return Optional.ofNullable(rowMapper.mapRow(rs));
+                }
+                return Optional.empty();
+            }
+
+        } catch (SQLException e) {
+            throw new RuntimeException("DB Update Error: " + sql, e);
+        }
+    }
+
+
     private void setParameters(PreparedStatement pstmt, Object[] args) throws SQLException {
         for (int i = 0; i < args.length; i++) {
             pstmt.setObject(i + 1, args[i]);

src/main/java/db/config/DatabaseConfig.java

@@ -0,0 +1,13 @@
+package db.config;
+
+import db.*;
+
+public class DatabaseConfig {
+    private DatabaseConfig(){
+    }
+
+    public static final UserDatabase userDatabase = new UserDatabase(new CustomDataSource());
+    public static final ArticleDatabase articleDatabase = new ArticleDatabase(new CustomDataSource());
+    public static final ImageDatabase imageDatabase = new ImageDatabase(new CustomDataSource());
+    public static final CommentDatabase commentDatabase = new CommentDatabase(new CustomDataSource());
+}