Fix lifecycle management

indigo-iam · Dec 20, 2024 · 284fbeb · 284fbeb
1 parent 8f068aa
commit 284fbeb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...ogin-service/src/main/java/it/infn/mw/iam/core/lifecycle/cern/CernHrLifecycleHandler.java b/...ogin-service/src/main/java/it/infn/mw/iam/core/lifecycle/cern/CernHrLifecycleHandler.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.joda.time.DateTimeComparator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Profile;
@@ -128,17 +129,16 @@ public void handleAccount(String cernPersonId, String experiment, IamAccount a)
       return;
     }
 
-    syncAccountEndTime(a, ep.get().getEndDate());
-    setCernStatusLabel(a, CernStatus.VO_MEMBER, format(SYNCHRONIZED_MESSAGE));
-
-    if (CernHrLifecycleUtils.isActiveMembership(a.getEndTime()) && !a.isActive()
+    if (CernHrLifecycleUtils.isActiveMembership(ep.get().getEndDate()) && !a.isActive()
         && accountWasSuspendedByIamLifecycleJob(a)) {
       restoreAccount(a);
     }
+    syncAccountEndTime(a, ep.get().getEndDate());
+    setCernStatusLabel(a, CernStatus.VO_MEMBER, format(SYNCHRONIZED_MESSAGE));
   }
 
   private void expireIfActiveAndMember(IamAccount a) {
-    if (CernHrLifecycleUtils.isActiveMembership(a.getEndTime()) && a.isActive()) {
+    if (DateTimeComparator.getInstance().compare(a.getEndTime(), new Date()) > 0 && a.isActive()) {
       expireAccount(a);
     }
   }
@@ -238,8 +238,6 @@ private void setCernStatusLabel(IamAccount a, CernStatus status, String message)
 
   private void restoreAccount(IamAccount a) {
     accountService.restoreAccount(a);
-    IamLabel statusLabel = CernHrLifecycleUtils.buildLifecycleStatusLabel();
-    accountService.deleteLabel(a, statusLabel);
   }
 
   private void syncAccountEndTime(IamAccount a, Date endDate) {

diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/core/user/DefaultIamAccountService.java b/iam-login-service/src/main/java/it/infn/mw/iam/core/user/DefaultIamAccountService.java
@@ -18,6 +18,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Strings.isNullOrEmpty;
+import static it.infn.mw.iam.core.lifecycle.ExpiredAccountsHandler.LIFECYCLE_STATUS_LABEL;
 import static java.lang.String.format;
 import static java.util.Objects.isNull;
 
@@ -460,6 +461,7 @@ public IamAccount setAccountEndTime(IamAccount account, Date endTime) {
     Date previousEndTime = account.getEndTime();
     if (ObjectUtils.notEqual(previousEndTime, endTime)) {
       account.setEndTime(endTime);
+      account.removeLabelByName(LIFECYCLE_STATUS_LABEL);
       account.touch();
       accountRepo.save(account);
       eventPublisher.publishEvent(new AccountEndTimeUpdatedEvent(this, account, previousEndTime,