mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-22 14:17:57 +01:00
Improve purge.
This commit is contained in:
parent
dcd59efc12
commit
3137f78cce
@ -67,5 +67,5 @@ public interface MindmapManager {
|
|||||||
|
|
||||||
void updateCollaboration(@NotNull Collaboration collaboration);
|
void updateCollaboration(@NotNull Collaboration collaboration);
|
||||||
|
|
||||||
void removeHistory(int mapId);
|
void purgeHistory(int mapId);
|
||||||
}
|
}
|
||||||
|
@ -73,23 +73,25 @@ public class MindmapManagerImpl
|
|||||||
getHibernateTemplate().save(collaboration);
|
getHibernateTemplate().save(collaboration);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Purge history map ....
|
|
||||||
* @param mapId
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public void removeHistory(int mapId) {
|
public void purgeHistory(int mapId) {
|
||||||
final Criteria hibernateCriteria = getSession().createCriteria(MindMapHistory.class);
|
final Criteria hibernateCriteria = getSession().createCriteria(MindMapHistory.class);
|
||||||
hibernateCriteria.add(Restrictions.eq("mindmapId", mapId));
|
hibernateCriteria.add(Restrictions.eq("mindmapId", mapId));
|
||||||
hibernateCriteria.addOrder(Order.desc("creationTime"));
|
hibernateCriteria.addOrder(Order.desc("creationTime"));
|
||||||
|
|
||||||
final List<MindMapHistory> historyList = hibernateCriteria.list();
|
final List<MindMapHistory> historyList = hibernateCriteria.list();
|
||||||
int i = 0;
|
|
||||||
for (MindMapHistory history : historyList) {
|
final Mindmap mindmapById = this.getMindmapById(mapId);
|
||||||
if (i > 20) {
|
final Calendar yearAgo = Calendar.getInstance();
|
||||||
getHibernateTemplate().delete(history);
|
yearAgo.add(Calendar.MONTH, -12);
|
||||||
|
|
||||||
|
// If the map has not been modified in the last months, it means that I don't need to keep all the history ...
|
||||||
|
int max = mindmapById.getLastModificationTime().before(yearAgo) ? 10 : 25;
|
||||||
|
|
||||||
|
if (historyList.size() > max) {
|
||||||
|
for (int i = max; i < historyList.size(); i++) {
|
||||||
|
getHibernateTemplate().delete(historyList.get(i));
|
||||||
}
|
}
|
||||||
i++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,7 +29,6 @@ import com.wisemapping.service.UserService;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
import org.springframework.beans.factory.annotation.Qualifier;
|
||||||
import org.springframework.dao.DataAccessException;
|
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@ -167,7 +166,7 @@ public class AdminController extends BaseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Purge history ...
|
// Purge history ...
|
||||||
mindmapService.removeHistory(mindmap.getId());
|
mindmapService.purgeHistory(mindmap.getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -185,7 +184,7 @@ public class AdminController extends BaseController {
|
|||||||
@RequestMapping(method = RequestMethod.GET, value = "admin/database/purge/history")
|
@RequestMapping(method = RequestMethod.GET, value = "admin/database/purge/history")
|
||||||
public void purgeHistory(@RequestParam(required = true) Integer mapId) throws WiseMappingException, UnsupportedEncodingException {
|
public void purgeHistory(@RequestParam(required = true) Integer mapId) throws WiseMappingException, UnsupportedEncodingException {
|
||||||
|
|
||||||
mindmapService.removeHistory(mapId);
|
mindmapService.purgeHistory(mapId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -68,5 +68,5 @@ public interface MindmapService {
|
|||||||
|
|
||||||
boolean isAdmin(@Nullable User user);
|
boolean isAdmin(@Nullable User user);
|
||||||
|
|
||||||
void removeHistory(int mapId);
|
void purgeHistory(int mapId);
|
||||||
}
|
}
|
||||||
|
@ -83,8 +83,8 @@ public class MindmapServiceImpl
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeHistory(int mapId) {
|
public void purgeHistory(int mapId) {
|
||||||
mindmapManager.removeHistory(mapId);
|
mindmapManager.purgeHistory(mapId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
<value>update*</value>
|
<value>update*</value>
|
||||||
<value>add*</value>
|
<value>add*</value>
|
||||||
<value>remove*</value>
|
<value>remove*</value>
|
||||||
|
<value>purge*</value>
|
||||||
<value>revert*</value>
|
<value>revert*</value>
|
||||||
</list>
|
</list>
|
||||||
</property>
|
</property>
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
<property name="dataSource" ref="wiseDataSource"/>
|
<property name="dataSource" ref="wiseDataSource"/>
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<!-- Hibernate Template Defintion -->
|
<!-- Hibernate Template Definition -->
|
||||||
<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
|
<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
|
||||||
<property name="sessionFactory" ref="mindmapSessionFactory"/>
|
<property name="sessionFactory" ref="mindmapSessionFactory"/>
|
||||||
<property name="jdbcExceptionTranslator" ref="jdbcExceptionTranslator"/>
|
<property name="jdbcExceptionTranslator" ref="jdbcExceptionTranslator"/>
|
||||||
|
Loading…
Reference in New Issue
Block a user