diff --git a/bwreg-service/src/main/java/edu/kit/scc/webreg/job/UserExpire.java b/bwreg-service/src/main/java/edu/kit/scc/webreg/job/UserExpire.java index 5c0e468fc9ecdc5249fd54ac7186e96c74629d1f..a8708c383fe1a9dbc89ad33df1120f0e129dfeb3 100644 --- a/bwreg-service/src/main/java/edu/kit/scc/webreg/job/UserExpire.java +++ b/bwreg-service/src/main/java/edu/kit/scc/webreg/job/UserExpire.java @@ -61,7 +61,7 @@ public class UserExpire extends AbstractExecutableJob { for (UserEntity user : userList) { logger.debug("Inspecting user {} - {} - {} - {} - {}", user.getId(), user.getEppn(), user.getEmail(), user.getUserStatus(), user.getLastStatusChange()); - //TODO expire user + service.expireUser(user, emailTemplateName); } } catch (NamingException e) { diff --git a/regapp-idty/src/main/java/edu/kit/scc/webreg/service/impl/AbstractUserUpdater.java b/regapp-idty/src/main/java/edu/kit/scc/webreg/service/impl/AbstractUserUpdater.java index 0fdea223f87858d776f9b7da346c779733c79e37..6745f1f06f8ddacee503b668ba7cb8bf3274084e 100644 --- a/regapp-idty/src/main/java/edu/kit/scc/webreg/service/impl/AbstractUserUpdater.java +++ b/regapp-idty/src/main/java/edu/kit/scc/webreg/service/impl/AbstractUserUpdater.java @@ -153,6 +153,8 @@ public abstract class AbstractUserUpdater<T extends UserEntity> implements UserU SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); user.getGenericStore().put("epired_on", df.format(new Date())); + fireUserChangeEvent(user, auditor.getActualExecutor(), auditor); + return user; } finally { auditor.setUser(user);