Changeset 1577 for trunk

Timestamp:

12/31/15 14:31:46 (9 years ago)

Author:

nanardon

Message:

Make expiration synchronisation with employment configurable

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases/Sql/Employment.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (1 diff)
• man/man8/latmos-accounts-base-sql.pod (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Employment.pm

@@ -285 +285 @@
 
     my %changes;
-    foreach (qw( endEmployment endStrictEmployment endCurrentEmployment endLastEmployment )) {
+    my @employmentDate = qw( endEmployment endStrictEmployment endCurrentEmployment endLastEmployment );
+    foreach (@employmentDate) {
         my $old = $user->_get_attributes($_) || '';
         my $new = $user->_get_attributes("_$_") || '';
@@ -295 +296 @@
     # If there is no current employment we try to find any to not let expire
     # unset
-    my $endemploy = $currentemployment
-        ? $user->_get_attributes('_endEmployment')
-        : $user->_get_attributes('_endLastEmployment');
-    my $nextexpire = str2time($endemploy || '1970-01-01T00:00:00');
-
-    if ($expire != $nextexpire) {
-        $changes{expire} = $endemploy;
+
+    my $expireOn = $self->base->config('expireOn') || '';
+    if (!grep { $_ eq $expireOn } (@employmentDate, '', 'never')) {
+        $self->base->log(LA_ERR, "expireOn set to invalid parameter %s, using endEmployment instead", $expireOn); 
+        $expireOn = 'endEmployment';
+    }
+
+    if ($expireOn ne 'never') {
+        my $endemploy = $currentemployment
+            ? $user->_get_attributes("_$expireOn")
+            : $user->_get_attributes('_endLastEmployment');
+        my $nextexpire = str2time($endemploy || '1970-01-01T00:00:00');
+
+        if ($expire != $nextexpire) {
+            $changes{expire} = $endemploy;
+        }
     }
 
     if (keys %changes) {
         $user->ReportChange('Update', 'Update %s to match employment', join(', ', sort keys %changes));
-        $user->ReportChange('Update', 'Expire update to %s to match employment', ($endemploy || '(none)'))
+        $user->ReportChange('Update', 'Expire update to %s to match employment', ($changes{expire} || '(none)'))
             if (exists($changes{expire}));
         $user->set_fields(%changes);

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -1104 +1104 @@
     };
 
-    foreach (qw(expire contratType managerContact company endcircuit department)) {
-        $attrs->{$_}{ro} = sub {
-
-            my $setting = $base->config('employment_lock_user') || 'any';
-
-            for ($setting) {
-                /^always$/ and return 1;
-                /^never$/ and return 0;
-
-                !$_[0] and return 1;
-
-                /^any$/i and return $_[0]->listEmployment ? 1 : 0;
-                /^active/i and do {
-                    return $_[0]->_get_c_field('currentEmployment')
-                        ? 1
-                        : $_[0]->_get_c_field('nextEmployment') ? 1 : 0;
-                };
-                /(\S+)=(\S+)/ and do {
-                    my $attr = $_[0]->_get_c_field($1);
-                    if (defined($attr)) {
-                        if ($2 eq '*') {
-                            return 1;
-                        } elsif($2 eq $attr) {
-                            return 1;
-                        } else {
-                            return 0;
-                        }
+    my $employmentro = sub {
+        my $setting = $base->config('employment_lock_user') || 'any';
+
+        for ($setting) {
+            /^always$/ and return 1;
+            /^never$/ and return 0;
+
+            !$_[0] and return 1;
+
+            /^any$/i and return $_[0]->listEmployment ? 1 : 0;
+            /^active/i and do {
+                return $_[0]->_get_c_field('currentEmployment')
+                ? 1
+                : $_[0]->_get_c_field('nextEmployment') ? 1 : 0;
+            };
+            /(\S+)=(\S+)/ and do {
+                my $attr = $_[0]->_get_c_field($1);
+                if (defined($attr)) {
+                    if ($2 eq '*') {
+                        return 1;
+                    } elsif($2 eq $attr) {
+                        return 1;
                     } else {
                         return 0;
                     }
-                };
-            }
-            return $_[0]->listEmployment ? 1 : 0; # default is any!
-        };
+                } else {
+                    return 0;
+                }
+            };
+        }
+        return $_[0]->listEmployment ? 1 : 0; # default is any!
+    };
+
+    foreach (qw(contratType managerContact company endcircuit department)) {
+        $attrs->{$_}{ro} = $employmentro;
     }
+
+    $attrs->{expire}{ro} = sub {
+        my $expireOn = $base->config('expireOn') || '';
+        if ($expireOn eq 'never') {
+            return 0;
+        }
+
+        $employmentro->($_[0]);
+    };
 
     $class->SUPER::_get_attr_schema($base, $attrs)

trunk/LATMOS-Accounts/man/man8/latmos-accounts-base-sql.pod

@@ -150 +150 @@
 The end of the employment matching current date.
 
+=head3 Account Expiration
+
+When using employment, account expiration are set to match employment. By
+default the expiration is set to C<endEmployment> value.
+
+This behaviour can be changed by setting C<expireOn> parameter into base
+definition:
+
+=over 4
+
+=item any of endCurrentEmployment, endEmployment, endStrictEmployment, endLastEmployment
+
+=item never
+
+The expire date is left unchanged and must managed manually.
+
+=back
+
 =head2 Group AutoMemberFilter