diff --git a/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java b/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java index 4dd3fc9ee0eb89271c09e2be17efe58d431d7d6a..b5653750848473a98683c4139322cb892f2ab712 100644 --- a/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java +++ b/src/main/java/org/olat/admin/user/delete/service/UserDeletionManager.java @@ -296,9 +296,6 @@ public class UserDeletionManager extends BasicManager { //remove identity from groups groupDao.removeMemberships(identity); - //remove all advance orders in auto-booking access manager - autoAccessManager.deleteAdvanceOrders(identity); - String key = identity.getUser().getProperty("emchangeKey", null); TemporaryKey tempKey = registrationManager.loadTemporaryKeyByRegistrationKey(key); if (tempKey != null) { diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java index a96e49e9c387d23cbefbf93ac4f93b12046a3253..46763178ab1230fc457044281294232a48e526cc 100644 --- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java +++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java @@ -19,6 +19,7 @@ */ package org.olat.resource.accesscontrol.provider.auto.manager; +import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.EnumMap; @@ -43,6 +44,7 @@ import org.olat.resource.accesscontrol.provider.auto.AdvanceOrderInput; import org.olat.resource.accesscontrol.provider.auto.AutoAccessManager; import org.olat.resource.accesscontrol.provider.auto.IdentifierKey; import org.olat.resource.accesscontrol.provider.auto.model.AutoAccessMethod; +import org.olat.user.UserDataDeletable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +56,7 @@ import org.springframework.stereotype.Service; * */ @Service -public class AutoAccessManagerImpl implements AutoAccessManager { +public class AutoAccessManagerImpl implements AutoAccessManager, UserDataDeletable { private static final OLog log = Tracing.createLoggerFor(AutoAccessManagerImpl.class); @@ -219,4 +221,9 @@ public class AutoAccessManagerImpl implements AutoAccessManager { acService.accessResource(identity, offerAccess, null); } + @Override + public void deleteUserData(Identity identity, String newDeletedUserName, File archivePath) { + deleteAdvanceOrders(identity); + } + }