Added created_by field to users (D1178)

bin/seed-database.pl

@@ -87,9 +87,11 @@
 
 say qq(Creating initial username "$initial_username"...);
 my $user = rset('User')->create({
-    username => $initial_username,
-    email    => $initial_username,
-    site_id  => $site->id,
+    username   => $initial_username,
+    email      => $initial_username,
+    site_id    => $site->id,
+    created    => DateTime->now,
+    created_by => $initial_username,
 });
 
 say "Adding all permissions to initial username...";

lib/GADS/API.pm

@@ -766,7 +766,7 @@ sub _post_add_user_account
     $id ? $update_user->update_user(%values, current_user => $logged_in_user)
         : schema->resultset('User')->create_user(%values, current_user => $logged_in_user, request_base => request->base);
 
-    my $msg = __x"User {type} successfully", type => $id ? 'updated' : 'created';
+    my $msg = __x"User {type} successfully by {current_user}", type => $id ? 'updated' : 'created', current_user => $logged_in_user->email;
     return _success("$msg");
 }
 
@@ -1362,7 +1362,7 @@ any ['get', 'post'] => '/api/users' => require_any_role [qw/useradmin superadmin
         push @cols, 'department' if $site->register_show_department;
         push @cols, 'team' if $site->register_show_team;
         push @cols, 'freetext1' if $site->register_freetext1_name;
-        push @cols, qw/created lastlogin/;
+        push @cols, qw/created lastlogin created_by/;
         my @return = map { { name => $_, data => $_ } } @cols;
         content_type 'application/json; charset=UTF-8';
         return encode_json \@return;
@@ -1400,6 +1400,10 @@ any ['get', 'post'] => '/api/users' => require_any_role [qw/useradmin superadmin
     {
         $sort_by = 'me.created';
     }
+    elsif ($sort_by && $sort_by eq 'Created by')
+    {
+        $sort_by = 'me.created_by';
+    }
     elsif ($sort_by && $sort_by eq 'ID')
     {
         $sort_by = 'me.id';

lib/GADS/Schema.pm

@@ -8,7 +8,7 @@ use base 'DBIx::Class::Schema';
 
 __PACKAGE__->load_namespaces;
 
-our $VERSION = 111;
+our $VERSION = 112;
 
 our $IGNORE_PERMISSIONS;
 our $IGNORE_PERMISSIONS_SEARCH;

lib/GADS/Schema/Result/User.pm

@@ -115,6 +115,8 @@ __PACKAGE__->add_columns(
     datetime_undef_if_invalid => 1,
     is_nullable => 1,
   },
+  "created_by",
+  { data_type => "text", is_nullable => 1 },
   "debug_login",
   { data_type => "smallint", default_value => 0, is_nullable => 1 },
   # All the following for MFA
@@ -636,7 +638,7 @@ sub update_user
           or error __x"The email address \"{email}\" is invalid", email => $params{email};
 
       my $msg = __x"User updated: ID {id}, username: {username}",
-          id => $self->id, username => $params{username};
+          id => $self->id, username => $params{username} ? $params{username} : $params{email};
       $msg .= __x", groups: {groups}", groups => join ', ', @{$params{groups}}
           if $params{groups};
       $msg .= __x", permissions: {permissions}", permissions => join ', ', @{$params{permissions}}
@@ -836,6 +838,11 @@ sub for_data_table
             name   => 'Created',
             values => [$self->created ? $self->created->ymd : 'Unknown'],
         },
+        'Created by' => {
+            type   => 'string',
+            name   => 'Created By',
+            values => [$self->created_by ? $self->created_by : 'Unknown'],
+        },
         'Last login' => {
             type   => 'string',
             name   => 'Last login (GMT)',
@@ -921,6 +928,7 @@ sub export_hash
         account_request       => $self->account_request,
         account_request_notes => $self->account_request_notes,
         created               => $self->created && $self->created->datetime,
+        created_by            => $self->created_by,
         groups                => [map $_->id, $self->groups],
         permissions           => [map $_->permission->name, $self->user_permissions],
     };

lib/GADS/Schema/ResultSet/User.pm

@@ -40,8 +40,8 @@ sub summary
     $self->active->search_rs({},{
         columns => [
             'me.id', 'me.surname', 'me.firstname', 'title.name', 'me.email',
-            'organisation.name', 'department.name', 'team.name', 'me.created',
-            'me.freetext1', 'me.freetext2',
+            'organisation.name', 'department.name', 'team.name', 'me.created', 
+            'me.created_by', 'me.freetext1', 'me.freetext2',
             'me.lastlogin', 'me.value',
         ],
         join     => [
@@ -118,14 +118,15 @@ sub create_user
         username              => $params{email},
         resetpw               => $code,
         created               => DateTime->now,
+        created_by            => $params{current_user}->email,
         account_request_notes => $params{notes},
     });
 
     my $audit = GADS::Audit->new(schema => $self->result_source->schema, user => $params{current_user});
 
     $audit->login_change(
-        __x"User created, id: {id}, username: {username}",
-            id => $user->id, username => $params{username}
+        __x"User created by {current_user}, id: {id}, username: {username}",
+            current_user => $params{current_user}->email, id => $user->id, username => $params{username} ? $params{username} : $params{email}
     );
 
     $user->update_user(%params);
@@ -358,6 +359,7 @@ sub import_hash
             account_request       => $user->{account_request},
             account_request_notes => $user->{account_request_notes},
             created               => $user->{created} && DateTime::Format::ISO8601->parse_datetime($user->{created}),
+            created_by            => $user->{created_by},
         });
     }
 

lib/GADS/Users.pm

@@ -312,7 +312,7 @@ sub _produce_csv
     my $site = $self->schema->resultset('Site')->find($self->schema->site_id);
 
     # Column names
-    my @columns = qw/ID Surname Forename Email Lastlogin Created/;
+    my @columns = qw/ID Surname Forename Email Lastlogin Created Createdby/;
     push @columns, 'Title' if $site->register_show_title;
     push @columns, 'Organisation' if $site->register_show_organisation;
     push @columns, $site->department_name if $site->register_show_department;
@@ -359,6 +359,10 @@ sub _produce_csv
             max => 'created',
             -as => 'created_max',
         },
+        {   
+            max => 'created_by',
+            -as => 'created_by_max',
+        },
         {
             max => 'title.name',
             -as => 'title_max',
@@ -468,6 +472,7 @@ sub _produce_csv
             $user->get_column('email_max'),
             $user->get_column('lastlogin_max'),
             $user->get_column('created_max'),
+            $user->get_column('created_by_max'),
         );
         push @csv, $user->get_column('title_max') if $site->register_show_title;
         push @csv, $user->get_column('organisation_max') if $site->register_show_organisation;