Changeset 1633 for ComponentRegistry/branches/jeaferversion/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/CommentsDao.java

Timestamp:

11/30/11 13:18:31 (13 years ago)

Author:

jeafer

Message:

Jean-Charles branch commit2,
Changes regarding comment on the ComponentRegistry service.
Delete_comment from RestService? to Database access (CommentsDao?) implemented.
Post_comment from RestService? to Database access (CommentsDao?) implemented. (Not yet tested)
Comment class updated
TestComment? class updated
DataBase? : Table comment updated, Corrections of fkey references
Validate classes implemented to validate comment

File:

• ComponentRegistry/branches/jeaferversion/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/CommentsDao.java (modified) (9 diffs)

ComponentRegistry/branches/jeaferversion/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/CommentsDao.java

@@ -5 +5 @@
 package clarin.cmdi.componentregistry.impl.database;
 
-import clarin.cmdi.componentregistry.model.CommentMapping.Comment;
+import clarin.cmdi.componentregistry.model.Comment;
 
 import java.util.Date;
@@ -17 +17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
+import org.springframework.jdbc.core.simple.ParameterizedSingleColumnRowMapper;
 import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
 
 /**
@@ -26 +31 @@
  */
 public class CommentsDao extends ComponentRegistryDao<Comment> {
+
+    @Autowired
+    private PlatformTransactionManager txManager;
+    @Autowired
+    private TransactionDefinition txDefinition;
     private final static Logger LOG = LoggerFactory.getLogger(CommentsDao.class);
-    private final static String SELECT_BASE = "SELECT " + COLUMN_ID + ", comments, comment_date, user_id FROM " + TABLE_COMMENTS;
-
-//    @Autowired
-//   private PlatformTransactionManager txManager;
-//    @Autowired
-//    private TransactionDefinition txDefinition;
-//        public List<Comment> getAllComments() throws DataAccessException {
-//      return getList(SELECT_BASE);
-//    }
-        protected String getTableName() {
+    private final static String SELECT_BASE = "SELECT " + COLUMN_ID + ", comments, comment_date, user_id, "
+            + "component_description_id, profile_description_id FROM " + TABLE_COMMENTS;
+
+    protected String getTableName() {
         return TABLE_COMMENTS;
     }
-        
+
     public List<Comment> getAllComments() throws DataAccessException {
-        return getList(SELECT_BASE);
-    }
-    
-    
-    
-    
+        return getList(SELECT_BASE);
+    }
+
     /**
      *
@@ -67 +68 @@
 
     public Comment getSpecifiedCommentFromProfile(String commentId) throws DataAccessException {
-        String select = SELECT_BASE + " WHERE "+ COLUMN_ID + " = " + commentId;
-        return getFirstOrNull(select, commentId);
+        //String select = SELECT_BASE + " WHERE " + COLUMN_ID + " = ?";
+        return getFirstOrNull(SELECT_BASE + " WHERE " + COLUMN_ID + " = ?", Integer.parseInt(commentId));
     }
 
@@ -77 +78 @@
      */
     public Comment getSpecifiedCommentFromComponent(String commentId) throws DataAccessException {
-        String select = SELECT_BASE + " WHERE "+ COLUMN_ID + " = " + commentId;
-        return getFirstOrNull(select, commentId);
+        //String select = SELECT_BASE + " WHERE " + COLUMN_ID + " =  ?";
+        return getFirstOrNull(SELECT_BASE + " WHERE " + COLUMN_ID + " =  ?", Integer.parseInt(commentId));
     }
 
     public List<Comment> getCommentsFromComponent(String componentId) throws DataAccessException {
-        return getList(SELECT_BASE + " WHERE component_description_id =" + componentId);
-    }
-    
-    
-        public Comment getByComment(String aComment) throws DataAccessException {
-        return getFirstOrNull(SELECT_BASE + " WHERE comments = ?", aComment);
+        return getList(SELECT_BASE + " WHERE component_description_id = ?", componentId);
+    }
+
+    public Comment getByComment(String aComment) throws DataAccessException {
+        return getFirstOrNull(SELECT_BASE + " WHERE comments = ?", aComment);
     }
 
@@ -96 +96 @@
      * @return Principal name of description's owner, if any. Otherwise, null.
      */
-//    public String getOwnerPrincipalName(Number id) {
-//      StringBuilder select = new StringBuilder("SELECT principal_name FROM " + TABLE_REGISTRY_USER);
-//      select.append(" JOIN ").append(getTableName());
-//      select.append(" ON user_id = " + TABLE_REGISTRY_USER + ".id ");
-//      select.append(" WHERE ").append(getTableName()).append(".id = ?");
-//      List<String> owner = getSimpleJdbcTemplate().query(select.toString(), new ParameterizedSingleColumnRowMapper<String>(), id);
-//      if (owner.isEmpty()) {
-//          return null;
-//      } else {
-//          return owner.get(0);
-//      }
-//    }
+    public String getOwnerPrincipalName(Number id) {
+        StringBuilder select = new StringBuilder("SELECT principal_name FROM " + TABLE_REGISTRY_USER);
+        select.append(" JOIN ").append(getTableName());
+        select.append(" ON user_id = " + TABLE_REGISTRY_USER + ".id ");
+        select.append(" WHERE ").append(getTableName()).append(".id = ?");
+        List<String> owner = getSimpleJdbcTemplate().query(select.toString(), new ParameterizedSingleColumnRowMapper<String>(), id);
+        if (owner.isEmpty()) {
+            return null;
+        } else {
+            return owner.get(0);
+        }
+    }
     /**
      *
@@ -121 +121 @@
         params.put("comments", comment.getComment());
         params.put("comment_date", extractTimestamp(comment));
-        params.put("component_description", comment.getComponentDescriptionId());
-        params.put("profile_description", comment.getProfileDescriptionId());
+        params.put("component_description_id", comment.getComponentDescriptionId());
+        params.put("profile_description_id", comment.getProfileDescriptionId());
         params.put("user_id", comment.getUserId());
         return insert.executeAndReturnKey(params);
@@ -139 +139 @@
             comment.setId(rs.getString(COLUMN_ID));
             comment.setComment(rs.getString("comments"));
+            comment.setComponentDescriptionId(rs.getString("component_description_id"));
+            comment.setProfileDescriptionId(rs.getString("profile_description_id"));
+            comment.setUserId(rs.getString("user_id"));
             comment.setCommentDate(commentDate == null ? null : Comment.createNewDate(commentDate.getTime()));
             return comment;
@@ -163 +166 @@
 //        throw new UnsupportedOperationException("Not yet implemented");
 //    }
-//    void setDeleted(Comment desc, boolean isDeleted) throws DataAccessException {
-//      TransactionStatus transaction = getTransaction();
-//      Number dbId = getDbId(desc.getId());
-//      StringBuilder update = new StringBuilder("UPDATE ").append(getTableName());
-//      update.append(" SET is_deleted = ").append(Boolean.toString(isDeleted)).append(" WHERE " + COLUMN_ID + " = ?");
-//      getSimpleJdbcTemplate().update(update.toString(), dbId);
-//      txManager.commit(transaction);
-//    }
-//    
-        public Number getDbId(Number cmdId) {
-        StringBuilder query = new StringBuilder("SELECT " + COLUMN_ID + " FROM ").append(getTableName());
-        query.append(" WHERE ").append(getDbId(cmdId)).append(" = ?");
-        return getSimpleJdbcTemplate().queryForInt(query.toString(), cmdId);
-    }
-        
-            private Timestamp extractTimestamp(Comment comment) {
-        if (comment.getCommentDate() != null) {
-            try {
-                Date date = Comment.getDate(comment.getCommentDate());
-                return new Timestamp(date.getTime());
-            } catch (ParseException ex) {
-                LOG.warn("Could not convert registration date " + comment.getCommentDate() + " to date", ex);
-            } catch (IllegalArgumentException ex) {
-                LOG.warn("Could not convert registration date " + comment.getCommentDate() + " to timestamp", ex);
-            }
-        }
-        return null;
-    }
-//
-//        private TransactionStatus getTransaction() {
-//      return txManager.getTransaction(txDefinition);
-//    }
+
+    public void deleteComment(Comment com, boolean isDeleted) throws DataAccessException {
+        TransactionStatus transaction = getTransaction();
+        Number dbId = getDbId(Integer.parseInt(com.getId()));
+        StringBuilder delete = new StringBuilder("DELETE ").append(getTableName());
+        delete.append(" WHERE " + COLUMN_ID + " = ?");
+        getSimpleJdbcTemplate().update(delete.toString(), dbId);
+        txManager.commit(transaction);
+    }
+
+    public Number getDbId(Number cmdId) {
+        StringBuilder query = new StringBuilder("SELECT " + COLUMN_ID + " FROM ").append(getTableName());
+        query.append(" WHERE ").append(getDbId(cmdId)).append(" = ?");
+        return getSimpleJdbcTemplate().queryForInt(query.toString(), cmdId);
+    }
+
+    private Timestamp extractTimestamp(Comment comment) {
+        if (comment.getCommentDate() != null) {
+            try {
+                Date date = Comment.getDate(comment.getCommentDate());
+                return new Timestamp(date.getTime());
+            } catch (ParseException ex) {
+                LOG.warn("Could not convert registration date " + comment.getCommentDate() + " to date", ex);
+            } catch (IllegalArgumentException ex) {
+                LOG.warn("Could not convert registration date " + comment.getCommentDate() + " to timestamp", ex);
+            }
+        }
+        return null;
+    }
+
+    private TransactionStatus getTransaction() {
+        return txManager.getTransaction(txDefinition);
+    }
 }