fixed checkinContent

Author: gdesiato

logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/DocumentServiceImpl.java

@@ -2498,13 +2498,11 @@ public GUIDocument checkinContent(long docId, String content) throws ServerExcep
 
 		try {
 			DocumentDAO docDao = Context.get(DocumentDAO.class);
-			Document doc = docDao.findById(docId);
+			Document doc = docDao.findDocument(docId);
 			if (doc == null)
 				throw new ServerException(UNEXISTING_DOCUMENT);
 
-			FolderDAO fDao = Context.get(FolderDAO.class);
-			if (!fDao.isWriteAllowed(doc.getFolder().getId(), session.getUserId()))
-				throw new PermissionException(session.getUsername(), DOCUMENT_STR + docId, Permission.WRITE);
+			docDao.isWriteAllowed(docId, session.getUserId());
 
 			if (doc.getStatus() != DocumentStatus.CHECKEDOUT || doc.getLockUserId() != session.getUserId())
 				throw new PermissionException("You have not checked out the file " + docId);
@@ -2535,15 +2533,11 @@ public void replaceFile(long docId, String fileVersion, String comment) throws S
 
 		try {
 			DocumentDAO docDao = Context.get(DocumentDAO.class);
-			Document doc = docDao.findById(docId);
+			Document doc = docDao.findDocument(docId);
 			if (doc == null)
 				throw new ServerException(UNEXISTING_DOCUMENT);
 
-			FolderDAO fDao = Context.get(FolderDAO.class);
-			if (!fDao.isWriteAllowed(doc.getFolder().getId(), session.getUserId()))
-				throw new IOException("You don't have the WRITE permission");
-
-			doc = docDao.findDocument(docId);
+			docDao.isWriteAllowed(docId, session.getUserId());
 
 			if (doc.getStatus() != DocumentStatus.UNLOCKED)
 				throw new IOException("The document is locked");

logicaldoc-webapp/src/test/java/com/logicaldoc/web/service/DocumentServiceImplTest.java

@@ -342,13 +342,25 @@ public void testCreateWithContent() throws ServerException {
 	}
 
 	@Test
-	public void testCheckinContext() throws ServerException {
+	public void testCheckinContext() throws ServerException, PersistenceException {
 		testCreateWithContent();
 		testSubject.checkout(List.of(7L));
 
 		testSubject.checkinContent(7, "checkedin contents");
 
-		assertEquals("checkedin contents", testSubject.getContentAsString(7));
+		// try to work on an alias
+		Document alias=new Document();
+		alias.setFileName("alias.txt");
+		alias.setDocRef(7L);
+		alias.setFolder(folderDao.findById(5L));
+		
+		assertEquals("checkedin contents", testSubject.getContentAsString(7L));
+		
+		docDao.store(alias);
+		testSubject.checkout(List.of(alias.getId()));
+		testSubject.checkinContent(alias.getId(), "checkedin contents2");
+		
+		assertEquals("checkedin contents2", testSubject.getContentAsString(alias.getId()));
 	}
 
 	@Test