Changeset 1926 for trunk

Timestamp:

01/12/17 11:20:42 (7 years ago)

Author:

nanardon

Message:

Fix the marker set and detection

File:

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

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

@@ -149 +149 @@
         }
 
-        if (my $val = $self->{_base}->get_global_value("expiredWarning.user.$user")) {
-            if ($val eq $ouser->get_attributes(_DATEFLAG)) {
-                # Warning has been already sent
-                next;
-            }
-        }
 
         my $manager = $ouser->get_attributes('manager') || 'N/A';
@@ -170 +164 @@
         foreach my $manager (sort keys %expired) {
 
+            my $omanager = $self->{_base}->get_object('user', $manager) or next;
+            my $mail = $omanager->get_attributes('mail') or next;
+
+            my $data = {
+                manager => $omanager,
+                users => [],
+            };
+
             foreach my $ouser (@{ $expired{$manager}{users}}) {
+                if (my $val = $self->{_base}->get_global_value("expiredWarning.user." . $ouser->id)) {
+                    if ($val eq $ouser->get_attributes(_DATEFLAG)) {
+                        # Warning has been already sent
+                        next;
+                    }
+                }
                 $self->{_base}->log(
                     LA_NOTICE,
@@ -179 +187 @@
                     $manager,
                 );
+                push(@{ $data->{users} }, $ouser);
                 $self->{_base}->set_global_value('expiredWarning.user.' . $ouser->id, $ouser->get_attributes(_DATEFLAG));
             }
+            if (! @{ $data->{users} }) {
+                next;
+            }
             $self->{_base}->commit;
 
-            my $omanager = $self->{_base}->get_object('user', $manager) or next;
-            my $mail = $omanager->get_attributes('mail') or next;
-
-            $expired{$manager}{manager} = $omanager;
 
             my %mail = (
@@ -200 +208 @@
                 $self->{_base}->log(LA_NOTICE, "Test: sending mail to %s for expired account %s",
                     $omanager->id,
-                    join(', ', sort map { $_->id } @{ $expired{$manager}{users}}),
+                    join(', ', sort map { $_->id } @{ $data->{users} }),
                 );
             } else {
-                if ($lamail->process(\%mail, $expired{$manager})) {
+                if ($lamail->process(\%mail, $data)) {
                     $self->{_base}->log(LA_NOTICE,
                         "Expired account reminder mail sent to %s (%s) (cc: %s) for %s",
@@ -209 +217 @@
                         $omanager->id,
                         ($mail{cc} || ''),
-                        join(', ', sort map { $_->id } @{ $expired{$manager}{users}}),
+                        join(', ', sort map { $_->id } @{ $data->{users}}),
                     );
 
@@ -222 +230 @@
             foreach (@{$expired{$manager}{users}}) {
 
-                if (my $val = $self->{_base}->get_global_value("expiredWarning.usersummary.$_")) {
+                if (my $val = $self->{_base}->get_global_value("expiredWarning.usersummary." . $_->id)) {
                     if ($val eq $_->get_attributes(_DATEFLAG)) {
                         # Warning has been already sent
@@ -241 +249 @@
                 $self->{_base}->set_global_value('expiredWarning.usersummary.' . $_->id, $_->get_attributes(_DATEFLAG));
             }
-            $self->{_base}->commit;
-        }
+        }
+
+        $self->{_base}->commit;
 
         if (@summary) {
             if ($test) {
                 $self->{_base}->log(LA_NOTICE, "Test: no sending expired summary to $sumto for users");
+                $self->{_base}->log(LA_DEBUG, join('', @summary));
             } else {
                 my %mail = (