Changeset 1633 for ComponentRegistry/branches/jeaferversion/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.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/ComponentRegistryDbImpl.java (modified) (16 diffs)

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

@@ -3 +3 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -29 +30 @@
 import clarin.cmdi.componentregistry.impl.ComponentRegistryImplBase;
 import clarin.cmdi.componentregistry.model.AbstractDescription;
-import clarin.cmdi.componentregistry.model.CommentMapping.Comment;
+import clarin.cmdi.componentregistry.model.Comment;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;
@@ -50 +51 @@
     @Autowired
     private ComponentDescriptionDao componentDescriptionDao;
-    @Autowired    
+    @Autowired
     private UserDao userDao;
     @Autowired
@@ -132 +133 @@
             return commentsDao.getCommentsFromProfile(profileId);
         } catch (DataAccessException ex) {
+            throw new ComponentRegistryException("Database access error while trying to get list of comments from profile", ex);
+        }
+    }
+
+    @Override
+    public Comment getSpecifiedCommentInProfile(String commentId) throws ComponentRegistryException {
+        try {
+            return commentsDao.getSpecifiedCommentFromProfile(commentId);
+        } catch (DataAccessException ex) {
             throw new ComponentRegistryException("Database access error while trying to get comment from profile", ex);
         }
@@ -137 +147 @@
 
     @Override
-    public Comment getSpecifiedCommentInProfile(String commentId) throws ComponentRegistryException {
-        try {
-            return commentsDao.getSpecifiedCommentFromProfile(commentId);
+    public List<Comment> getCommentsInComponent(String componentId) throws ComponentRegistryException {
+        try {
+            return commentsDao.getCommentsFromComponent(componentId);
+        } catch (DataAccessException ex) {
+            throw new ComponentRegistryException("Database access error while trying to get list of comments from component", ex);
+        }
+    }
+
+    @Override
+    public Comment getSpecifiedCommentInComponent(String commentId) throws ComponentRegistryException {
+        try {
+            return commentsDao.getSpecifiedCommentFromComponent(commentId);
         } catch (DataAccessException ex) {
             throw new ComponentRegistryException("Database access error while trying to get comment from component", ex);
         }
     }
-
-    @Override
-    public List<Comment> getCommentsInComponent(String componentId) throws ComponentRegistryException {
-        try {
-            return commentsDao.getCommentsFromComponent(componentId);
-        } catch (DataAccessException ex) {
-            throw new ComponentRegistryException("Database access error while trying to get comment from component", ex);
-        }
-    }
-
-    @Override
-    public Comment getSpecifiedCommentInComponent(String commentId) throws ComponentRegistryException {
-        try {
-            return commentsDao.getSpecifiedCommentFromComponent(commentId);
-        } catch (DataAccessException ex) {
-            throw new ComponentRegistryException("Database access error while trying to get comment from component", ex);
-        }
-    }
-
-//    @Override
-//    public List<Comment> getComments() throws ComponentRegistryException {
-//        throw new UnsupportedOperationException("Not supported yet.");
-//    }
 
     @Override
@@ -212 +208 @@
         }
     }
-
-////    @Override
-////    public CMDComponentSpec getMDComment(String id) throws ComponentRegistryException {
-//////        if (inWorkspace(commentsDao, id)) {
-//////            CMDComponentSpec result = commentsCache.get(id);
-//////            if (result == null && !commentsCache.containsKey(id)) {
-//////                result = getUncachedMDComment(id);
-//////                commentsCache.put(id, result);
-//////            }
-//////            return result;
-//////        } else {
-//////            // May exist, but not in this workspace
-////            return null;
-//////       }
-////    }
-//
-////    public CMDComponentSpec getUncachedMDComment(String id) throws ComponentRegistryException {
-////        try {
-////            return getUncachedMDComment(id, commentsDao);
-////        } catch (DataAccessException ex) {
-////            throw new ComponentRegistryException("Database access error while trying to get component", ex);
-//       }
-//  }
 
     @Override
@@ -383 +356 @@
         }
     }
-    
-//    public void deleteMDComment(String commentId, Principal principal) throws UserUnauthorizedException, DeleteFailedException, ComponentRegistryException {
-//        Comment desc = getCommentsInComponent(commentId);
-//        if(desc != null) {
-//            try {
-//                checkAuthorisationComment(desc, principal);
-//                checkCommentAge(desc, principal);
-//                commentsDao.setDeleted(desc, true);
-//                invalidateCommentCache(desc);
-//            } catch (DataAccessException ex) {
-//                throw new DeleteFailedException("Database access error while trying to delete profile", ex);
-//            }
-//        }
-//    }
 
     @Override
@@ -450 +409 @@
         }
     }
-    
-//        private void invalidateCommentCache(Comment comment) {
-//            commentsCache.remove(comment.getId());
-//    }
 
     private AbstractDescriptionDao<?> getDaoForDescription(AbstractDescription description) {
@@ -459 +414 @@
     }
     
