Changeset 1945

Timestamp:

02/14/17 18:32:09 (7 years ago)

Author:

nanardon

Message:

Rework the triggering for employment: ensure data are populate, improve performance

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Employment.pm (modified) (5 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -401 +401 @@
     } else {
         $id ||= join('', map {('a'..'z')[rand(26)]}(0..8));
-        $self->base->create_object($self->otype, $id, %fields) or do {
+        $self->base->create_c_object($self->otype, $id, %fields) or do {
             $self->{c}->stash->{page}{error} =
                 LATMOS::Accounts::Log::lastmessage(LA_ERR);

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

@@ -45 +45 @@
 
 sub _has_extended_attributes { 1 }
-
-sub _reported_atributes { qw(contratType endcircuit hosted company employer) }
 
 sub _get_attr_schema {
@@ -318 +316 @@
     my $user = $base->get_object('user', $data{user});
     $user or return;
-    $class->SUPER::_create($base, $id, %data);
+    my $res = $class->SUPER::_create($base, $id, %data);
+    $user->applyCurrentEmployment or return;
+    $res;
 }
 
@@ -332 +332 @@
     if ($res) {
         my $ouser = $base->get_object('user', $user);
-        $ouser->computeEmploymentDate;
+        $ouser->applyCurrentEmployment or return;
     }
 
     $res
+}
+
+sub set_fields {
+    my ($self, %data) = @_;
+
+    my $res = $self->SUPER::set_fields(%data);
+
+    $self->applyToUser or return;
+    return $res;
 }
 
@@ -354 +363 @@
     $user->base->log(LA_DEBUG, "Applying Employement %s to user %s", $self->id, $user->id);
 
-    $user->computeEmploymentDate;
-
     my $currentemployment = $user->get_attributes('currentEmployment') || '';
 
     if (!$currentemployment) {
-        return _resetUser($user);
-    } elsif ($currentemployment ne $self->id) {
+        return $user->_resetEmployment
+    } elsif ($currentemployment eq $self->id) {
         # No sync to do if this employment is not currently applied
-        return;
+        return $user->applyCurrentEmployment;
+    } else {
+        return $user->computeEmploymentDate;
     }
-
-    my %attrsets = (
-        appliedEmployement => $self->id,
-    );
-    foreach my $attr (_reported_atributes(), qw(department managerContact)) {
-        my $uval = $user->get_attributes($attr) || '';
-        my $cval = $self->get_attributes($attr) || '';
-
-        for ($attr) {
-            if ($attr eq 'managerContact') {
-                if (!$cval) {
-                    my $dpmt  = $self->get_attributes('department') or last;
-                    my $odmpt = $self->base->get_object('group', $dpmt) or last;
-                    $cval = $odmpt->get_attributes('managedBy');
-                }
-            }
-        }
-
-        if ($uval ne $cval) {
-            my $oattr = $self->base->attribute('user', $attr);
-            $attrsets{$oattr->iname} = $cval;
-        }
-    }
-
-    if (keys %attrsets) {
-        if (my $res = $user->set_fields(%attrsets)) {
-            $user->ReportChange('Update', 'Attr %s updated to match Employment %s', join(', ', sort keys %attrsets), $self->id);
-            return $res;
-        }
-    } else {
-        return 1;
-    }
-}
-
-sub _resetUser {
-    my ($ouser) = @_;
-
-    $ouser->computeEmploymentDate;
-
-    my %changes = (
-        appliedEmployement => undef,
-    );
-
-    my @attributesToReset = _reported_atributes;
-    if (!$ouser->_get_attributes('_startEmployment')) {
-        push(@attributesToReset, qw(department));
-    }
-
-    foreach my $attr (@attributesToReset) {
-        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;
 }
 
@@ -474 +421 @@
 }
 
-sub ReportChange {
-    my ($self, $changetype, $message, @args) = @_;
-
-    $self->applyToUser();
-
-    $self->SUPER::ReportChange($changetype, $message, @args);
-}
-
 1;
 

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

@@ -1519 +1519 @@
 }
 
+sub _reported_atributes { qw(contratType endcircuit hosted company employer) }
+
+=head2 applyCurrentEmployment
+
+Search the current employment is any and apply paramter to user
+
+=cut
+
+sub applyCurrentEmployment {
+    my ($self) = @_;
+
+    my $currentemployment = $self->get_attributes('currentEmployment') || '';
+
+    $self->base->log(
+        LA_DEBUG,
+        "Applying Employement %s to user %s",
+        $currentemployment ? $currentemployment->id : '(none)',
+        $self->id
+    );
+
+    if (!$currentemployment) {
+        return $self->_resetEmployment;
+    }
+
+    $self->computeEmploymentDate;
+
+    my %attrsets = (
+        appliedEmployement => $currentemployment->id,
+    );
+    foreach my $attr (_reported_atributes(), qw(department managerContact)) {
+        my $uval = $self->get_attributes($attr) || '';
+        my $cval = $currentemployment->get_attributes($attr) || '';
+
+        for ($attr) {
+            if ($attr eq 'managerContact') {
+                if (!$cval) {
+                    my $dpmt  = $currentemployment->get_attributes('department') or last;
+                    my $odmpt = $currentemployment->base->get_object('group', $dpmt) or last;
+                    $cval = $odmpt->get_attributes('managedBy');
+                }
+            }
+        }
+
+        if ($uval ne $cval) {
+            my $oattr = $currentemployment->base->attribute('self', $attr);
+            $attrsets{$oattr->iname} = $cval;
+        }
+    }
+
+    if (keys %attrsets) {
+        if (my $res = $self->set_fields(%attrsets)) {
+            $self->ReportChange('Update', 'Attr %s updated to match Employment %s', join(', ', sort keys %attrsets), $currentemployment->id);
+            return $res;
+        }
+    } else {
+        return 1;
+    }
+}
+
+sub _resetEmployment {
+    my ($self) = @_;
+
+    $self->computeEmploymentDate;
+
+    my %changes = (
+        appliedEmployement => undef,
+    );
+
+    my @attributesToReset = _reported_atributes;
+    if (!$self->_get_attributes('_startEmployment')) {
+        push(@attributesToReset, qw(department));
+    }
+
+    foreach my $attr (@attributesToReset) {
+        my $default = $self->base->config("unemployment.$attr") || '';
+        my $old = $self->_get_attributes($attr) || '';
+        if ($old ne $default) {
+            $changes{$attr} = $default || undef;
+        }
+    }
+    if ($self->set_fields(%changes)) {
+        $self->base->log(LA_NOTICE, "Updating user %s to match unemployment", $self->id);
+        $self->ReportChange('Update', 'Update %s to match unemployment', join(', ', sort keys %changes));
+        return 1;
+    }
+
+    return 0;
+}
+
+
 =head2 computeEmploymentDate