diff --git a/wherehows-dao/src/main/java/wherehows/models/table/DatasetComment.java b/wherehows-dao/src/main/java/wherehows/models/table/DatasetComment.java index e17ef9e135..71de397e62 100644 --- a/wherehows-dao/src/main/java/wherehows/models/table/DatasetComment.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/DatasetComment.java @@ -21,8 +21,8 @@ public class DatasetComment { public String authorName; public String authorUserName; public String authorEmail; - public String created; - public String modified; + public long created; + public long modified; public String type; public Boolean isAuthor; } \ No newline at end of file diff --git a/wherehows-frontend/app/controllers/api/v1/Dataset.java b/wherehows-frontend/app/controllers/api/v1/Dataset.java index d6d815f1b0..bbe810e6ec 100644 --- a/wherehows-frontend/app/controllers/api/v1/Dataset.java +++ b/wherehows-frontend/app/controllers/api/v1/Dataset.java @@ -451,6 +451,10 @@ public class Dataset extends Controller { Map params = request().body().asFormUrlEncoded(); if (StringUtils.isNotBlank(username)) { + if (!params.containsKey("id")) { + params.put("id", new String[]{String.valueOf(commentId)}); + } + if (DatasetsDAO.postComment(id, params, username)) { result.put("status", "success"); return ok(result); diff --git a/wherehows-frontend/app/dao/DatasetCommentRowMapper.java b/wherehows-frontend/app/dao/DatasetCommentRowMapper.java index 226d3e3441..028eba9c96 100644 --- a/wherehows-frontend/app/dao/DatasetCommentRowMapper.java +++ b/wherehows-frontend/app/dao/DatasetCommentRowMapper.java @@ -13,6 +13,7 @@ */ package dao; +import java.sql.Timestamp; import wherehows.models.table.DatasetComment; import org.apache.commons.lang3.StringUtils; import org.springframework.jdbc.core.RowMapper; @@ -34,13 +35,13 @@ public class DatasetCommentRowMapper implements RowMapper public static String USER_NAME_COLUMN = "username"; @Override - public DatasetComment mapRow(ResultSet rs, int rowNum) throws SQLException { + public DatasetComment mapRow(ResultSet rs, int rowNum) throws SQLException { int id = rs.getInt(ID_COLUMN); int datasetId = rs.getInt(DATASET_ID_COLUMN); String text = rs.getString(TEXT_COLUMN); - String created = rs.getString(CREATED_TIME_COLUMN); - String modified = rs.getString(MODIFIED_TIME_COLUMN); + Timestamp created = rs.getTimestamp(CREATED_TIME_COLUMN); + Timestamp modified = rs.getTimestamp(MODIFIED_TIME_COLUMN); String type = rs.getString(COMMENT_TYPE_COLUMN); if (StringUtils.isBlank(type)) { @@ -53,8 +54,8 @@ public class DatasetCommentRowMapper implements RowMapper datasetComment.id = id; datasetComment.datasetId = datasetId; datasetComment.text = text; - datasetComment.created = created; - datasetComment.modified = modified; + datasetComment.created = created.getTime(); + datasetComment.modified = modified.getTime(); datasetComment.type = type; datasetComment.authorName = authorName; datasetComment.authorEmail = authorEmail; diff --git a/wherehows-frontend/app/dao/DatasetsDAO.java b/wherehows-frontend/app/dao/DatasetsDAO.java index 11bca61b62..5f47fbb29d 100644 --- a/wherehows-frontend/app/dao/DatasetsDAO.java +++ b/wherehows-frontend/app/dao/DatasetsDAO.java @@ -221,6 +221,9 @@ public class DatasetsDAO extends AbstractMySQLOpenSourceDAO private final static String CREATE_DATASET_COMMENT = "INSERT INTO comments " + "(text, user_id, dataset_id, created, modified, comment_type) VALUES(?, ?, ?, NOW(), NOW(), ?)"; + private final static String UPDATE_DATASET_COMMENT = "UPDATE comments " + + "SET text = ?, comment_type = ?, modified = NOW() WHERE id = ?"; + private final static String GET_WATCHED_URN_ID = "SELECT id FROM watch " + "WHERE user_id = ? and item_type = 'urn' and urn = ?"; @@ -245,9 +248,6 @@ public class DatasetsDAO extends AbstractMySQLOpenSourceDAO private final static String CREATE_COLUMN_COMMENT = "INSERT INTO field_comments " + "(comment, user_id, created, modified, comment_crc32_checksum) VALUES(?, ?, NOW(), NOW(), CRC32(?))"; - private final static String UPDATE_DATASET_COMMENT = "UPDATE comments " + - "SET text = ?, comment_type = ?, modified = NOW() WHERE id = ?"; - private final static String UPDATE_COLUMN_COMMENT = "UPDATE field_comments " + "SET comment = ?, modified = NOW() WHERE id = ?";