Bugzilla – Attachment 50700 Details for
Bug 12598
New misc/import_borrowers.pl command line tool
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12598 - More refactoring and regression tests in Koha::Patrons::Import
Bug-12598---More-refactoring-and-regression-tests-.patch (text/plain), 40.67 KB, created by
Florent Mara
on 2016-04-26 02:39:18 UTC
(
hide
)
Description:
Bug 12598 - More refactoring and regression tests in Koha::Patrons::Import
Filename:
MIME Type:
Creator:
Florent Mara
Created:
2016-04-26 02:39:18 UTC
Size:
40.67 KB
patch
obsolete
>From 68ef04c92300458134125a57cd997ec858c088e0 Mon Sep 17 00:00:00 2001 >From: Florent Mara <florent.mara@gmail.com> >Date: Tue, 26 Apr 2016 14:15:55 +1200 >Subject: [PATCH] Bug 12598 - More refactoring and regression tests in > Koha::Patrons::Import > >--- > Koha/Patrons/Import.pm | 208 ++++++++++++++------- > t/db_dependent/Koha/Patrons/Import.t | 353 +++++++++++++++++++++++++++++++++-- > 2 files changed, 477 insertions(+), 84 deletions(-) > >diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm >index 42edc67..3e14599 100644 >--- a/Koha/Patrons/Import.pm >+++ b/Koha/Patrons/Import.pm >@@ -16,6 +16,8 @@ package Koha::Patrons::Import; > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > > use Modern::Perl; >+use Moo; >+use namespace::clean; > > use Carp; > use Text::CSV; >@@ -50,24 +52,32 @@ Further pod documentation needed here. > > =cut > >+has 'today_iso' => ( >+ is => 'ro', >+ lazy => 1, >+ default => sub { output_pref( { dt => dt_from_string(), dateonly => 1, dateformat => 'iso' } ); }, >+ ); >+ >+has 'text_csv' => ( >+ is => 'ro', >+ lazy => 1, >+ default => sub { Text::CSV->new( { binary => 1 } ), }, >+ ); >+ > sub import_patrons { >- my ($params) = @_; >+ my ($self, $params) = @_; > >- my $handle = $params->{file}; >+ my $handle = $params->{file}; >+ unless( $handle ) { carp('No file handle passed in!'); return; } >+ > my $matchpoint = $params->{matchpoint}; > my $defaults = $params->{defaults}; > my $ext_preserve = $params->{preserve_extended_attributes}; > my $overwrite_cardnumber = $params->{overwrite_cardnumber}; >- >- unless( $handle ) { carp("No file handle passed in!"); return; } >- my $extended = C4::Context->preference('ExtendedPatronAttributes'); >- my $set_messaging_prefs = C4::Context->preference('EnhancedMessagingPreferences'); >- >- my @columnkeys = map { $_ ne 'borrowernumber' ? $_ : () } C4::Members::columns(); >- push( @columnkeys, 'patron_attributes' ) if $extended; >- >- our $csv = Text::CSV->new( { binary => 1 } ); # binary needed for non-ASCII Unicode >+ my $extended = C4::Context->preference('ExtendedPatronAttributes'); >+ my $set_messaging_prefs = C4::Context->preference('EnhancedMessagingPreferences'); > >+ my @columnkeys = set_column_keys($extended); > my @feedback; > my @errors; > >@@ -79,9 +89,10 @@ sub import_patrons { > > # use header line to construct key to column map > my $borrowerline = <$handle>; >- my $status = $csv->parse($borrowerline); >+ my $status = $self->text_csv->parse($borrowerline); > ($status) or push @errors, { badheader => 1, line => $., lineraw => $borrowerline }; >- my @csvcolumns = $csv->fields(); >+ >+ my @csvcolumns = $self->text_csv->fields(); > my %csvkeycol; > my $col = 0; > foreach my $keycol (@csvcolumns) { >@@ -91,21 +102,19 @@ sub import_patrons { > $csvkeycol{$keycol} = $col++; > } > >- #warn($borrowerline); > if ($extended) { > $matchpoint_attr_type = C4::Members::AttributeTypes->fetch($matchpoint); > } > >- push @feedback, { feedback => 1, name => 'headerrow', value => join( ', ', @csvcolumns ) }; >- my $today_iso = output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } ); >- my @criticals = qw(surname branchcode categorycode); # there probably should be others >- my @bad_dates; # I've had a few. >+ push @feedback, { feedback => 1, name => 'headerrow', value => join( ', ', @csvcolumns ) }; >+ my @criticals = qw( surname ); # there probably should be others - rm branchcode && categorycode > LINE: while ( my $borrowerline = <$handle> ) { >+ my $line_number = $.; > my %borrower; > my @missing_criticals; >- my $patron_attributes; >- my $status = $csv->parse($borrowerline); >- my @columns = $csv->fields(); >+ >+ my $status = $self->text_csv->parse($borrowerline); >+ my @columns = $self->text_csv->fields(); > if ( !$status ) { > push @missing_criticals, { badparse => 1, line => $., lineraw => $borrowerline }; > } >@@ -139,35 +148,12 @@ sub import_patrons { > } > } > >- #warn join(':',%borrower); >- if ( $borrower{categorycode} ) { >- push @missing_criticals, >- { >- key => 'categorycode', >- line => $., >- lineraw => $borrowerline, >- value => $borrower{categorycode}, >- category_map => 1 >- } >- unless GetBorrowercategory( $borrower{categorycode} ); >- } >- else { >- push @missing_criticals, { key => 'categorycode', line => $., lineraw => $borrowerline }; >- } >- if ( $borrower{branchcode} ) { >- push @missing_criticals, >- { >- key => 'branchcode', >- line => $., >- lineraw => $borrowerline, >- value => $borrower{branchcode}, >- branch_map => 1 >- } >- unless GetBranchName( $borrower{branchcode} ); >- } >- else { >- push @missing_criticals, { key => 'branchcode', line => $., lineraw => $borrowerline }; >- } >+ # Checking if borrower category code exists and if it matches to a known category. Pushing error to missing_criticals otherwise. >+ check_borrower_category($borrower{categorycode}, $borrowerline, $line_number, \@missing_criticals); >+ >+ # Checking if branch code exists and if it matches to a branch name. Pushing error to missing_criticals otherwise. >+ check_branch_code($borrower{branchcode}, $borrowerline, $line_number, \@missing_criticals); >+ > if (@missing_criticals) { > foreach (@missing_criticals) { > $_->{borrowernumber} = $borrower{borrowernumber} || 'UNDEF'; >@@ -179,32 +165,32 @@ sub import_patrons { > # The first 25 errors are enough. Keeping track of 30,000+ would destroy performance. > next LINE; > } >- if ($extended) { >- my $attr_str = $borrower{patron_attributes}; >- $attr_str =~ s/\xe2\x80\x9c/"/g; # fixup double quotes in case we are passed smart quotes >- $attr_str =~ s/\xe2\x80\x9d/"/g; >- push @feedback, { feedback => 1, name => 'attribute string', value => $attr_str }; >- delete $borrower{patron_attributes}; # not really a field in borrowers, so we don't want to pass it to ModMember. >- $patron_attributes = extended_attributes_code_value_arrayref($attr_str); >- } >+ >+ # Setting patron attributes if extended. >+ my $patron_attributes = set_patron_attributes($extended, $borrower{patron_attributes}, \@feedback); >+ >+ # Not really a field in borrowers, so we don't want to pass it to ModMember. >+ if ($extended) { delete $borrower{patron_attributes}; } > > # Popular spreadsheet applications make it difficult to force date outputs to be zero-padded, but we require it. > foreach (qw(dateofbirth dateenrolled dateexpiry)) { > my $tempdate = $borrower{$_} or next; >+ > $tempdate = eval { output_pref( { dt => dt_from_string( $tempdate ), dateonly => 1, dateformat => 'iso' } ); }; >+ > if ($tempdate) { > $borrower{$_} = $tempdate; >- } else { >+ } else { > $borrower{$_} = ''; >- push @missing_criticals, { key => $_, line => $., lineraw => $borrowerline, bad_date => 1 }; >+ push @missing_criticals, { key => $_, line => $line_number, lineraw => $borrowerline, bad_date => 1 }; > } > } >- $borrower{dateenrolled} = $today_iso unless $borrower{dateenrolled}; >- $borrower{dateexpiry} = GetExpiryDate( $borrower{categorycode}, $borrower{dateenrolled} ) >- unless $borrower{dateexpiry}; >+ $borrower{dateenrolled} = $self->today_iso() unless $borrower{dateenrolled}; >+ $borrower{dateexpiry} = GetExpiryDate( $borrower{categorycode}, $borrower{dateenrolled} ) unless $borrower{dateexpiry}; >+ > my $borrowernumber; > my $member; >- if ( ( $matchpoint eq 'cardnumber' ) && ( $borrower{'cardnumber'} ) ) { >+ if ( defined($matchpoint) && ( $matchpoint eq 'cardnumber' ) && ( $borrower{'cardnumber'} ) ) { > $member = GetMember( 'cardnumber' => $borrower{'cardnumber'} ); > if ($member) { > $borrowernumber = $member->{'borrowernumber'}; >@@ -384,11 +370,99 @@ sub import_patrons { > }; > } > >-END { } # module clean-up code here (global destructor) >+=head2 set_column_keys > >-1; >+ my @columnkeys = set_column_keys($extended); >+ >+Returns an array of borrowers' table columns. >+ >+=cut >+ >+sub set_column_keys { >+ my ($extended) = @_; >+ >+ my @columnkeys = map { $_ ne 'borrowernumber' ? $_ : () } C4::Members::columns(); >+ push( @columnkeys, 'patron_attributes' ) if $extended; >+ >+ return @columnkeys; >+} >+ >+=head2 set_patron_attributes > >-__END__ >+ my $patron_attributes = set_patron_attributes($extended, $borrower{patron_attributes}, $feedback); >+ >+Returns a reference to array of hashrefs data structure as expected by SetBorrowerAttributes. >+ >+=cut >+ >+sub set_patron_attributes { >+ my ($extended, $patron_attributes, $feedback) = @_; >+ >+ unless($extended) { return; } >+ unless( defined($patron_attributes) ) { return; } >+ >+ # Fixup double quotes in case we are passed smart quotes >+ $patron_attributes =~ s/\xe2\x80\x9c/"/g; >+ $patron_attributes =~ s/\xe2\x80\x9d/"/g; >+ >+ push (@$feedback, { feedback => 1, name => 'attribute string', value => $patron_attributes }); >+ >+ my $result = extended_attributes_code_value_arrayref($patron_attributes); >+ >+ return $result; >+} >+ >+=head2 check_branch_code >+ >+ check_branch_code($borrower{branchcode}, $borrowerline, $line_number, \@missing_criticals); >+ >+Pushes a 'missing_criticals' error entry if no branch code or branch code does not map to a branch name. >+ >+=cut >+ >+sub check_branch_code { >+ my ($branchcode, $borrowerline, $line_number, $missing_criticals) = @_; >+ >+ # No branch code >+ unless( $branchcode ) { >+ push (@$missing_criticals, { key => 'branchcode', line => $line_number, lineraw => $borrowerline, }); >+ return; >+ } >+ >+ # look for branch code >+ my $branch_name = GetBranchName( $branchcode ); >+ unless( $branch_name ) { >+ push (@$missing_criticals, { key => 'branchcode', line => $line_number, lineraw => $borrowerline, >+ value => $branchcode, branch_map => 1, }); >+ } >+} >+ >+=head2 check_borrower_category >+ >+ check_borrower_category($borrower{categorycode}, $borrowerline, $line_number, \@missing_criticals); >+ >+Pushes a 'missing_criticals' error entry if no category code or category code does not map to a known category. >+ >+=cut >+ >+sub check_borrower_category { >+ my ($categorycode, $borrowerline, $line_number, $missing_criticals) = @_; >+ >+ # No branch code >+ unless( $categorycode ) { >+ push (@$missing_criticals, { key => 'categorycode', line => $line_number, lineraw => $borrowerline, }); >+ return; >+ } >+ >+ # Looking for borrower category >+ my $category = GetBorrowercategory( $categorycode ); >+ unless( $category ) { >+ push (@$missing_criticals, { key => 'categorycode', line => $line_number, lineraw => $borrowerline, >+ value => $categorycode, category_map => 1, }); >+ } >+} >+ >+1; > > =head1 AUTHOR > >diff --git a/t/db_dependent/Koha/Patrons/Import.t b/t/db_dependent/Koha/Patrons/Import.t >index 801ced9..c6ee974 100644 >--- a/t/db_dependent/Koha/Patrons/Import.t >+++ b/t/db_dependent/Koha/Patrons/Import.t >@@ -18,7 +18,7 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use Test::More; >+use Test::More tests => 98; > use Test::MockModule; > > use Koha::Database; >@@ -36,20 +36,33 @@ $schema->storage->txn_begin; > # Given ... we can use the module > BEGIN { use_ok('Koha::Patrons::Import'); } > >-# Given ... we can reach the method(s) >-my @methods = ('import_patrons'); >-can_ok('Koha::Patrons::Import', @methods); >+my $patrons_import = new_ok('Koha::Patrons::Import'); >+ >+subtest 'test_methods' => sub { >+ plan tests => 1; >+ >+ # Given ... we can reach the method(s) >+ my @methods = ('import_patrons', 'set_column_keys', 'set_patron_attributes', 'check_branch_code'); >+ can_ok('Koha::Patrons::Import', @methods); >+}; >+ >+subtest 'test_attributes' => sub { >+ plan tests => 1; >+ >+ my @attributes = ('today_iso', 'text_csv'); >+ can_ok('Koha::Patrons::Import', @attributes); >+}; > > # Tests for Koha::Patrons::Import::import_patrons() > # Given ... nothing much. When ... Then ... >-my $result = Koha::Patrons::Import::import_patrons(undef); >+my $result = $patrons_import->import_patrons(undef); > is($result, undef, 'Got the expected undef from import_patrons with nothing much'); > > # Given ... some params but no file handle. > my $params_0 = { some_stuff => 'random stuff', }; > > # When ... Then ... >-my $result_0 = Koha::Patrons::Import::import_patrons($params_0); >+my $result_0 = $patrons_import->import_patrons($params_0); > is($result_0, undef, 'Got the expected undef from import_patrons with no file handle'); > > # Given ... a file handle to file with headers only. >@@ -61,11 +74,24 @@ open(my $handle_1, "<", $filename_1) or die "cannot open < $filename_1: $!"; > my $params_1 = { file => $handle_1, }; > > # When ... >-my $result_1 = Koha::Patrons::Import::import_patrons($params_1); >+my $result_1 = $patrons_import->import_patrons($params_1); > > # Then ... >+is($result_1->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons with no matchpoint defined'); >+is(scalar @{$result_1->{errors}}, 0, 'Got the expected 0 size error array from import_patrons with no matchpoint defined'); >+ >+is($result_1->{feedback}->[0]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons with no matchpoint defined'); >+is($result_1->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons with no matchpoint defined'); >+is($result_1->{feedback}->[0]->{value}, 'cardnumber, surname, firstname, title, othernames, initials, streetnumber, streettype, address, address2, city, state, zipcode, country, email, phone, mobile, fax, dateofbirth, branchcode, categorycode, dateenrolled, dateexpiry, userid, password', >+ 'Got the expected header row value from import_patrons with no matchpoint defined'); >+ >+is($result_1->{feedback}->[1]->{feedback}, 1, 'Got the expected second feedback from import_patrons with no matchpoint defined'); >+is($result_1->{feedback}->[1]->{name}, 'lastimported', 'Got the expected last imported name from import_patrons with no matchpoint defined'); >+like($result_1->{feedback}->[1]->{value}, qr/^Nancy \/ \d+/, 'Got the expected second header row value from import_patrons with no matchpoint defined'); >+ > is($result_1->{imported}, 1, 'Got the expected 1 imported result from import_patrons with no matchpoint defined'); > is($result_1->{invalid}, 0, 'Got the expected 0 invalid result from import_patrons with no matchpoint defined'); >+is($result_1->{overwritten}, 0, 'Got the expected 0 overwritten result from import_patrons with no matchpoint defined'); > > # Given ... a valid file handle, a bad matchpoint resulting in invalid card number > my $filename_2 = make_csv($temp_dir, $csv_headers, $csv_one_line); >@@ -73,28 +99,47 @@ open(my $handle_2, "<", $filename_2) or die "cannot open < $filename_2: $!"; > my $params_2 = { file => $handle_2, matchpoint => 'SHOW_BCODE', }; > > # When ... >-my $result_2 = Koha::Patrons::Import::import_patrons($params_2); >+my $result_2 = $patrons_import->import_patrons($params_2); > > # Then ... >-is($result_2->{imported}, 0, 'Got the expected 0 imported result from import_patrons with no matchpoint defined'); >-is($result_2->{invalid}, 1, 'Got the expected 1 invalid result from import_patrons with no matchpoint defined'); >+is($result_2->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons with invalid card number'); >+is($result_2->{errors}->[0]->{borrowernumber}, undef, 'Got the expected undef borrower number from import patrons with invalid card number'); >+is($result_2->{errors}->[0]->{cardnumber}, 1000, 'Got the expected 1000 card number from import patrons with invalid card number'); > is($result_2->{errors}->[0]->{invalid_cardnumber}, 1, 'Got the expected invalid card number from import patrons with invalid card number'); > >+is($result_2->{feedback}->[0]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons with invalid card number'); >+is($result_2->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons with invalid card number'); >+is($result_2->{feedback}->[0]->{value}, 'cardnumber, surname, firstname, title, othernames, initials, streetnumber, streettype, address, address2, city, state, zipcode, country, email, phone, mobile, fax, dateofbirth, branchcode, categorycode, dateenrolled, dateexpiry, userid, password', >+ 'Got the expected header row value from import_patrons with invalid card number'); >+ >+is($result_2->{imported}, 0, 'Got the expected 0 imported result from import_patrons with invalid card number'); >+is($result_2->{invalid}, 1, 'Got the expected 1 invalid result from import_patrons with invalid card number'); >+is($result_2->{overwritten}, 0, 'Got the expected 0 overwritten result from import_patrons with invalid card number'); >+ > # Given ... valid file handle, good matchpoint but same input as prior test. > my $filename_3 = make_csv($temp_dir, $csv_headers, $csv_one_line); > open(my $handle_3, "<", $filename_3) or die "cannot open < $filename_3: $!"; > my $params_3 = { file => $handle_3, matchpoint => 'cardnumber', }; > > # When ... >-my $result_3 = Koha::Patrons::Import::import_patrons($params_3); >+my $result_3 = $patrons_import->import_patrons($params_3); > > # Then ... >+is($result_3->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons with duplicate userid'); >+is($result_3->{errors}->[0]->{duplicate_userid}, 1, 'Got the expected duplicate userid error from import patrons with duplicate userid'); >+is($result_3->{errors}->[0]->{userid}, 'jjenkins0', 'Got the expected userid error from import patrons with duplicate userid'); >+ >+is($result_3->{feedback}->[0]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons with duplicate userid'); >+is($result_3->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons with duplicate userid'); >+is($result_3->{feedback}->[0]->{value}, 'cardnumber, surname, firstname, title, othernames, initials, streetnumber, streettype, address, address2, city, state, zipcode, country, email, phone, mobile, fax, dateofbirth, branchcode, categorycode, dateenrolled, dateexpiry, userid, password', >+ 'Got the expected header row value from import_patrons with duplicate userid'); >+ > is($result_3->{imported}, 0, 'Got the expected 0 imported result from import_patrons with duplicate userid'); > is($result_3->{invalid}, 1, 'Got the expected 1 invalid result from import_patrons with duplicate userid'); >-is($result_3->{errors}->[0]->{duplicate_userid}, 1, 'Got the expected duplicate userid error from import patrons with duplicate userid'); >+is($result_3->{overwritten}, 0, 'Got the expected 0 overwritten result from import_patrons with duplicate userid'); > > # Given ... a new input and mocked C4::Context >-my $context = new Test::MockModule('C4::Context'); >+my $context = Test::MockModule->new('C4::Context'); > $context->mock('preference', sub { my ($mod, $meth) = @_; if ( $meth eq 'ExtendedPatronAttributes' ) { return 1; } }); > > my $new_input_line = '1001,Donna,Sullivan,Mrs,Henry,DS,59,Court,Burrows,Reading,Salt Lake City,Pennsylvania,19605,United States,hsullivan1@purevolume.com,3-(864)009-3006,7-(291)885-8423,1-(879)095-5038,19/09/1970,LPL,PT,04/03/2015,01/07/2015,hsullivan1,8j6P6Dmap'; >@@ -102,10 +147,286 @@ my $filename_4 = make_csv($temp_dir, $csv_headers, $new_input_line); > open(my $handle_4, "<", $filename_4) or die "cannot open < $filename_4: $!"; > my $params_4 = { file => $handle_4, matchpoint => 'cardnumber', }; > >-# When ... Then ... >-my $result_4 = Koha::Patrons::Import::import_patrons($params_4); >+# When ... >+my $result_4 = $patrons_import->import_patrons($params_4); >+ >+# Then ... >+is($result_4->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons with extended user'); >+is(scalar @{$result_4->{errors}}, 0, 'Got the expected 0 size error array from import_patrons with extended user'); >+ >+is($result_4->{feedback}->[0]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons with extended user'); >+is($result_4->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons with extended user'); >+is($result_4->{feedback}->[0]->{value}, 'cardnumber, surname, firstname, title, othernames, initials, streetnumber, streettype, address, address2, city, state, zipcode, country, email, phone, mobile, fax, dateofbirth, branchcode, categorycode, dateenrolled, dateexpiry, userid, password', >+ 'Got the expected header row value from import_patrons with extended user'); >+ >+is($result_4->{feedback}->[1]->{feedback}, 1, 'Got the expected second feedback from import_patrons with extended user'); >+is($result_4->{feedback}->[1]->{name}, 'attribute string', 'Got the expected attribute string from import_patrons with extended user'); >+is($result_4->{feedback}->[1]->{value}, '', 'Got the expected second feedback value from import_patrons with extended user'); >+ >+is($result_4->{feedback}->[2]->{feedback}, 1, 'Got the expected third feedback from import_patrons with extended user'); >+is($result_4->{feedback}->[2]->{name}, 'lastimported', 'Got the expected last imported name from import_patrons with extended user'); >+like($result_4->{feedback}->[2]->{value}, qr/^Donna \/ \d+/, 'Got the expected third feedback value from import_patrons with extended user'); >+ > is($result_4->{imported}, 1, 'Got the expected 1 imported result from import_patrons with extended user'); >+is($result_4->{invalid}, 0, 'Got the expected 0 invalid result from import_patrons with extended user'); >+is($result_4->{overwritten}, 0, 'Got the expected 0 overwritten result from import_patrons with extended user'); >+ >+$context->unmock('preference'); >+ >+# Given ... 3 new inputs. One with no branch code, one with unexpected branch code. >+my $input_no_branch = '1002,Johnny,Reynolds,Mr,Patricia,JR,12,Hill,Kennedy,Saint Louis,Colorado Springs,Missouri,63131,United States,preynolds2@washington.edu,7-(925)314-9514,0-(315)973-8956,4-(510)556-2323,18/09/1967,,PT,07/05/2015,01/07/2015,preynolds2,K3HiDzl'; >+my $input_good_branch = '1003,Linda,Richardson,Mr,Kimberly,LR,90,Place,Bayside,Atlanta,Erie,Georgia,31190,United States,krichardson3@pcworld.com,8-(035)185-0387,4-(796)518-3676,3-(644)960-3789,13/04/1954,RPL,PT,06/06/2015,01/07/2015,krichardson3,P3EO0MVRPXbM'; >+my $input_na_branch = '1005,Ruth,Greene,Mr,Michael,RG,3,Avenue,Grim,Peoria,Jacksonville,Illinois,61614,United States,mgreene5@seesaa.net,3-(941)565-5752,1-(483)885-8138,4-(979)577-6908,09/02/1957,ZZZ,ST,02/04/2015,01/07/2015,mgreene5,or4ORT6JH'; >+ >+my $filename_5 = make_csv($temp_dir, $csv_headers, $input_no_branch, $input_good_branch, $input_na_branch); >+open(my $handle_5, "<", $filename_5) or die "cannot open < $filename_5: $!"; >+my $params_5 = { file => $handle_5, matchpoint => 'cardnumber', }; >+ >+# When ... >+my $result_5 = $patrons_import->import_patrons($params_5); >+ >+# Then ... >+is($result_5->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons for branch tests'); >+ >+is($result_5->{errors}->[0]->{missing_criticals}->[0]->{borrowernumber}, 'UNDEF', 'Got the expected undef borrower number error from import patrons for branch tests'); >+is($result_5->{errors}->[0]->{missing_criticals}->[0]->{key}, 'branchcode', 'Got the expected branch code key from import patrons for branch tests'); >+is($result_5->{errors}->[0]->{missing_criticals}->[0]->{line}, 2, 'Got the expected 2 line number error from import patrons for branch tests'); >+is($result_5->{errors}->[0]->{missing_criticals}->[0]->{lineraw}, $input_no_branch."\r\n", 'Got the expected lineraw error from import patrons for branch tests'); >+is($result_5->{errors}->[0]->{missing_criticals}->[0]->{surname}, 'Johnny', 'Got the expected surname error from import patrons for branch tests'); >+ >+is($result_5->{errors}->[1]->{missing_criticals}->[0]->{borrowernumber}, 'UNDEF', 'Got the expected undef borrower number error from import patrons for branch tests'); >+is($result_5->{errors}->[1]->{missing_criticals}->[0]->{branch_map}, 1, 'Got the expected 1 branchmap error from import patrons for branch tests'); >+is($result_5->{errors}->[1]->{missing_criticals}->[0]->{key}, 'branchcode', 'Got the expected branch code key from import patrons for branch tests'); >+is($result_5->{errors}->[1]->{missing_criticals}->[0]->{line}, 4, 'Got the expected 4 line number error from import patrons for branch tests'); >+is($result_5->{errors}->[1]->{missing_criticals}->[0]->{lineraw}, $input_na_branch."\r\n", 'Got the expected lineraw error from import patrons for branch tests'); >+is($result_5->{errors}->[1]->{missing_criticals}->[0]->{surname}, 'Ruth', 'Got the expected surname error from import patrons for branch tests'); >+is($result_5->{errors}->[1]->{missing_criticals}->[0]->{value}, 'ZZZ', 'Got the expected ZZZ value error from import patrons for branch tests'); >+ >+is($result_5->{feedback}->[0]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons for branch tests'); >+is($result_5->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons for branch tests'); >+is($result_5->{feedback}->[0]->{value}, 'cardnumber, surname, firstname, title, othernames, initials, streetnumber, streettype, address, address2, city, state, zipcode, country, email, phone, mobile, fax, dateofbirth, branchcode, categorycode, dateenrolled, dateexpiry, userid, password', >+ 'Got the expected header row value from import_patrons for branch tests'); >+ >+is($result_5->{feedback}->[1]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons for branch tests'); >+is($result_5->{feedback}->[1]->{name}, 'lastimported', 'Got the expected lastimported name from import_patrons for branch tests'); >+like($result_5->{feedback}->[1]->{value}, qr/^Linda \/ \d+/, 'Got the expected last imported value from import_patrons with for branch tests'); >+ >+is($result_5->{imported}, 1, 'Got the expected 1 imported result from import patrons for branch tests'); >+is($result_5->{invalid}, 2, 'Got the expected 2 invalid result from import patrons for branch tests'); >+is($result_5->{overwritten}, 0, 'Got the expected 0 overwritten result from import patrons for branch tests'); >+ >+# Given ... 3 new inputs. One with no category code, one with unexpected category code. >+my $input_no_category = '1006,Christina,Olson,Rev,Kimberly,CO,8,Avenue,Northridge,Lexington,Wilmington,Kentucky,40510,United States,kolson6@dropbox.com,7-(810)636-6048,1-(052)012-8984,8-(567)232-7818,26/03/1952,FFL,,07/09/2014,01/07/2015,kolson6,x5D3qGbLlptx'; >+my $input_good_category = '1007,Peter,Peters,Mrs,Lawrence,PP,6,Trail,South,Oklahoma City,Topeka,Oklahoma,73135,United States,lpeters7@bandcamp.com,5-(992)205-9318,0-(732)586-9365,3-(448)146-7936,16/08/1983,PVL,T,24/03/2015,01/07/2015,lpeters7,Z19BrQ4'; >+my $input_na_category = '1008,Emily,Richards,Ms,Judy,ER,73,Way,Kedzie,Fort Wayne,Phoenix,Indiana,46825,United States,jrichards8@arstechnica.com,5-(266)658-8957,3-(550)500-9107,7-(816)675-9822,09/08/1984,FFL,ZZ,09/11/2014,01/07/2015,jrichards8,D5PvU6H2R'; >+ >+my $filename_6 = make_csv($temp_dir, $csv_headers, $input_no_category, $input_good_category, $input_na_category); >+open(my $handle_6, "<", $filename_6) or die "cannot open < $filename_6: $!"; >+my $params_6 = { file => $handle_6, matchpoint => 'cardnumber', }; >+ >+# When ... >+my $result_6 = $patrons_import->import_patrons($params_6); >+ >+# Then ... >+is($result_6->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons for category tests'); >+ >+is($result_6->{errors}->[0]->{missing_criticals}->[0]->{borrowernumber}, 'UNDEF', 'Got the expected undef borrower number error from import patrons for category tests'); >+is($result_6->{errors}->[0]->{missing_criticals}->[0]->{key}, 'categorycode', 'Got the expected category code key from import patrons for category tests'); >+is($result_6->{errors}->[0]->{missing_criticals}->[0]->{line}, 2, 'Got the expected 2 line number error from import patrons for category tests'); >+is($result_6->{errors}->[0]->{missing_criticals}->[0]->{lineraw}, $input_no_category."\r\n", 'Got the expected lineraw error from import patrons for category tests'); >+is($result_6->{errors}->[0]->{missing_criticals}->[0]->{surname}, 'Christina', 'Got the expected surname error from import patrons for category tests'); >+ >+is($result_6->{errors}->[1]->{missing_criticals}->[0]->{borrowernumber}, 'UNDEF', 'Got the expected undef borrower number error from import patrons for category tests'); >+is($result_6->{errors}->[1]->{missing_criticals}->[0]->{category_map}, 1, 'Got the expected 1 category_map error from import patrons for category tests'); >+is($result_6->{errors}->[1]->{missing_criticals}->[0]->{key}, 'categorycode', 'Got the expected category code key from import patrons for category tests'); >+is($result_6->{errors}->[1]->{missing_criticals}->[0]->{line}, 4, 'Got the expected 4 line number error from import patrons for category tests'); >+is($result_6->{errors}->[1]->{missing_criticals}->[0]->{lineraw}, $input_na_category."\r\n", 'Got the expected lineraw error from import patrons for category tests'); >+is($result_6->{errors}->[1]->{missing_criticals}->[0]->{surname}, 'Emily', 'Got the expected surname error from import patrons for category tests'); >+is($result_6->{errors}->[1]->{missing_criticals}->[0]->{value}, 'ZZ', 'Got the expected ZZ value error from import patrons for category tests'); >+ >+is($result_6->{feedback}->[0]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons for category tests'); >+is($result_6->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons for category tests'); >+is($result_6->{feedback}->[0]->{value}, 'cardnumber, surname, firstname, title, othernames, initials, streetnumber, streettype, address, address2, city, state, zipcode, country, email, phone, mobile, fax, dateofbirth, branchcode, categorycode, dateenrolled, dateexpiry, userid, password', >+ 'Got the expected header row value from import_patrons for category tests'); > >+is($result_6->{feedback}->[1]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons for category tests'); >+is($result_6->{feedback}->[1]->{name}, 'lastimported', 'Got the expected lastimported name from import_patrons for category tests'); >+like($result_6->{feedback}->[1]->{value}, qr/^Peter \/ \d+/, 'Got the expected last imported value from import_patrons with for category tests'); >+ >+is($result_6->{imported}, 1, 'Got the expected 1 imported result from import patrons for category tests'); >+is($result_6->{invalid}, 2, 'Got the expected 2 invalid result from import patrons for category tests'); >+is($result_6->{overwritten}, 0, 'Got the expected 0 overwritten result from import patrons for category tests'); >+ >+# Given ... 2 new inputs. One without dateofbirth, dateenrolled and dateexpiry values. >+my $input_complete = '1009,Christina,Harris,Dr,Philip,CH,99,Street,Grayhawk,Baton Rouge,Dallas,Louisiana,70810,United States,pharris9@hp.com,9-(317)603-5513,7-(005)062-7593,8-(349)134-1627,19/06/1969,IPT,PT,09/04/2015,01/07/2015,pharris9,NcAhcvvnB'; >+my $input_no_date = '1010,Ralph,Warren,Ms,Linda,RW,6,Way,Barby,Orlando,Albany,Florida,32803,United States,lwarrena@multiply.com,7-(579)753-7752,6-(847)086-7566,9-(122)729-8226,,LPL,T,,,lwarrena,tJ56RD4uV'; >+ >+my $filename_7 = make_csv($temp_dir, $csv_headers, $input_complete, $input_no_date); >+open(my $handle_7, "<", $filename_7) or die "cannot open < $filename_7: $!"; >+my $params_7 = { file => $handle_7, matchpoint => 'cardnumber', }; >+ >+# Need upgrade to Moo >+subtest 'test_set_column_keys' => sub { >+ plan tests => 2; >+ >+ # Given ... nothing at all >+ # When ... Then ... >+ my @columnkeys_0 = Koha::Patrons::Import::set_column_keys(undef); >+ is(scalar @columnkeys_0, 66, 'Got the expected array size from set column keys with undef extended'); >+ >+ # Given ... extended. >+ my $extended = 1; >+ >+ # When ... Then ... >+ my @columnkeys_1 = Koha::Patrons::Import::set_column_keys($extended); >+ is(scalar @columnkeys_1, 67, 'Got the expected array size from set column keys with extended'); >+}; >+ >+subtest 'test_set_patron_attributes' => sub { >+ plan tests => 13; >+ >+ # Given ... nothing at all >+ # When ... Then ... >+ my $result_0 = Koha::Patrons::Import::set_patron_attributes(undef, undef, undef); >+ is($result_0, undef, 'Got the expected undef from set patron attributes with nothing'); >+ >+ # Given ... not extended. >+ my $extended_1 = 0; >+ >+ # When ... Then ... >+ my $result_1 = Koha::Patrons::Import::set_patron_attributes($extended_1, undef, undef); >+ is($result_1, undef, 'Got the expected undef from set patron attributes with not extended'); >+ >+ # Given ... NO patrons attributes >+ my $extended_2 = 1; >+ my $patron_attributes_2 = undef; >+ my @feedback_2; >+ >+ # When ... >+ my $result_2 = Koha::Patrons::Import::set_patron_attributes($extended_2, $patron_attributes_2, \@feedback_2); >+ >+ # Then ... >+ is($result_2, undef, 'Got the expected undef from set patron attributes with no patrons attributes'); >+ is(scalar @feedback_2, 0, 'Got the expected 0 size feedback array from set patron attributes with no patrons attributes'); >+ >+ # Given ... some patrons attributes >+ my $patron_attributes_3 = "homeroom:1150605,grade:01"; >+ my @feedback_3; >+ >+ # When ... >+ my $result_3 = Koha::Patrons::Import::set_patron_attributes($extended_2, $patron_attributes_3, \@feedback_3); >+ >+ # Then ... >+ ok($result_3, 'Got some data back from set patron attributes'); >+ is($result_3->[0]->{code}, 'grade', 'Got the expected first code from set patron attributes'); >+ is($result_3->[0]->{value}, '01', 'Got the expected first value from set patron attributes'); >+ >+ is($result_3->[1]->{code}, 'homeroom', 'Got the expected second code from set patron attributes'); >+ is($result_3->[1]->{value}, 1150605, 'Got the expected second value from set patron attributes'); >+ >+ is(scalar @feedback_3, 1, 'Got the expected 1 array size from set patron attributes with extended user'); >+ is($feedback_3[0]->{feedback}, 1, 'Got the expected second feedback from set patron attributes with extended user'); >+ is($feedback_3[0]->{name}, 'attribute string', 'Got the expected attribute string from set patron attributes with extended user'); >+ is($feedback_3[0]->{value}, 'homeroom:1150605,grade:01', 'Got the expected feedback value from set patron attributes with extended user'); >+}; >+ >+subtest 'test_check_branch_code' => sub { >+ plan tests => 11; >+ >+ # Given ... no branch code. >+ my $borrowerline = 'some, line'; >+ my $line_number = 78; >+ my @missing_criticals = (); >+ >+ # When ... >+ Koha::Patrons::Import::check_branch_code(undef, $borrowerline, $line_number, \@missing_criticals); >+ >+ # Then ... >+ is(scalar @missing_criticals, 1, 'Got the expected missing critical array size of 1 from check_branch_code with no branch code'); >+ >+ is($missing_criticals[0]->{key}, 'branchcode', 'Got the expected branchcode key from check_branch_code with no branch code'); >+ is($missing_criticals[0]->{line}, $line_number, 'Got the expected line number from check_branch_code with no branch code'); >+ is($missing_criticals[0]->{lineraw}, $borrowerline, 'Got the expected lineraw value from check_branch_code with no branch code'); >+ >+ # Given ... unknown branch code >+ my $branchcode_1 = 'unexpected'; >+ my $borrowerline_1 = 'some, line,'.$branchcode_1; >+ my $line_number_1 = 79; >+ my @missing_criticals_1 = (); >+ >+ # When ... >+ Koha::Patrons::Import::check_branch_code($branchcode_1, $borrowerline_1, $line_number_1, \@missing_criticals_1); >+ >+ # Then ... >+ is(scalar @missing_criticals_1, 1, 'Got the expected missing critical array size of 1 from check_branch_code with unexpected branch code'); >+ >+ is($missing_criticals_1[0]->{branch_map}, 1, 'Got the expected 1 branch_map from check_branch_code with unexpected branch code'); >+ is($missing_criticals_1[0]->{key}, 'branchcode', 'Got the expected branchcode key from check_branch_code with unexpected branch code'); >+ is($missing_criticals_1[0]->{line}, $line_number_1, 'Got the expected line number from check_branch_code with unexpected branch code'); >+ is($missing_criticals_1[0]->{lineraw}, $borrowerline_1, 'Got the expected lineraw value from check_branch_code with unexpected branch code'); >+ is($missing_criticals_1[0]->{value}, $branchcode_1, 'Got the expected value from check_branch_code with unexpected branch code'); >+ >+ # Given ... a known branch code. Relies on database sample data >+ my $branchcode_2 = 'FFL'; >+ my $borrowerline_2 = 'some, line,'.$branchcode_2; >+ my $line_number_2 = 80; >+ my @missing_criticals_2 = (); >+ >+ # When ... >+ Koha::Patrons::Import::check_branch_code($branchcode_2, $borrowerline_2, $line_number_2, \@missing_criticals_2); >+ >+ # Then ... >+ is(scalar @missing_criticals_2, 0, 'Got the expected missing critical array size of 0 from check_branch_code'); >+}; >+ >+subtest 'test_check_borrower_category' => sub { >+ plan tests => 11; >+ >+ # Given ... no category code. >+ my $borrowerline = 'some, line'; >+ my $line_number = 781; >+ my @missing_criticals = (); >+ >+ # When ... >+ Koha::Patrons::Import::check_borrower_category(undef, $borrowerline, $line_number, \@missing_criticals); >+ >+ # Then ... >+ is(scalar @missing_criticals, 1, 'Got the expected missing critical array size of 1 from check_branch_code with no category code'); >+ >+ is($missing_criticals[0]->{key}, 'categorycode', 'Got the expected categorycode key from check_branch_code with no category code'); >+ is($missing_criticals[0]->{line}, $line_number, 'Got the expected line number from check_branch_code with no category code'); >+ is($missing_criticals[0]->{lineraw}, $borrowerline, 'Got the expected lineraw value from check_branch_code with no category code'); >+ >+ # Given ... unknown category code >+ my $categorycode_1 = 'unexpected'; >+ my $borrowerline_1 = 'some, line, line, '.$categorycode_1; >+ my $line_number_1 = 791; >+ my @missing_criticals_1 = (); >+ >+ # When ... >+ Koha::Patrons::Import::check_borrower_category($categorycode_1, $borrowerline_1, $line_number_1, \@missing_criticals_1); >+ >+ # Then ... >+ is(scalar @missing_criticals_1, 1, 'Got the expected missing critical array size of 1 from check_branch_code with unexpected category code'); >+ >+ is($missing_criticals_1[0]->{category_map}, 1, 'Got the expected 1 category_map from check_branch_code with unexpected category code'); >+ is($missing_criticals_1[0]->{key}, 'categorycode', 'Got the expected branchcode key from check_branch_code with unexpected category code'); >+ is($missing_criticals_1[0]->{line}, $line_number_1, 'Got the expected line number from check_branch_code with unexpected category code'); >+ is($missing_criticals_1[0]->{lineraw}, $borrowerline_1, 'Got the expected lineraw value from check_branch_code with unexpected category code'); >+ is($missing_criticals_1[0]->{value}, $categorycode_1, 'Got the expected value from check_branch_code with unexpected category code'); >+ >+ # Given ... a known category code. Relies on database sample data. >+ my $categorycode_2 = 'T'; >+ my $borrowerline_2 = 'some, line,'.$categorycode_2; >+ my $line_number_2 = 801; >+ my @missing_criticals_2 = (); >+ >+ # When ... >+ Koha::Patrons::Import::check_borrower_category($categorycode_2, $borrowerline_2, $line_number_2, \@missing_criticals_2); >+ >+ # Then ... >+ is(scalar @missing_criticals_2, 0, 'Got the expected missing critical array size of 0 from check_branch_code'); >+}; > # ###### Test utility ########### > sub make_csv { > my ($temp_dir, @lines) = @_; >@@ -117,6 +438,4 @@ sub make_csv { > return $filename; > } > >-done_testing(); >- > 1; >\ No newline at end of file >-- >2.1.4
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=50700">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12598
:
29807
|
29808
|
29809
|
29939
|
30755
|
30780
|
35557
|
35558
|
35559
|
35560
|
35848
|
35849
|
35850
|
35851
|
35964
|
36684
|
36685
|
36687
|
36688
|
36690
|
36692
|
36693
|
36694
|
36695
|
36696
|
39124
|
39125
|
39126
|
39127
|
39128
|
41790
|
41791
|
41792
|
41793
|
41794
|
44065
|
44066
|
44067
|
44068
|
44069
|
48753
|
48754
|
48755
|
48756
|
48757
|
50693
|
50694
|
50695
|
50696
|
50697
|
50698
|
50699
|
50700
|
50704
|
51122
|
51357
|
51358
|
51359
|
51360
|
51361
|
51362
|
51363
|
51364
|
51365
|
51366
|
51367
|
51368
|
51369
|
51370
|
51371
|
51372
|
52323
|
52324
|
52325
|
52326
|
52327
|
52328
|
52329
|
52330
|
52331
|
52332
|
52333
|
52540
|
64437
|
64438
|
64855
|
65214
|
65215
|
65216
|
65217
|
65218
|
65819
|
65820
|
65821
|
65822
|
65823
|
65824
|
66353
|
66354
|
66355
|
66356
|
66357
|
66358
|
66359
|
66575
|
66576
|
66577
|
66578
|
66579
|
66580
|
66581
|
66582
|
67276
|
67277
|
70265
|
70266
|
71755
|
71756
|
71757
|
71758
|
71759
|
71760
|
71761
|
71762
|
71763
|
71764
|
71765
|
71766