-//    private CommentsDao getDaoForCommentDescription(Comment comment) {
-//        return commentsDao;
-//    }
 
     /**
@@ -488 +440 @@
     }
 
-    
-//        private Number getIdForCommentDescription(Comment comment) throws IllegalArgumentException {
-//        Number dbId = null;
-//        CommentsDao dao = getDaoForCommentDescription(comment);
-//        try {
-//            dbId = dao.getDbId(comment.getId());
-//        } catch (DataAccessException ex) {
-//            LOG.error("Error getting dbId for comment with id " + comment.getId(), ex);
-//        }
-//        if (dbId == null) {
-//            throw new IllegalArgumentException("Could not get database Id for description");
-//        } else {
-//            return dbId;
-//        }
-//    }
+        private Number getIdForCommentDescription(Comment comment) throws IllegalArgumentException {
+        Number dbId = null;
+        try {
+            dbId = commentsDao.getDbId(Integer.parseInt(comment.getId()));
+        } catch (DataAccessException ex) {
+            LOG.error("Error getting dbId for comment with id " + comment.getId(), ex);
+        }
+        if (dbId == null) {
+            throw new IllegalArgumentException("Could not get database Id for description");
+        } else {
+            return dbId;
+        }
+    }
     
     private String componentSpecToString(CMDComponentSpec spec) throws UnsupportedEncodingException, JAXBException {
@@ -527 +477 @@
     }
 
-//    private CMDComponentSpec getUncachedMDComment(String id, CommentsDao dao) {
-//        String xml = dao.getContent(false, id);
-//        if (xml != null) {
-//            try {
-//                InputStream is = new ByteArrayInputStream(xml.getBytes("UTF-8"));
-//                return MDMarshaller.unmarshal(CMDComponentSpec.class, is, null);
-//
-//            } catch (JAXBException ex) {
-//                LOG.error(null, ex);
-//            } catch (UnsupportedEncodingException ex) {
-//                LOG.error(null, ex);
-//            }
-//        }
-//        return null;
-//    }
-
     private void checkAuthorisation(AbstractDescription desc, Principal principal) throws UserUnauthorizedException {
         if (!isOwnerOfDescription(desc, principal.getName()) && !configuration.isAdminUser(principal)) {
@@ -550 +484 @@
         }
     }
-    
-//    private void checkAuthorisationComment(Comment desc, Principal principal)throws UserUnauthorizedException {
-//        if (!isOwnerOfComment(desc, principal.getName()) && !configuration.isAdminUser(principal)) {
-//            throw new UserUnauthorizedException("Unauthorized operation user '" + principal.getName()
-//                    + "' is not the creator (nor an administrator) of the " + (desc.getId()) + "(" + desc
-//                    + ").");
-//        }
-//    }
+
+    private void checkAuthorisationComment(Comment desc, Principal principal) throws UserUnauthorizedException {
+        if (!isOwnerOfComment(desc, principal.getName()) && !configuration.isAdminUser(principal)) {
+            throw new UserUnauthorizedException("Unauthorized operation user '" + principal.getName()
+                    + "' is not the creator (nor an administrator) of the " + (desc.getId()) + "(" + desc
+                    + ").");
+        }
+    }
 
     private boolean isOwnerOfDescription(AbstractDescription desc, String principalName) {
@@ -564 +498 @@
                 && principalName.equals(owner);
     }
+
+        private boolean isOwnerOfComment(Comment desc, String principalName) {
+        String owner = commentsDao.getOwnerPrincipalName(getIdForCommentDescription(desc));
+        return owner != null // If owner is null, no one can be owner
+                && principalName.equals(owner);
+    }
     
-//        private boolean isOwnerOfComment(Comment desc, String principalName) {
-//        String owner = getDaoForCommentDescription(desc).getOwnerPrincipalName(getIdForCommentDescription(desc));
-//        return owner != null // If owner is null, no one can be owner
-//                && principalName.equals(owner);
-//    }
-
     private void checkAge(AbstractDescription desc, Principal principal) throws DeleteFailedException {
         if (isPublic() && !configuration.isAdminUser(principal)) {
@@ -588 +522 @@
         }
     }
-    
-//        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 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) {
@@ -622 +556 @@
 //        }
 //    }
-
     @Override
     public String getName() {
@@ -641 +574 @@
         return componentDescriptionDao.getDeletedDescriptions(getUserId());
     }
-}
+
+    @Override
+    public void deleteComment(String commentId, Principal principal) throws IOException, 
+    ComponentRegistryException, UserUnauthorizedException, DeleteFailedException {
+
+            Comment com = commentsDao.getById(commentId);        
+            if (com!= null) {
+            try {
+                    checkAuthorisationComment(com, principal);
+                    checkCommentAge(com, principal);
+                    commentsDao.deleteComment(com, true);
+                } catch (DataAccessException ex) {
+                    throw new DeleteFailedException("Database access error while trying to delete component", ex);
+                }
+            }
+        }
+    }