Changeset 1612 for trunk

Timestamp:

01/08/16 17:10:13 (9 years ago)

Author:

nanardon

Message:

Account with employement not yet started are by default expired

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql/Employment.pm (modified) (3 diffs)
• Bases/Sql/User.pm (modified) (1 diff)
• Task/Employment.pm (modified) (1 diff)

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

@@ -315 +315 @@
         my $endemploy = $currentemployment
             ? $user->_get_attributes("_$expireOn")
-            : $user->_get_attributes('_endLastEmployment');
-        my $nextexpire = str2time($endemploy || '1970-01-01T00:00:00');
+            : ($self->base->config('unemployed_expire') eq 'no'
+                ? undef
+                : $user->_get_attributes('create'));
+
+        my $nextexpire = str2time( $endemploy || '1970-01-01T00:00:00' );
 
         if ($expire != $nextexpire) {
@@ -330 +333 @@
     }
 
-    if ($currentemployment ne $self->id) {
+    if (!$currentemployment) {
+        return _resetUser($user);
+    } elsif ($currentemployment ne $self->id) {
         # No sync to do if this employment is not currently applied
         return;
@@ -356 +361 @@
         return 1;
     }
+}
+
+
+sub _resetUser {
+    my ($ouser) = @_;
+
+    my %changes = (
+        appliedEmployement => undef,
+    );
+    foreach my $attr (LATMOS::Accounts::Bases::Sql::Employment::_reported_atributes) {
+        my $default = $ouser->base->config("unemployment.$attr") || '';
+        my $old = $ouser->_get_attributes($attr) || '';
+        if ($old ne $default) {
+            $changes{$attr} = $default || undef;
+        }
+    }
+    if ($ouser->set_fields(%changes)) {
+        $ouser->base->log(LA_NOTICE, "Updating user %s to match unemployment", $ouser->id);
+        $ouser->ReportChange('Update', 'Update %s to match unemployment', join(', ', sort keys %changes));
+        return 1;
+    }
+
+    return 0;
 }
 

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

@@ -1386 +1386 @@
             $end->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
             $end->add(hours => 23, minutes => 59, seconds => 59);
-        } else {
-            if (my $default = $self->base->config('unemployed_expire')) {
-                $end = DateTime->from_epoch(epoch => str2time($default));
-            }
         }
         $listold->finish;

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

@@ -67 +67 @@
         if ($users{$user}) {
             my $ouser = $self->{_base}->get_object('user', $user);
-            my %changes = (
-                appliedEmployement => undef,
-            );
-            foreach my $attr (LATMOS::Accounts::Bases::Sql::Employment::_reported_atributes) {
-                my $default = $self->{_base}->config("unemployment.$attr") || '';
-                my $old = $ouser->_get_attributes($attr) || '';
-                if ($old ne $default) {
-                    $changes{$attr} = $default || undef;
-                }
-            }
-            if ($ouser->set_fields(%changes)) {
-                $self->{_base}->log(LA_NOTICE, "Updating user $user to match unemployment");
-                $ouser->ReportChange('Update', 'Update %s to match unemployment', join(', ', sort keys %changes));
+            if (LATMOS::Accounts::Bases::Sql::Employment::_resetUser($ouser)) {
                 $self->{_base}->commit;
             } else {