Changeset 1635 for ComponentRegistry/branches/jeaferversion/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

Timestamp:

12/01/11 15:04:15 (13 years ago)

Author:

jeafer

Message:

Jean-Charles branch commit3,
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
CommentsDao? updated
CommentTest? class implemented (New Class)
Test classes ComponentRegistryRestServiceTest? and RegistryHelperTest? starting to implement tests for Comment validation (insertion, deletion)

File:

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

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

@@ -230 +230 @@
         }
     }
+    
+    @Override
+    public int registerComment(Comment comment, Comment spec){
+        try {
+            String xml = commmentSpecToString(spec);
+            // Convert principal name to user record id
+            Number uid = convertUserIdInComment(comment);
+            commentsDao.insertComment(comment, xml, uid);
+            return 0;
+        } catch (DataAccessException ex) {
+            LOG.error("Database error while registering component", ex);
+            return -1;
+        } catch (JAXBException ex) {
+            LOG.error("Error while registering component", ex);
+            return -2;
+        } catch (UnsupportedEncodingException ex) {
+            LOG.error("Error while registering component", ex);
+            return -3;
+        }
+    }
 
     /**
@@ -253 +273 @@
         if (uid != null) {
             description.setUserId(uid.toString());
+        }
+        return uid;
+    }
+    
+        private Number convertUserIdInComment(Comment comment) throws DataAccessException {
+        Number uid = null;
+        if (comment.getUserId() != null) {
+            User user = userDao.getByPrincipalName(comment.getUserId());
+            if (user != null) {
+                uid = user.getId();
+            }
+        } else {
+            uid = userId;
+        }
+        if (uid != null) {
+            comment.setUserId(uid.toString());
         }
         return uid;
@@ -460 +496 @@
         return xml;
     }
+    
+        private String commmentSpecToString(Comment spec) throws UnsupportedEncodingException, JAXBException {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        MDMarshaller.marshal(spec, os);
+        String xml = os.toString("UTF-8");
+        return xml;
+    }
 
     private CMDComponentSpec getUncachedMDComponent(String id, AbstractDescriptionDao dao) {
@@ -523 +566 @@
     }
 
-    private void checkCommentAge(Comment desc, Principal principal) throws DeleteFailedException {
-        if (isPublic() && !configuration.isAdminUser(principal)) {
-            try {
-                Date regDate = Comment.getDate(desc.getCommentDate());
-                Calendar calendar = Calendar.getInstance();
-                calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1);
-                if (regDate.before(calendar.getTime())) { // More then month old
-                    throw new DeleteFailedException(
-                            "The "
-                            + (desc.getId())
-                            + " is more then a month old and cannot be deleted anymore.");
-                }
-            } catch (ParseException e) {
-                LOG.error("Cannot parse date of " + desc + " Error:" + e);
-            }
-        }
-    }
-
     private boolean inWorkspace(AbstractDescriptionDao<?> dao, String cmdId) {
         if (isPublic()) {
@@ -549 +574 @@
     }
 
-//    private boolean inWorkspace(CommentsDao dao, String cmdId) {
-//        if (isPublic()) {
-//            return dao.isPublic(cmdId);
-//        } else {
-//            return dao.isInUserSpace(cmdId, getUserId());
-//        }
-//    }
     @Override
     public String getName() {
@@ -583 +601 @@
             try {
                     checkAuthorisationComment(com, principal);
-                    checkCommentAge(com, principal);
                     commentsDao.deleteComment(com, true);
                 } catch (DataAccessException ex) {