Changeset 1881 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Timestamp:

12/27/16 12:21:55 (8 years ago)

Author:

nanardon

Message:

Add test mode, delay warning after modif too

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Delexpiredusers.pm (modified) (9 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Delexpiredusers.pm

@@ -42 +42 @@
 Default is 60 minutes.
 
+=head2 test
+
+If set only log are emitted but changes are not done and mail not really sent
+
 =head2 cc
 
@@ -111 +115 @@
     my ($self) = @_;
 
+    my $test = $self->{syncm}->ini->val($self->{name}, 'test');
     my $warnDelay = $self->{syncm}->ini->val($self->{name}, 'warndelay');
+
+    my $modifDelay = $self->{syncm}->ini->val($self->{name}, 'modifdelay', 60);
+    my $waitAfterModif = DateTime->now->subtract( minutes => $modifDelay  )->iso8601;
        
     defined($warnDelay)  or do {
@@ -123 +131 @@
 
     foreach my $user ($self->{_base}->search_objects('user',
-            'exported=1', 'expired<' . $expiredDate->ymd('-'), 'oalias=NULL')) {
+            'exported=1',
+            'expired<' . $expiredDate->ymd('-'),
+            'date<' . $waitAfterModif,
+            'oalias=NULL'
+        )) {
         my $ouser = $self->{_base}->get_object('user', $user) or next;
 
@@ -140 +152 @@
         my $manager = $ouser->get_attributes('manager') || 'N/A';
 
+        $self->{_base}->log(
+            $test ? LA_DEBUG : LA_NOTICE,
+            "%sUser %s is expired (%s), sending warning to %s",
+            $test ? 'Test: ' : '',
+            $user,
+            $ouser->get_attributes('expireText'),
+            $manager,
+        );
+            
         $expired{$manager} ||= { users => [] };
         push (@{$expired{$manager}{users}}, $ouser);
@@ -166 +187 @@
 
 
-        if ($lamail->process(\%mail, $expired{$manager})) {
-            $self->{_base}->log(LA_NOTICE,
-                "Expired account reminder mail sent to %s (%s) (cc: %s) for %s",
-                $mail{to},
+        if ($test) {
+            $self->{_base}->log(LA_NOTICE, "Test: sending mail to %s for expired account %s",
                 $omanager->id,
-                ($mail{cc} || ''),
                 join(', ', sort map { $_->id } @{ $expired{$manager}{users}}),
             );
-
-            foreach my $ouser (@{ $expired{$manager}{users}}) {
-                $self->{_base}->set_global_value('expiredWarning.user.' . $ouser->id, $ouser->get_attributes(_DATEFLAG));
+        } else {
+            if ($lamail->process(\%mail, $expired{$manager})) {
+                $self->{_base}->log(LA_NOTICE,
+                    "Expired account reminder mail sent to %s (%s) (cc: %s) for %s",
+                    $mail{to},
+                    $omanager->id,
+                    ($mail{cc} || ''),
+                    join(', ', sort map { $_->id } @{ $expired{$manager}{users}}),
+                );
+
+                foreach my $ouser (@{ $expired{$manager}{users}}) {
+                    $self->{_base}->set_global_value('expiredWarning.user.' . $ouser->id, $ouser->get_attributes(_DATEFLAG));
+                }
+                $self->{_base}->commit;
             }
-            $self->{_base}->commit;
         }
     }
@@ -198 +226 @@
         }
 
-        if (@summary) {
+        if (@summary && !$test) {
             my %mail = (
                 Subject => 'LATMOS expired account (to disable)',
@@ -219 +247 @@
     my ($self) = @_;
 
+    my $test = $self->{syncm}->ini->val($self->{name}, 'test');
+
     my $warnDelay     = $self->{syncm}->ini->val($self->{name}, 'warndelay', 0);
     my $unexportDelay = $self->{syncm}->ini->val($self->{name}, 'unexportdelay');
@@ -234 +264 @@
             'exported=1',
             'expired<' . $expiredDate->ymd('-'),
-            'date>' . $waitAfterModif,
+            'date<' . $waitAfterModif,
             'oalias=NULL'
         )) {
@@ -243 +273 @@
         }
 
-        $self->{_base}->log(LA_NOTICE, "User $user unexported because is expired");
-        $ouser->_set_c_fields(
-            unexported => 1
-        );
-        $self->{_base}->del_global_value("expiredWarning.user.$user");
-        $self->{_base}->commit;
+        $self->{_base}->log(LA_NOTICE, "%sUser $user unexported because is expired", $test ? 'Test: ' : '');
+
+        if (!$test) {
+            $ouser->_set_c_fields(
+                unexported => 1
+            );
+            $self->{_base}->del_global_value("expiredWarning.user.$user");
+            $self->{_base}->commit;
+        }
     }
 }