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

Timestamp:

12/08/11 12:53:53 (12 years ago)

Author:

jeafer

Message:

Jean-Charles branch ComponentRegistry commit5 (functionnal),
Changes regarding comment on the ComponentRegistry.

Modification of classes CommentsDao?
Response class has been split up. A general class ComponentRegistryResponse?
a abstractDescription response: RegisterResponse?
a comment response : CommentResponse?
Improvement of validation process for comments
Improvement of ComponentRegistryRestService?
New classes test CommentResponseTest? and CommentValidatorTest?

Documentation added to most classes
Clean up code in other classes

File:

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

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

@@ -69 +69 @@
      */
     public List<Comment> getCommentsFromProfile(String profileId) throws DataAccessException {
-        return getList(SELECT_BASE + " WHERE profile_description_id = ?", profileId);
+        return getList((SELECT_BASE + " WHERE profile_description_id = ?").concat(getOrderByDate()), profileId);
     }
 
@@ -79 +79 @@
      */
     public Comment getSpecifiedCommentFromProfile(String commentId) throws DataAccessException {
-        //String select = SELECT_BASE + " WHERE " + COLUMN_ID + " = ?";
         return getFirstOrNull(SELECT_BASE + " WHERE " + COLUMN_ID + " = ?", Integer.parseInt(commentId));
     }
@@ -90 +89 @@
      */
     public List<Comment> getCommentsFromComponent(String componentId) throws DataAccessException {
-        return getList(SELECT_BASE + " WHERE component_description_id = ?", componentId);
+        return getList((SELECT_BASE + " WHERE component_description_id = ?").concat(getOrderByDate()), componentId);
     }
 
@@ -134 +133 @@
      * @throws DataAccessException
      */
-    public Number insertComment(Comment comment, String content, Number userId) throws DataAccessException {
+    public Number insertComment(Comment comment, Number userId) throws DataAccessException {
         TransactionStatus transaction = getTransaction();
         try {
-            SimpleJdbcInsert insert = new SimpleJdbcInsert(getDataSource()).withTableName(TABLE_COMMENTS).usingGeneratedKeyColumns(
-                    COLUMN_ID);
             SimpleJdbcInsert insertComment = new SimpleJdbcInsert(getDataSource()).withTableName(getTableName()).usingGeneratedKeyColumns(COLUMN_ID);
             Map<String, Object> params = new HashMap<String, Object>();
@@ -241 +238 @@
         return getFirstOrNull(SELECT_BASE + " WHERE comments = ?", aComment);
     }
+    
+    /**
+     * Sort the returned comments per date from the most recent to the oldest
+     * @return 
+     */
+        private String getOrderByDate() {
+        return " order by comment_date asc ";
+    }
 }