From a99428fa9ac61d16759401fd604265872430ac03 Mon Sep 17 00:00:00 2001
From: Michael Simon <simon@kit.edu>
Date: Thu, 12 Sep 2024 09:05:01 +0200
Subject: [PATCH] ISSUE-206 expire user
---
.../src/main/java/edu/kit/scc/webreg/job/UserExpire.java | 2 +-
.../edu/kit/scc/webreg/service/impl/AbstractUserUpdater.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
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 5c0e468fc..a8708c383 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 0fdea223f..6745f1f06 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);
--
GitLab