Changeset 1787 for trunk/LATMOS-Accounts/lib

Timestamp:

06/23/16 18:53:38 (8 years ago)

Author:

nanardon

Message:

Fix employment overlaping test

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Employment.pm (modified) (2 diffs)

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

@@ -418 +418 @@
     my $id = ref $obj ? $obj->id : $obj;
 
-    if ($changes{lastday}) {
+    my $firstday = exists($changes{firstday}) ? $changes{firstday} : $obj->get_attributes('firstday');
+    my $lastday  = exists($changes{lastday}) ?  $changes{lastday}  : $obj->get_attributes('lastday');
+
+    if ($lastday) {
         my $sth = $base->db->prepare_cached(q{
-            select name from employment where "user" = ? and name != ? and
-                firstday <= ? and (lastday is null or lastday >= ?)
+            select name, firstday, lastday from employment where "user" = ? and name != ?
+                and
+            (
+            (firstday <= ? and (lastday is NULL or lastday >= ?))
+                or
+            ((lastday is NOT NULL and lastday <= ?) and firstday >= ?)
+            )
         });
-        $sth->execute($user, $id, $changes{lastday}, $changes{lastday});
+        $sth->execute($user, $id, $lastday, $firstday, $lastday, $firstday);
         my $res = $sth->fetchrow_hashref;
         $sth->finish;
+
         if ($res) {
-            $base->log(LA_ERR, "New ending overlap contrat %s (%s)", $res->{name}, $changes{lastday});
+            $base->log(LA_ERR, "The change will overlap contrat %s (%s - %s)", $res->{name}, $res->{firstday}, $res->{lastday} || '');
             return;
         }
-    } elsif(exists($changes{lastday})) {
+    } else {
         my $sth = $base->db->prepare_cached(q{
-            select * from employment where "user" = ? and lastday is null
+            select * from employment where "user" = ? and name != ?
+            and lastday is NULL OR  lastday >= ?
             limit 1
         });
-        $sth->execute($user);
+        $sth->execute($user, $id, $firstday);
         my $res = $sth->fetchrow_hashref;
         if ($res && $res->{name}) {
@@ -444 +454 @@
         }
     }
-    if ($changes{firstday}) {
-        my $sth = $base->db->prepare_cached(q{
-            select name from employment where "user" = ? and name != ? and
-                firstday <= ? and (lastday is null or lastday >= ?)
-        });
-        $sth->execute($user, $id, $changes{firstday}, $changes{firstday});
-        my $res = $sth->fetchrow_hashref;
-        $sth->finish;
-        if ($res) {
-            $base->log(LA_ERR, "New starting overlap contrat %s (%s)", $res->{name}, $changes{firstday});
-            return;
-        }
-    }
 
     return 1;