Changeset 850

Timestamp:

03/30/10 22:43:40 (14 years ago)

Author:

nanardon

Message:

• add functions to find already expired account

Location:

LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql.pm (modified) (1 diff)
• Cli.pm (modified) (2 diffs)
• Maintenance.pm (modified) (2 diffs)

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

@@ -157 +157 @@
 }
 
+sub find_next_expire_users {
+    my ($self, $expire) = @_;
+
+    my $sth= $self->db->prepare(q{
+        select name from "user" where
+            expire < now() + ?::interval
+            and expire > now()
+            and expire is not null
+            } . ($self->{wexported} ? '' : 'and exported = true') . q{
+            order by expire
+        }
+    );
+    $sth->execute($expire || '1 month');
+    my @users;
+    while (my $res = $sth->fetchrow_hashref) {
+        push(@users, $res->{name});
+    }
+    @users
+}
+
+sub find_expired_users {
+    my ($self, $expire) = @_;
+
+    my $sth= $self->db->prepare(q{
+        select name from "user" where
+            expire < now() - ?::interval
+            and expire is not null
+        } . ($self->{wexported} ? '' : 'and exported = true') . q{
+            order by expire
+        }
+    );
+    $sth->execute($expire || '1 second');
+    my @users;
+    while (my $res = $sth->fetchrow_hashref) {
+        push(@users, $res->{name});
+    }
+    @users
+}
+
 1;
 

LATMOS-Accounts/lib/LATMOS/Accounts/Cli.pm

@@ -75 +75 @@
             },
         });
+    $env->add_func('expired', {
+        help => 'expired [delay] - list expired account more than delay (default is now)',
+        code => sub {
+            my ($env, $expire) = @_;
+            my @users = $env->base->find_expired_users($expire);
+            print $OUT map { "$_\n" } @users;
+            $env->{_lastsearchtype} = 'user';
+            $env->{_lastsearch} = \@users;
+        },
+    }) if ($env->base->can('find_expired_users'));
+    $env->add_func('expires', {
+        help => 'expires [delay] - list account expiring before delay (default is 1 month)',
+        code => sub {
+            my ($env, $expire) = @_;
+            my @users = $env->base->find_next_expire_users($expire);
+            print $OUT map { "$_\n" } @users;
+            $env->{_lastsearchtype} = 'user';
+            $env->{_lastsearch} = \@users;
+        },
+    }) if ($env->base->can('find_next_expire_users'));
     $env->add_func('select', {
             help => 'select object_type - select objects to perform action on it',
@@ -142 +162 @@
                 }
             } else {
-                foreach (@{$env->{_objects}}) {
-                    print $OUT sort map { ($_ || '') . "\n" } $_->get_attributes($attr);
+                foreach my $u (@{$env->{_objects}}) {
+                    print $OUT sort map { $u->id . ': ' .($_ || '') . "\n" } $u->get_attributes($attr);
                 }
             }

LATMOS-Accounts/lib/LATMOS/Accounts/Maintenance.pm

@@ -19 +19 @@
 
 sub find_next_expire_users {
+    # Do not replace this code by $base->find_next_expire_users
+    # it does not exctly the same thing
     my ($self, $expire) = @_;
     my $base = $self->_base;
@@ -177 +179 @@
 }
 
+sub find_expired_users {
+    my ($self, $expire) = @_;
+    $self->_base->find_expired_users($expire);
+}
+
 sub generate_rsa_key {
     my ($self, $password) = @_;