Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added properly working imports with minions and status

Browse source
This commit is contained in:
Finn 2019-07-08 18:12:35 +01:00
parent 22e6001362
commit d0506c2a95
No known key found for this signature in database
GPG key ID: 7455B4B17685B598
7 changed files with 49 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Pear/LocalLoop.pm
View file

@ -26,6 +26,7 @@ sub startup {
$self->plugin('Config', {
default => {
storage_path => tempdir,
upload_path => $self->home->child('upload'),
sessionTimeSeconds => 60 * 60 * 24 * 7,
sessionTokenJsonName => 'session_key',
sessionExpiresJsonName => 'sessionExpires',

48
lib/Pear/LocalLoop/Controller/Admin/ImportFrom.pm
View file

@ -2,9 +2,7 @@ package Pear::LocalLoop::Controller::Admin::ImportFrom;
use Mojo::Base 'Mojolicious::Controller';
use Moo;
use Try::Tiny;
use Pear::LocalLoop::Import::LCCCsv::Suppliers;
use Pear::LocalLoop::Import::LCCCsv::Transactions;
use Mojo::File qw/ path /;
sub index {
my $c = shift;
@ -26,20 +24,17 @@ sub post_suppliers {
return $c->redirect_to( '/admin/import_from' );
}
my $filename;
my $file = $c->param('suppliers_csv');
$c->minion->enqueue('csv_supplier_import' => $filename );
my $filename = path($c->app->config->{upload_path}, time.'suppliers.csv' );
# my $csv_import = Pear::LocalLoop::Import::LCCCsv::Suppliers->new(
# csv_string => $c->param('suppliers_csv')->slurp,
# schema => $c->app->schema
# )->import_csv;
#
# my $job_id = $c->minion->enqueue('csv_supplier_import' => [$csv_import] );
$file->move_to($filename);
my $job_id = $c->minion->enqueue('csv_supplier_import' => [$filename] );
my $job_url = $c->url_for("/admin/minionjobs?id=$job_id")->to_abs;
$c->flash( success => "CSV imported" );
$c->flash(success => "CSV import started, see status of minion job at: $job_url");
return $c->redirect_to( '/admin/import_from' );
}
@ -56,22 +51,19 @@ sub post_transactions {
$c->flash( error => "CSV file size is too large" );
return $c->redirect_to( '/admin/import_from' );
}
my $csv_error;
try {
Pear::LocalLoop::Import::LCCCsv::Transactions->new(
csv_string => $c->param('transactions_csv')->slurp,
schema => $c->app->schema
)->import_csv;
} catch {
$csv_error = $_;
};
if ( $csv_error ) {
$c->flash( error => $csv_error );
return $c->redirect_to( '/admin/import_from' );
} else {
$c->flash( success => "CSV imported" );
return $c->redirect_to( '/admin/import_from' );
}
my $file = $c->param('transactions_csv');
my $filename = path($c->app->config->{upload_path}, time.'transactions.csv' );
$file->move_to($filename);
my $job_id = $c->minion->enqueue('csv_transaction_import' => [$filename] );
my $job_url = $c->url_for("/admin/minionjobs?id=$job_id")->to_abs;
$c->flash(success => "CSV import started, see status of minion job at: $job_url");
return $c->redirect_to( '/admin/import_from' );
}
1;

4
lib/Pear/LocalLoop/Import/LCCCsv/Suppliers.pm
View file

@ -15,7 +15,9 @@ sub import_csv {
my $rows = $self->csv_data;
return $rows;
foreach my $row ( @{$rows} ) {
$self->_row_to_result($row);
}
}
sub _row_to_result {

5
lib/Pear/LocalLoop/Import/LCCCsv/Transactions.pm
View file

@ -19,11 +19,10 @@ sub import_csv {
my ($self) = @_;
my $rows = $self->csv_data;
my $lcc_org = $self->schema->resultset('Organisation')->find({ name => "Lancashire County Council" });
foreach my $row ( @{$rows} ) {
$self->_row_to_result($row, $lcc_org);
$self->_row_to_result($row);
}
return 1;
}
sub _row_to_result {

2
lib/Pear/LocalLoop/Import/Role/CSV.pm
View file

@ -29,7 +29,7 @@ has _csv_filehandle => (
my $self = shift;
my $fh;
if ( $self->has_csv_file ) {
open $fh, '<', \${$self->csv_file};
open $fh, '<', $self->csv_file;
} elsif ( $self->has_csv_string ) {
my $string = $self->csv_string;
open $fh, '<', \$string;

33
lib/Pear/LocalLoop/Plugin/Minion/Job/csv_supplier_import.pm
View file

@ -1,34 +1,15 @@
package Pear::LocalLoop::Plugin::Minion::Job::csv_supplier_import;
use Mojo::Base 'Pear::LocalLoop::Plugin::Minion::Job';
use Devel::Dwarn;
use Pear::LocalLoop::Import::LCCCsv::Suppliers;
sub run {
my ( $self, $rows ) = @_;
my ( $self, $filename ) = @_;
foreach my $row ( @{$rows} ) {
$self->_row_to_result($row);
}
}
sub _row_to_result {
my ( $self, $row ) = @_;
# Dwarn $row->{supplier_id};
my $addr2 = $row->{post_town};
my $address = ( defined $addr2 ? ( $row->{"address line 2"} . ' ' . $addr2) : $row->{"address line 2"} );
$self->external_result->find_or_create_related('organisations', {
external_id => $row->{supplier_id},
organisation => {
name => $row->{name},
street_name => $row->{"address line 1"},
town => $address,
postcode => $row->{post_code},
country => $row->{country_code},
entity => { type => 'organisation' },
}
});
$self->app->log->debug('Imported the CSV fully!');
my $csv_import = Pear::LocalLoop::Import::LCCCsv::Suppliers->new(
csv_file => $filename,
schema => $self->app->schema
)->import_csv;
}
1;

15
lib/Pear/LocalLoop/Plugin/Minion/Job/csv_transaction_import.pm Normal file
View file

@ -0,0 +1,15 @@
package Pear::LocalLoop::Plugin::Minion::Job::csv_transaction_import;
use Mojo::Base 'Pear::LocalLoop::Plugin::Minion::Job';
use Pear::LocalLoop::Import::LCCCsv::Transactions;
sub run {
my ( $self, $filename ) = @_;
my $csv_import = Pear::LocalLoop::Import::LCCCsv::Transactions->new(
csv_file => $filename,
schema => $self->app->schema
)->import_csv;
}
1;