Changeset 1636 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

01/15/16 17:10:56 (8 years ago)

Author:

nanardon

Message:

Compute start/end date on employment deletion too

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql

Files:

• Employment.pm (modified) (3 diffs)
• User.pm (modified) (1 diff)

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

@@ -312 +312 @@
 }
 
+sub _delete {
+    my ($class, $base, $id) = @_;
+
+    my $obj = $base->get_object($class->type, $id)
+        or return;
+
+    my $user = $obj->_get_attributes('user');
+
+    my $res = $class->SUPER::_delete($base, $id);
+    if ($res) {
+        my $ouser = $base->get_object('user', $user);
+        $ouser->computeEmploymentDate;
+    }
+
+    $res
+}
+
 =head2 applyToUser()
 
@@ -328 +345 @@
     $user->base->log(LA_DEBUG, "Applying Employement %s to user %s", $self->id, $user->id);
 
+    $user->computeEmploymentDate;
+
     my $currentemployment = $user->get_attributes('currentEmployment') || '';
-
-    my $expire = str2time($user->get_attributes('expire') || '1970-01-01T00:00:00');
-
-    my %changes;
-    my @employmentDate = qw(
-        endEmployment   endStrictEmployment   endCurrentEmployment   endLastEmployment
-        startEmployment startStrictEmployment startCurrentEmployment startFirstEmployment
-    );
-    foreach (@employmentDate) {
-        my $old = $user->_get_attributes($_) || '';
-        my $new = $user->_get_attributes("_$_") || '';
-        if ($old ne $new) {
-            $changes{$_} = $new || undef;
-        }
-    }
-
-    # If there is no current employment we try to find any to not let expire
-    # unset
-
-    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 = undef;
-    }
-    $expireOn ||= 'endEmployment';
-
-    if ($expireOn ne 'never') {
-        my $endemploy = $currentemployment
-            ? $user->_get_attributes("_$expireOn")
-            : (($self->base->config('unemployed_expire') ||'') eq 'no'
-                ? undef
-                : $user->_get_attributes('create'));
-
-        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', ($changes{expire} || '(none)'))
-            if (exists($changes{expire}));
-        $user->set_fields(%changes);
-    }
 
     if (!$currentemployment) {
@@ -475 +448 @@
     }
 
-
     return 1;
 }

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

@@ -1362 +1362 @@
 }
 
+=head2 computeEmploymentDate
+
+Compute and copy to user start and end employment date
+
+=cut
+
+sub computeEmploymentDate {
+    my ($self) = @_;
+
+    my $currentemployment = $self->get_attributes('currentEmployment') || '';
+
+    my $expire = str2time($self->get_attributes('expire') || '1970-01-01T00:00:00');
+
+    my %changes;
+    my @employmentDate = qw(
+        endEmployment   endStrictEmployment   endCurrentEmployment   endLastEmployment
+        startEmployment startStrictEmployment startCurrentEmployment startFirstEmployment
+    );
+    foreach (@employmentDate) {
+        my $old = $self->_get_attributes($_) || '';
+        my $new = $self->_get_attributes("_$_") || '';
+        if ($old ne $new) {
+            $changes{$_} = $new || undef;
+        }
+    }
+
+    # If there is no current employment we try to find any to not let expire
+    # unset
+
+    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 = undef;
+    }
+    $expireOn ||= 'endEmployment';
+
+    if ($expireOn ne 'never') {
+        my $endemploy = $currentemployment
+            ? $self->_get_attributes("_$expireOn")
+            : (($self->base->config('unemployed_expire') ||'') eq 'no'
+                ? undef
+                : $self->_get_attributes('create'));
+
+        my $nextexpire = str2time( $endemploy || '1970-01-01T00:00:00' );
+
+        if ($expire != $nextexpire) {
+            $changes{expire} = $endemploy;
+        }
+    }
+
+    if (keys %changes) {
+        $self->ReportChange('Update', 'Update %s to match employment', join(', ', sort keys %changes));
+        $self->ReportChange('Update', 'Expire update to %s to match employment', ($changes{expire} || '(none)'))
+            if (exists($changes{expire}));
+        $self->set_fields(%changes);
+    }
+
+    return 1;
+}
+
 sub _computeStartEmployment {
     my ($self, $delay) = @_;