public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-15 10:46:26 +00:00
Code Issues Releases Wiki Activity

Closes #48: Delete linked data properly + batch to clean orphan data

Browse Source
This commit is contained in:
jendib
2015-12-01 00:32:57 +01:00
parent 3dbdf88124
commit e930ce4d47
6 changed files with 167 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/DocumentDao.java
View File

@@ -67,6 +67,20 @@ public class DocumentDao {
return q.getResultList();
}
/**
* Returns the list of all documents from a user.
*
* @param userId User ID
* @return List of documents
*/
@SuppressWarnings("unchecked")
public List<Document> findByUserId(String userId) {
EntityManager em = ThreadLocalContext.get().getEntityManager();
Query q = em.createQuery("select d from Document d where d.userId = :userId and d.deleteDate is null");
q.setParameter("userId", userId);
return q.getResultList();
}
/**
* Returns an active document.
*
@@ -149,13 +163,12 @@ public class DocumentDao {
q.setParameter("dateNow", dateNow);
q.executeUpdate();
// TODO Delete share from deleted ACLs
// q = em.createQuery("update Share s set s.deleteDate = :dateNow where s.documentId = :documentId and s.deleteDate is null");
// q.setParameter("documentId", id);
// q.setParameter("dateNow", dateNow);
// q.executeUpdate();
q = em.createQuery("update Acl a set a.deleteDate = :dateNow where a.sourceId = :documentId and a.deleteDate is null");
q.setParameter("documentId", id);
q.setParameter("dateNow", dateNow);
q.executeUpdate();
q = em.createQuery("update Acl a set a.deleteDate = :dateNow where a.sourceId = :documentId");
q = em.createQuery("update DocumentTag dt set dt.deleteDate = :dateNow where dt.documentId = :documentId and dt.deleteDate is not null");
q.setParameter("documentId", id);
q.setParameter("dateNow", dateNow);
q.executeUpdate();

14
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/FileDao.java
View File

@@ -53,6 +53,20 @@ public class FileDao {
return q.getResultList();
}
/**
* Returns the list of all files from a user.
*
* @param userId User ID
* @return List of files
*/
@SuppressWarnings("unchecked")
public List<File> findByUserId(String userId) {
EntityManager em = ThreadLocalContext.get().getEntityManager();
Query q = em.createQuery("select f from File f where f.userId = :userId and f.deleteDate is null");
q.setParameter("userId", userId);
return q.getResultList();
}
/**
* Returns an active file.
*

7
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java
View File

@@ -240,10 +240,12 @@ public class TagDao {
Tag tagDb = (Tag) q.getSingleResult();
// Delete the tag
tagDb.setDeleteDate(new Date());
Date dateNow = new Date();
tagDb.setDeleteDate(dateNow);
// Delete linked data
q = em.createQuery("delete DocumentTag dt where dt.tagId = :tagId");
q = em.createQuery("update DocumentTag dt set dt.deleteDate = :dateNow where dt.tagId = :tagId and dt.deleteDate is not null");
q.setParameter("dateNow", dateNow);
q.setParameter("tagId", tagId);
q.executeUpdate();
@@ -291,3 +293,4 @@ public class TagDao {
return tagFromDb;
}
}

20
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/UserDao.java
View File

@@ -204,6 +204,26 @@ public class UserDao {
q.setParameter("userId", userFromDb.getId());
q.executeUpdate();
q = em.createQuery("update Document d set d.deleteDate = :dateNow where d.userId = :userId and d.deleteDate is null");
q.setParameter("userId", userFromDb.getId());
q.setParameter("dateNow", dateNow);
q.executeUpdate();
q = em.createQuery("update File f set f.deleteDate = :dateNow where f.userId = :userId and f.deleteDate is null");
q.setParameter("userId", userFromDb.getId());
q.setParameter("dateNow", dateNow);
q.executeUpdate();
q = em.createQuery("update Acl a set a.deleteDate = :dateNow where a.targetId = :userId and a.deleteDate is null");
q.setParameter("userId", userFromDb.getId());
q.setParameter("dateNow", dateNow);
q.executeUpdate();
q = em.createQuery("update Comment c set c.deleteDate = :dateNow where c.userId = :userId and c.deleteDate is null");
q.setParameter("userId", userFromDb.getId());
q.setParameter("dateNow", dateNow);
q.executeUpdate();
// Create audit log
AuditLogUtil.create(userFromDb, AuditLogType.DELETE);
}