Changeset 983

Timestamp:

05/17/12 09:58:27 (12 years ago)

Author:

nanardon

Message:

• add task module to validate automated request

Location:

LATMOS-Accounts

Files:

• MANIFEST (modified) (2 diffs)
• bin/la-sql-upgrade.in (modified) (1 diff)
• bin/la-sync-manager (modified) (2 diffs)
• bin/la-sync-process (added)
• lib/LATMOS/Accounts/Bases/Sql.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql/DataRequest.pm (modified) (3 diffs)
• lib/LATMOS/Accounts/Task.pm (modified) (1 diff)

LATMOS-Accounts/MANIFEST

@@ -38 +38 @@
 bin/la-sync-list
 bin/la-sync-manager
+bin/la-sync-process
 bin/la-warn-expire
 bin/la-sql-edit-form
@@ -97 +98 @@
 lib/LATMOS/Accounts/SynchAccess.pm
 lib/LATMOS/Accounts/Synchro.pm
+lib/LATMOS/Accounts/Task/Automatedrequest.pm
 lib/LATMOS/Accounts/Task/Basessynchro.pm
 lib/LATMOS/Accounts/Task/Buildlistes.pm

LATMOS-Accounts/bin/la-sql-upgrade.in

@@ -180 +180 @@
             delete from accreq_attributes_list
             }
+        ],
+    },
+    {
+        ver => 7,
+        sql => [
+            q{
+            ALTER TABLE request ADD COLUMN automated boolean NOT NULL DEFAULT false;
+            },
+            q{
+            ALTER TABLE request ADD COLUMN objrev bigint;
+            },
         ],
     },

LATMOS-Accounts/bin/la-sync-manager

@@ -17 +17 @@
     'test'         => \my $test,
     'wait=i'       => \my $wait,
-    'r|run=s'      => \my $run,
 ) or pod2usage();
 
@@ -28 +27 @@
     exit(1);
 };
-
-if ($run) {
-    my $res = $syncm->process_module($run);
-    exit($res ? 0 : 1);
-}
 
 la_set_log(

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

@@ -423 +423 @@
 }
 
+sub list_auto_pending_requests {
+    my ($self) = @_;
+
+    my $sth = $self->db->prepare(q{
+        select id from request
+        where done is null
+            and apply < now()
+            and automated = true
+        order by apply
+    });
+    $sth->execute;
+    my @ids;
+    while (my $res = $sth->fetchrow_hashref) {
+        push(@ids, $res->{id});
+    }
+
+    @ids
+}
+
 1;
 

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/DataRequest.pm

@@ -135 +135 @@
 }
 
+sub objrev {
+    my ($self) = @_;
+
+    return ($self->_infos || {})->{objrev};
+}
+
 sub register {
-    my ($self, $user, $apply, %param) = @_;
-
-    if (!$self->is_for_new_object()
-        && !$self->oobject) {
-        la_log(LA_ERR, "An object type %s is required", $self->otype);
-        return;
+    my ($self, $options, %param) = @_;
+
+    my $user = $options->{user};
+    my $apply = $options->{apply};
+    my $auto = $options->{auto};
+
+    my $rev;
+
+    if (!$self->is_for_new_object()) {
+        if ($self->oobject) {
+            $rev = $self->oobject->get_attributes('rev');
+        } else {
+            la_log(LA_ERR, "An object type %s is required", $self->otype);
+            return;
+        }
     }
 
     my $sth_req = $self->base->db->prepare(q{
-        INSERT into request (name, object, "user", apply)
-        values (?,?,?,?)
+        INSERT into request (name, object, "user", apply, automated, objrev)
+        values (?,?,?,?,?,?)
         });
     $apply ||= scalar(localtime);
-    $sth_req->execute($self->accreq->id, $self->object_name, $user, $apply) or return;
+    $sth_req->execute($self->accreq->id, $self->object_name, $user, $apply,
+        $auto ? 1 : 0, $rev) or return;
 
     my $newid = $self->base->db->last_insert_id(
@@ -336 +352 @@
 }
 
+sub unset_auto {
+    my ($self) = @_;
+
+    my $sth = $self->accreq->db->prepare(q{
+        update request  set automated = false where id = ?
+    });
+    return $sth->execute($self->ar_id);
+}
+
+sub auto_apply_to_object {
+    my ($self, $comment) = @_;
+
+    if (!$self->is_for_new_object) {
+        if (my $obj = $self->oobject) {
+            if ($obj->get_attributes('rev') != $self->objrev) {
+                $self->base->log(LA_WARN,
+                    'Object %s has been modified, set request as non
+                    automated');
+
+                $self->unset_auto;
+                return 1; # The automatic action "succeed"
+            }
+        } else {
+            $self->base->log('Cannot apply to non existing object %s',
+                $self->object_name);
+            return;
+        }
+    }
+    $self->apply_to_object($comment);
+}
+
 sub apply_to_object {
     my ($self, $comment, %attrs) = @_;
@@ -341 +388 @@
     my %newvalues = $self->_prepare_attrs(%attrs);
 
-    my $obj = $self->oobject or return;
-
-    if (defined($obj->set_c_fields(%newvalues)) &&
-        $self->_register_applied($comment)) {
-        $self->base->log(
-            LA_INFO,
-            'DataRequest id=%d applied to object %s/%s',
-            $self->ar_id,
+    if ($self->is_for_new_object) {
+        if ($self->base->create_object(
             $self->otype,
-            $obj->id,
-        );
-        $self->base->commit;
-        return 1;
-    } else {
-        $self->base->log(
-            LA_ERR,
-            'Error applying DataRequest id=%d to object %s/%s: %s',
-            $self->ar_id,
-            $self->otype,
-            $obj->id,
-            $self->base->db->errstr,
-        );
-        $self->base->rollback;
-        return;
+            $attrs{_name},
+            %attrs
+        )) {
+            $self->_register_applied($comment);
+            return 1;
+        } else {
+            $self->base->log(
+                LA_ERR,
+                'Error applying DataRequest id=%d to create object %s/%s: %s',
+                $self->ar_id,
+                $self->otype,
+                $attrs{_name},
+                $self->base->db->errstr,
+            );
+            return;
+        }
+    } else {
+        my $obj = $self->oobject or return;
+
+        if (defined($obj->set_c_fields(%newvalues)) &&
+            $self->_register_applied($comment)) {
+            $self->base->log(
+                LA_INFO,
+                'DataRequest id=%d applied to object %s/%s',
+                $self->ar_id,
+                $self->otype,
+                $obj->id,
+            );
+            return 1;
+        } else {
+            $self->base->log(
+                LA_ERR,
+                'Error applying DataRequest id=%d to object %s/%s: %s',
+                $self->ar_id,
+                $self->otype,
+                $obj->id,
+                $self->base->db->errstr,
+            );
+            $self->base->rollback;
+            return;
+        }
     }
 }

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

@@ -26 +26 @@
     my ($self, $baserev, $syncm) = @_;
 
+    $baserev ||= -1;
     la_log LA_DEBUG, "Comparing db: %d <=> %d", $syncm->dbrev, $baserev;
     if ($syncm->dbrev > $baserev) {