diff --git a/docs-core/src/main/java/com/sismics/docs/core/dao/AuditLogDao.java b/docs-core/src/main/java/com/sismics/docs/core/dao/AuditLogDao.java index 037ef676..cb3d54e9 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/dao/AuditLogDao.java +++ b/docs-core/src/main/java/com/sismics/docs/core/dao/AuditLogDao.java @@ -61,6 +61,7 @@ public class AuditLogDao { queries.add(baseQuery + " where l.LOG_IDENTITY_C in (select f.FIL_ID_C from T_FILE f where f.FIL_IDDOC_C = :documentId) "); queries.add(baseQuery + " where l.LOG_IDENTITY_C in (select c.COM_ID_C from T_COMMENT c where c.COM_IDDOC_C = :documentId) "); queries.add(baseQuery + " where l.LOG_IDENTITY_C in (select a.ACL_ID_C from T_ACL a where a.ACL_SOURCEID_C = :documentId) "); + queries.add(baseQuery + " where l.LOG_IDENTITY_C in (select r.RTE_ID_C from T_ROUTE r where r.RTE_IDDOCUMENT_C = :documentId) "); parameterMap.put("documentId", criteria.getDocumentId()); } diff --git a/docs-core/src/main/java/com/sismics/docs/core/dao/RouteDao.java b/docs-core/src/main/java/com/sismics/docs/core/dao/RouteDao.java index 04f338db..f9feaa50 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/dao/RouteDao.java +++ b/docs-core/src/main/java/com/sismics/docs/core/dao/RouteDao.java @@ -91,10 +91,15 @@ public class RouteDao { * Deletes a route and the associated steps. * * @param routeId Route ID + * @param userId User ID */ - public void deleteRoute(String routeId) { + public void deleteRoute(String routeId, String userId) { EntityManager em = ThreadLocalContext.get().getEntityManager(); + // Create audit log + Route route = em.find(Route.class, routeId); + AuditLogUtil.create(route, AuditLogType.DELETE, userId); + em.createNativeQuery("update T_ROUTE_STEP rs set RTP_DELETEDATE_D = :dateNow where rs.RTP_IDROUTE_C = :routeId and rs.RTP_DELETEDATE_D is null") .setParameter("routeId", routeId) .setParameter("dateNow", new Date()) diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/RouteResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/RouteResource.java index 57b66b91..30e71a63 100644 --- a/docs-web/src/main/java/com/sismics/docs/rest/resource/RouteResource.java +++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/RouteResource.java @@ -326,7 +326,7 @@ public class RouteResource extends BaseResource { // Delete the route and the steps RouteDao routeDao = new RouteDao(); - routeDao.deleteRoute(routeStepDto.getRouteId()); + routeDao.deleteRoute(routeStepDto.getRouteId(), principal.getId()); // Always return OK JsonObjectBuilder response = Json.createObjectBuilder()