From f065c42a7ad67a79e2a13ccca363ad0a19152d05 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 18 Mar 2024 07:00:37 -0400 Subject: [PATCH] Bug 34621: Tidy Import.t Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer (cherry picked from commit 6a4c2dd03a99741129bd94e261d7681bd3e634de) Signed-off-by: Fridolin Somers --- t/db_dependent/Koha/Patrons/Import.t | 1550 +++++++++++++++++--------- 1 file changed, 1014 insertions(+), 536 deletions(-) diff --git a/t/db_dependent/Koha/Patrons/Import.t b/t/db_dependent/Koha/Patrons/Import.t index e9afc42b50..77ff8db92e 100755 --- a/t/db_dependent/Koha/Patrons/Import.t +++ b/t/db_dependent/Koha/Patrons/Import.t @@ -31,7 +31,7 @@ use Koha::Patron::Relationships; use Koha::DateUtils qw(dt_from_string); use File::Temp qw(tempfile tempdir); -my $temp_dir = tempdir('Koha_patrons_import_test_XXXX', CLEANUP => 1, TMPDIR => 1); +my $temp_dir = tempdir( 'Koha_patrons_import_test_XXXX', CLEANUP => 1, TMPDIR => 1 ); use t::lib::Mocks; use t::lib::TestBuilder; @@ -50,31 +50,32 @@ subtest 'test_methods' => sub { plan tests => 1; # Given ... we can reach the method(s) - my @methods = ('import_patrons', - 'set_attribute_types', - 'prepare_columns', - 'set_column_keys', - 'generate_patron_attributes', - 'check_branch_code', - 'format_dates', - ); - can_ok('Koha::Patrons::Import', @methods); + my @methods = ( + 'import_patrons', + 'set_attribute_types', + 'prepare_columns', + 'set_column_keys', + 'generate_patron_attributes', + 'check_branch_code', + 'format_dates', + ); + 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); + 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; warning_is { $result = $patrons_import->import_patrons(undef) } - { carped => 'No file handle passed in!' }, - " Koha::Patrons::Import->import_patrons carps if no file handle is passed"; -is($result, undef, 'Got the expected undef from import_patrons with nothing much'); +{ carped => 'No file handle passed in!' }, + " Koha::Patrons::Import->import_patrons carps if no file handle is passed"; +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', }; @@ -82,378 +83,706 @@ my $params_0 = { some_stuff => 'random stuff', }; # When ... Then ... my $result_0; warning_is { $result_0 = $patrons_import->import_patrons($params_0) } - { carped => 'No file handle passed in!' }, - " Koha::Patrons::Import->import_patrons carps if no file handle is passed"; -is($result_0, undef, 'Got the expected undef from import_patrons with no file handle'); +{ carped => 'No file handle passed in!' }, + " Koha::Patrons::Import->import_patrons carps if no file handle is passed"; +is( $result_0, undef, 'Got the expected undef from import_patrons with no file handle' ); # Given ... a file handle to file with headers only. -t::lib::Mocks::mock_preference('ExtendedPatronAttributes', 0); -t::lib::Mocks::mock_preference('dateformat', 'us'); - -my $csv_headers = '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'; -my $res_header = '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'; -my $csv_one_line = '1000,Nancy,Jenkins,Dr,,NJ,78,Circle,Bunting,El Paso,Henderson,Texas,79984,United States,ajenkins0@sourceforge.net,7-(388)559-6763,3-(373)151-4471,8-(509)286-4001,10/16/1965,CPL,PT,12/28/2014,07/01/2015,jjenkins0,DPQILy'; -my $csv_one_line_a = '1001,Nancy,Jenkins,Dr,,NJ,78,Circle,Bunting,El Paso,Henderson,Texas,79984,United States,ajenkins0@sourceforge.net,7-(388)559-6763,3-(373)151-4471,8-(509)286-4001,10/16/1965,CPL,PT,12/28/2014,07/01/2015,jjenkins0,DPQILy'; -my $csv_one_line_b = '1000,Nancy2,Jenkins2,Dr,,NJ,78,Circle,Bunting,El Paso,Henderson,Texas,79984,United States,ajenkins0@sourceforge.net,7-(388)559-6763,3-(373)151-4471,8-(509)286-4001,10/16/1965,CPL,PT,12/28/2014,07/01/2015,jjenkins0,DPQILy'; - -my $filename_1 = make_csv($temp_dir, $csv_headers, $csv_one_line); -open(my $handle_1, "<", $filename_1) or die "cannot open < $filename_1: $!"; +t::lib::Mocks::mock_preference( 'ExtendedPatronAttributes', 0 ); +t::lib::Mocks::mock_preference( 'dateformat', 'us' ); + +my $csv_headers = + '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'; +my $res_header = + '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'; +my $csv_one_line = + '1000,Nancy,Jenkins,Dr,,NJ,78,Circle,Bunting,El Paso,Henderson,Texas,79984,United States,ajenkins0@sourceforge.net,7-(388)559-6763,3-(373)151-4471,8-(509)286-4001,10/16/1965,CPL,PT,12/28/2014,07/01/2015,jjenkins0,DPQILy'; +my $csv_one_line_a = + '1001,Nancy,Jenkins,Dr,,NJ,78,Circle,Bunting,El Paso,Henderson,Texas,79984,United States,ajenkins0@sourceforge.net,7-(388)559-6763,3-(373)151-4471,8-(509)286-4001,10/16/1965,CPL,PT,12/28/2014,07/01/2015,jjenkins0,DPQILy'; +my $csv_one_line_b = + '1000,Nancy2,Jenkins2,Dr,,NJ,78,Circle,Bunting,El Paso,Henderson,Texas,79984,United States,ajenkins0@sourceforge.net,7-(388)559-6763,3-(373)151-4471,8-(509)286-4001,10/16/1965,CPL,PT,12/28/2014,07/01/2015,jjenkins0,DPQILy'; + +my $filename_1 = make_csv( $temp_dir, $csv_headers, $csv_one_line ); +open( my $handle_1, "<", $filename_1 ) or die "cannot open < $filename_1: $!"; my $params_1 = { file => $handle_1, }; # When ... 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}, $res_header, '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'); +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}, $res_header, + '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); -open(my $handle_2, "<", $filename_2) or die "cannot open < $filename_2: $!"; +my $filename_2 = make_csv( $temp_dir, $csv_headers, $csv_one_line ); +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 = $patrons_import->import_patrons($params_2); # Then ... -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}, $res_header, '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'); +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}, $res_header, + '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 that matches should not overwrite when not set. -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 $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 = $patrons_import->import_patrons($params_3); # Then ... -is($result_3->{already_in_db}, 1, 'Got the expected 1 already_in_db from import_patrons with duplicate userid'); -is($result_3->{errors}->[0]->{duplicate_userid}, undef, 'No duplicate userid error from import patrons with duplicate userid (it is our own)'); -is($result_3->{errors}->[0]->{userid}, undef, 'No duplicate userid error from import patrons with duplicate userid (it is our own)'); - -is($result_3->{feedback}->[0]->{feedback}, 1, 'Got 1 expected feedback from import_patrons that matched but not overwritten'); -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}, $res_header, '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'); -is($result_3->{invalid}, 0, 'Got the expected 0 invalid result from import_patrons'); -is($result_3->{overwritten}, 0, 'Got the expected 0 overwritten result from import_patrons that matched'); +is( $result_3->{already_in_db}, 1, 'Got the expected 1 already_in_db from import_patrons with duplicate userid' ); +is( + $result_3->{errors}->[0]->{duplicate_userid}, undef, + 'No duplicate userid error from import patrons with duplicate userid (it is our own)' +); +is( + $result_3->{errors}->[0]->{userid}, undef, + 'No duplicate userid error from import patrons with duplicate userid (it is our own)' +); + +is( + $result_3->{feedback}->[0]->{feedback}, 1, + 'Got 1 expected feedback from import_patrons that matched but not overwritten' +); +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}, $res_header, + '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' ); +is( $result_3->{invalid}, 0, 'Got the expected 0 invalid result from import_patrons' ); +is( $result_3->{overwritten}, 0, 'Got the expected 0 overwritten result from import_patrons that matched' ); # Given ... valid file handle, good matchpoint that matches should overwrite when set. -my $filename_3a = make_csv($temp_dir, $csv_headers, $csv_one_line); -open(my $handle_3a, "<", $filename_3a) or die "cannot open < $filename_3: $!"; -my $params_3a = { file => $handle_3a, matchpoint => 'cardnumber', overwrite_cardnumber => 1}; +my $filename_3a = make_csv( $temp_dir, $csv_headers, $csv_one_line ); +open( my $handle_3a, "<", $filename_3a ) or die "cannot open < $filename_3: $!"; +my $params_3a = { file => $handle_3a, matchpoint => 'cardnumber', overwrite_cardnumber => 1 }; # When ... my $result_3a; warning_is { $result_3a = $patrons_import->import_patrons($params_3a) } - undef, - "No warning raised by import_patrons"; +undef, + "No warning raised by import_patrons"; # Then ... -is($result_3a->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons when matched and overwrite set'); -is($result_3a->{errors}->[0]->{duplicate_userid}, undef, 'No duplicate userid error from import patrons with duplicate userid (it is our own)'); -is($result_3a->{errors}->[0]->{userid}, undef, 'No duplicate userid error from import patrons with duplicate userid (it is our own)'); - -is($result_3a->{feedback}->[0]->{feedback}, 1, 'Got 1 expected feedback from import_patrons that matched and overwritten'); -is($result_3a->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons with duplicate userid'); -is($result_3a->{feedback}->[0]->{value}, $res_header, 'Got the expected header row value from import_patrons with duplicate userid'); - -is($result_3a->{imported}, 0, 'Got the expected 0 imported result from import_patrons'); -is($result_3a->{invalid}, 0, 'Got the expected 0 invalid result from import_patrons'); -is($result_3a->{overwritten}, 1, 'Got the expected 1 overwritten result from import_patrons that matched'); - -my $patron_3 = Koha::Patrons->find({ cardnumber => '1000' }); +is( + $result_3a->{already_in_db}, 0, + 'Got the expected 0 already_in_db from import_patrons when matched and overwrite set' +); +is( + $result_3a->{errors}->[0]->{duplicate_userid}, undef, + 'No duplicate userid error from import patrons with duplicate userid (it is our own)' +); +is( + $result_3a->{errors}->[0]->{userid}, undef, + 'No duplicate userid error from import patrons with duplicate userid (it is our own)' +); + +is( + $result_3a->{feedback}->[0]->{feedback}, 1, + 'Got 1 expected feedback from import_patrons that matched and overwritten' +); +is( + $result_3a->{feedback}->[0]->{name}, 'headerrow', + 'Got the expected header row name from import_patrons with duplicate userid' +); +is( + $result_3a->{feedback}->[0]->{value}, $res_header, + 'Got the expected header row value from import_patrons with duplicate userid' +); + +is( $result_3a->{imported}, 0, 'Got the expected 0 imported result from import_patrons' ); +is( $result_3a->{invalid}, 0, 'Got the expected 0 invalid result from import_patrons' ); +is( $result_3a->{overwritten}, 1, 'Got the expected 1 overwritten result from import_patrons that matched' ); + +my $patron_3 = Koha::Patrons->find( { cardnumber => '1000' } ); is( $patron_3->dateexpiry, '2015-07-01', "Expiration date is correct with update_dateexpiry = false" ); # Given ... valid file handle, good matchpoint that matches should overwrite when set, surname is protected from # overwrite but firstname is not -my $filename_3c = make_csv($temp_dir, $csv_headers, $csv_one_line_b); -open(my $handle_3c, "<", $filename_3c) or die "cannot open < $filename_3: $!"; -my $params_3c = { file => $handle_3c, matchpoint => 'cardnumber', overwrite_cardnumber => 1, preserve_fields => [ 'firstname' ], update_dateexpiry => 1, update_dateexpiry_from_today => 1 }; +my $filename_3c = make_csv( $temp_dir, $csv_headers, $csv_one_line_b ); +open( my $handle_3c, "<", $filename_3c ) or die "cannot open < $filename_3: $!"; +my $params_3c = { + file => $handle_3c, matchpoint => 'cardnumber', overwrite_cardnumber => 1, preserve_fields => ['firstname'], + update_dateexpiry => 1, update_dateexpiry_from_today => 1 +}; # When ... my $result_3c; warning_is { $result_3c = $patrons_import->import_patrons($params_3c) } - undef, +undef, "No warning raised by import_patrons"; # Then ... -is($result_3c->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons when matched and overwrite set'); -is($result_3c->{errors}->[0]->{duplicate_userid}, undef, 'No duplicate userid error from import patrons with duplicate userid (it is our own)'); -is($result_3c->{errors}->[0]->{userid}, undef, 'No duplicate userid error from import patrons with duplicate userid (it is our own)'); - -is($result_3c->{feedback}->[0]->{feedback}, 1, 'Got 1 expected feedback from import_patrons that matched and overwritten'); -is($result_3c->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons with duplicate userid'); -is($result_3c->{feedback}->[0]->{value}, $res_header, 'Got the expected header row value from import_patrons with duplicate userid'); - -is($result_3c->{imported}, 0, 'Got the expected 0 imported result from import_patrons'); -is($result_3c->{invalid}, 0, 'Got the expected 0 invalid result from import_patrons'); -is($result_3c->{overwritten}, 1, 'Got the expected 1 overwritten result from import_patrons that matched'); - -my $patron_3c = Koha::Patrons->find({ cardnumber => '1000' }); -is( $patron_3c->dateexpiry, dt_from_string->add( months => 99, end_of_month => 'limit' )->ymd, "Expiration date is correct with update_dateexpiry = true" ); - -is( $patron_3c->surname, "Nancy2", "Surname field is preserved from original" ); +is( + $result_3c->{already_in_db}, 0, + 'Got the expected 0 already_in_db from import_patrons when matched and overwrite set' +); +is( + $result_3c->{errors}->[0]->{duplicate_userid}, undef, + 'No duplicate userid error from import patrons with duplicate userid (it is our own)' +); +is( + $result_3c->{errors}->[0]->{userid}, undef, + 'No duplicate userid error from import patrons with duplicate userid (it is our own)' +); + +is( + $result_3c->{feedback}->[0]->{feedback}, 1, + 'Got 1 expected feedback from import_patrons that matched and overwritten' +); +is( + $result_3c->{feedback}->[0]->{name}, 'headerrow', + 'Got the expected header row name from import_patrons with duplicate userid' +); +is( + $result_3c->{feedback}->[0]->{value}, $res_header, + 'Got the expected header row value from import_patrons with duplicate userid' +); + +is( $result_3c->{imported}, 0, 'Got the expected 0 imported result from import_patrons' ); +is( $result_3c->{invalid}, 0, 'Got the expected 0 invalid result from import_patrons' ); +is( $result_3c->{overwritten}, 1, 'Got the expected 1 overwritten result from import_patrons that matched' ); + +my $patron_3c = Koha::Patrons->find( { cardnumber => '1000' } ); +is( + $patron_3c->dateexpiry, dt_from_string->add( months => 99, end_of_month => 'limit' )->ymd, + "Expiration date is correct with update_dateexpiry = true" +); + +is( $patron_3c->surname, "Nancy2", "Surname field is preserved from original" ); is( $patron_3c->firstname, "Jenkins", "Firstname field is overwritten" ); # test update_dateexpiry_from_current -my $filename_3d = make_csv($temp_dir, $csv_headers, $csv_one_line_b); -open(my $handle_3d, "<", $filename_3d) or die "cannot open < $filename_3: $!"; +my $filename_3d = make_csv( $temp_dir, $csv_headers, $csv_one_line_b ); +open( my $handle_3d, "<", $filename_3d ) or die "cannot open < $filename_3: $!"; $patron_3c->dateexpiry('1980-01-01')->store(); -my $params_3d = { file => $handle_3d, matchpoint => 'cardnumber', overwrite_cardnumber => 1, preserve_fields => [ 'firstname' ], update_dateexpiry => 1, update_dateexpiry_from_existing => 1 }; +my $params_3d = { + file => $handle_3d, matchpoint => 'cardnumber', overwrite_cardnumber => 1, preserve_fields => ['firstname'], + update_dateexpiry => 1, update_dateexpiry_from_existing => 1 +}; warning_is { $patrons_import->import_patrons($params_3d) } - undef, +undef, "No warning raised by import_patrons"; -$patron_3c = Koha::Patrons->find({ cardnumber => '1000' }); +$patron_3c = Koha::Patrons->find( { cardnumber => '1000' } ); is( $patron_3c->dateexpiry, '1988-04-01', "Expiration date is correct with update_dateexpiry_from_existing => 1" ); + # /test update_dateexpiry_from_current # Given ... valid file handle, good matchpoint that does not match and conflicting userid. -my $filename_3b = make_csv($temp_dir, $csv_headers, $csv_one_line_a); -open(my $handle_3b, "<", $filename_3b) or die "cannot open < $filename_3: $!"; +my $filename_3b = make_csv( $temp_dir, $csv_headers, $csv_one_line_a ); +open( my $handle_3b, "<", $filename_3b ) or die "cannot open < $filename_3: $!"; my $params_3b = { file => $handle_3b, matchpoint => 'cardnumber', }; # When ... my $result_3b = $patrons_import->import_patrons($params_3b); # Then ... -is($result_3b->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons with duplicate userid'); -is($result_3b->{errors}->[0]->{duplicate_userid}, 1, 'Got the expected duplicate userid error from import patrons with duplicate userid'); -is($result_3b->{errors}->[0]->{userid}, 'jjenkins0', 'Got the expected userid error from import patrons with duplicate userid'); - -is($result_3b->{feedback}->[0]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons with duplicate userid'); -is($result_3b->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons with duplicate userid'); -is($result_3b->{feedback}->[0]->{value}, $res_header, 'Got the expected header row value from import_patrons with duplicate userid'); - -is($result_3b->{imported}, 0, 'Got the expected 0 imported result from import_patrons with duplicate userid'); -is($result_3b->{invalid}, 1, 'Got the expected 1 invalid result from import_patrons with duplicate userid'); -is($result_3b->{overwritten}, 0, 'Got the expected 0 overwritten result from import_patrons with duplicate userid'); +is( $result_3b->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons with duplicate userid' ); +is( + $result_3b->{errors}->[0]->{duplicate_userid}, 1, + 'Got the expected duplicate userid error from import patrons with duplicate userid' +); +is( + $result_3b->{errors}->[0]->{userid}, 'jjenkins0', + 'Got the expected userid error from import patrons with duplicate userid' +); + +is( + $result_3b->{feedback}->[0]->{feedback}, 1, + 'Got the expected 1 feedback from import_patrons with duplicate userid' +); +is( + $result_3b->{feedback}->[0]->{name}, 'headerrow', + 'Got the expected header row name from import_patrons with duplicate userid' +); +is( + $result_3b->{feedback}->[0]->{value}, $res_header, + 'Got the expected header row value from import_patrons with duplicate userid' +); + +is( $result_3b->{imported}, 0, 'Got the expected 0 imported result from import_patrons with duplicate userid' ); +is( $result_3b->{invalid}, 1, 'Got the expected 1 invalid result from import_patrons with duplicate userid' ); +is( $result_3b->{overwritten}, 0, 'Got the expected 0 overwritten result from import_patrons with duplicate userid' ); # Given ... a new input and mocked C4::Context -t::lib::Mocks::mock_preference('ExtendedPatronAttributes', 1); -my $attribute = $builder->build({ source => "BorrowerAttributeType"}); - -my $csv_headers_a = '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,patron_attributes'; -my $res_header_a = '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, patron_attributes'; -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,09/19/1970,LPL,PT,03/04/2015,07/01/2015,hsullivan1,8j6P6Dmap,'.$attribute->{code}.':1'; -my $filename_4 = make_csv($temp_dir, $csv_headers_a, $new_input_line); -open(my $handle_4, "<", $filename_4) or die "cannot open < $filename_4: $!"; +t::lib::Mocks::mock_preference( 'ExtendedPatronAttributes', 1 ); +my $attribute = $builder->build( { source => "BorrowerAttributeType" } ); + +my $csv_headers_a = + '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,patron_attributes'; +my $res_header_a = + '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, patron_attributes'; +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,09/19/1970,LPL,PT,03/04/2015,07/01/2015,hsullivan1,8j6P6Dmap,' + . $attribute->{code} . ':1'; +my $filename_4 = make_csv( $temp_dir, $csv_headers_a, $new_input_line ); +open( my $handle_4, "<", $filename_4 ) or die "cannot open < $filename_4: $!"; my $params_4 = { file => $handle_4, matchpoint => $attribute->{code}, }; # 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}, $res_header_a, '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}, $attribute->{code}.':1', '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'); - -seek $handle_4,0,0; #Reset to verify finding a matched patron works +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}, $res_header_a, + '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}, $attribute->{code} . ':1', + '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' ); + +seek $handle_4, 0, 0; #Reset to verify finding a matched patron works my $result_4a = $patrons_import->import_patrons($params_4); -is($result_4a->{already_in_db}, 1, 'Got the expected 1 already_in_db from import_patrons with extended user matched'); -is(scalar @{$result_4->{errors}}, 0, 'Got the expected 0 size error array from import_patrons with extended user matched'); - -is($result_4a->{feedback}->[0]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons with extended user matched'); -is($result_4a->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons with extended user matched'); -is($result_4a->{feedback}->[0]->{value}, $res_header_a, 'Got the expected header row value from import_patrons with extended user matched'); - -is($result_4a->{feedback}->[1]->{feedback}, 1, 'Got the expected second feedback from import_patrons with extended user matched'); -is($result_4a->{feedback}->[1]->{name}, 'attribute string', 'Got the expected attribute string from import_patrons with extended user matched'); -is($result_4a->{feedback}->[1]->{value}, $attribute->{code}.':1', 'Got the expected second feedback value from import_patrons with extended user matched'); +is( $result_4a->{already_in_db}, 1, 'Got the expected 1 already_in_db from import_patrons with extended user matched' ); +is( + scalar @{ $result_4->{errors} }, 0, + 'Got the expected 0 size error array from import_patrons with extended user matched' +); + +is( + $result_4a->{feedback}->[0]->{feedback}, 1, + 'Got the expected 1 feedback from import_patrons with extended user matched' +); +is( + $result_4a->{feedback}->[0]->{name}, 'headerrow', + 'Got the expected header row name from import_patrons with extended user matched' +); +is( + $result_4a->{feedback}->[0]->{value}, $res_header_a, + 'Got the expected header row value from import_patrons with extended user matched' +); + +is( + $result_4a->{feedback}->[1]->{feedback}, 1, + 'Got the expected second feedback from import_patrons with extended user matched' +); +is( + $result_4a->{feedback}->[1]->{name}, 'attribute string', + 'Got the expected attribute string from import_patrons with extended user matched' +); +is( + $result_4a->{feedback}->[1]->{value}, $attribute->{code} . ':1', + 'Got the expected second feedback value from import_patrons with extended user matched' +); + +is( + $result_4a->{feedback}->[2]->{already_in_db}, '1', + 'Got the expected already_in_db from import_patrons with extended user matched' +); +like( + $result_4a->{feedback}->[2]->{value}, qr/^Donna \/ \d+/, + 'Got the expected third feedback value from import_patrons with extended user matched' +); + +is( $result_4a->{imported}, 0, 'Got the expected 0 imported result from import_patrons with extended user matched' ); +is( $result_4a->{invalid}, 0, 'Got the expected 0 invalid result from import_patrons with extended user matched' ); +is( + $result_4a->{overwritten}, 0, + 'Got the expected 0 overwritten result from import_patrons with extended user matched' +); + +t::lib::Mocks::mock_preference( 'ExtendedPatronAttributes', 0 ); + +my $surname = 'Chloé❤'; -is($result_4a->{feedback}->[2]->{already_in_db}, '1', 'Got the expected already_in_db from import_patrons with extended user matched'); -like($result_4a->{feedback}->[2]->{value}, qr/^Donna \/ \d+/, 'Got the expected third feedback value from import_patrons with extended user matched'); - -is($result_4a->{imported}, 0, 'Got the expected 0 imported result from import_patrons with extended user matched'); -is($result_4a->{invalid}, 0, 'Got the expected 0 invalid result from import_patrons with extended user matched'); -is($result_4a->{overwritten}, 0, 'Got the expected 0 overwritten result from import_patrons with extended user matched'); - -t::lib::Mocks::mock_preference('ExtendedPatronAttributes', 0); - -my $surname ='Chloé❤'; # Given ... 3 new inputs. One with no branch code, one with unexpected branch code. -my $input_no_branch = qq|1002,$surname,Reynolds,Mr,Patricia,JR,12,Hill,Kennedy,Saint Louis,Colorado Springs,Missouri,63131,United States,preynolds2i\@washington.edu,7-(925)314-9514,0-(315)973-8956,4-(510)556-2323,09/18/1967,,PT,05/07/2015,07/01/2015,preynolds2,K3HiDzl|; -my $input_good_branch = qq|1003,$surname,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,04/13/1954,RPL,PT,06/06/2015,07/01/2015,krichardson3,P3EO0MVRPXbM|; -my $input_na_branch = qq|1005,$surname,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,02/09/1957,ZZZ,ST,04/02/2015,07/01/2015,mgreene5,or4ORT6JH|; - -my $filename_5 = make_csv($temp_dir, $csv_headers, encode_utf8($input_no_branch), encode_utf8($input_good_branch), encode_utf8($input_na_branch)); -open(my $handle_5, "<", $filename_5) or die "cannot open < $filename_5: $!"; +my $input_no_branch = + qq|1002,$surname,Reynolds,Mr,Patricia,JR,12,Hill,Kennedy,Saint Louis,Colorado Springs,Missouri,63131,United States,preynolds2i\@washington.edu,7-(925)314-9514,0-(315)973-8956,4-(510)556-2323,09/18/1967,,PT,05/07/2015,07/01/2015,preynolds2,K3HiDzl|; +my $input_good_branch = + qq|1003,$surname,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,04/13/1954,RPL,PT,06/06/2015,07/01/2015,krichardson3,P3EO0MVRPXbM|; +my $input_na_branch = + qq|1005,$surname,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,02/09/1957,ZZZ,ST,04/02/2015,07/01/2015,mgreene5,or4ORT6JH|; + +my $filename_5 = make_csv( + $temp_dir, $csv_headers, encode_utf8($input_no_branch), encode_utf8($input_good_branch), + encode_utf8($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}, $surname, '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}, $surname, '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}, $res_header, '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/^$surname \/ \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'); +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}, $surname, + '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}, $surname, + '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}, $res_header, + '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/^$surname \/ \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,03/26/1952,FFL,,09/07/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,08/16/1983,PVL,T,03/24/2015,07/01/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,08/09/1984,FFL,ZZ,11/09/2014,07/01/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 $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,03/26/1952,FFL,,09/07/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,08/16/1983,PVL,T,03/24/2015,07/01/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,08/09/1984,FFL,ZZ,11/09/2014,07/01/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}, $res_header, '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'); +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}, $res_header, + '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,06/19/1969,IPT,PT,04/09/2015,07/01/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,26/01/2001,LPL,T,25/01/2001,24/01/2001,lwarrena,tJ56RD4uV'; +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,06/19/1969,IPT,PT,04/09/2015,07/01/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,26/01/2001,LPL,T,25/01/2001,24/01/2001,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 $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', }; # When ... my $result_7 = $patrons_import->import_patrons($params_7); # Then ... -is($result_7->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons for dates tests'); -is(scalar @{$result_7->{errors}}, 1, 'Got the expected 1 error array size from import_patrons for dates tests'); -is(scalar @{$result_7->{errors}->[0]->{missing_criticals}}, 3, 'Got the expected 3 missing critical errors from import_patrons for dates tests'); - -is($result_7->{errors}->[0]->{missing_criticals}->[0]->{bad_date}, 1, 'Got the expected 1 bad_date error from import patrons for dates tests'); -is($result_7->{errors}->[0]->{missing_criticals}->[0]->{borrowernumber}, 'UNDEF', 'Got the expected undef borrower number error from import patrons for dates tests'); -is($result_7->{errors}->[0]->{missing_criticals}->[0]->{key}, 'dateofbirth', 'Got the expected dateofbirth key from import patrons for dates tests'); -is($result_7->{errors}->[0]->{missing_criticals}->[0]->{line}, 3, 'Got the expected 2 line number error from import patrons for dates tests'); -is($result_7->{errors}->[0]->{missing_criticals}->[0]->{lineraw}, $input_no_date."\r\n", 'Got the expected lineraw error from import patrons for dates tests'); -is($result_7->{errors}->[0]->{missing_criticals}->[0]->{surname}, 'Ralph', 'Got the expected surname error from import patrons for dates tests'); - -is($result_7->{errors}->[0]->{missing_criticals}->[1]->{key}, 'dateenrolled', 'Got the expected dateenrolled key from import patrons for dates tests'); -is($result_7->{errors}->[0]->{missing_criticals}->[2]->{key}, 'dateexpiry', 'Got the expected dateexpiry key from import patrons for dates tests'); - -is(scalar @{$result_7->{feedback}}, 2, 'Got the expected 2 feedback from import patrons for dates tests'); -is($result_7->{feedback}->[0]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons for dates tests'); -is($result_7->{feedback}->[0]->{name}, 'headerrow', 'Got the expected header row name from import_patrons for dates tests'); -is($result_7->{feedback}->[0]->{value}, $res_header, 'Got the expected header row value from import_patrons for dates tests'); - -is($result_7->{feedback}->[1]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons for dates tests'); -is($result_7->{feedback}->[1]->{name}, 'lastimported', 'Got the expected lastimported from import_patrons for dates tests'); -like($result_7->{feedback}->[1]->{value}, qr/^Christina \/ \d+/, 'Got the expected lastimported value from import_patrons for dates tests'); - -is($result_7->{imported}, 1, 'Got the expected 1 imported result from import patrons for dates tests'); -is($result_7->{invalid}, 1, 'Got the expected 1 invalid result from import patrons for dates tests'); -is($result_7->{overwritten}, 0, 'Got the expected 0 overwritten result from import patrons for dates tests'); +is( $result_7->{already_in_db}, 0, 'Got the expected 0 already_in_db from import_patrons for dates tests' ); +is( scalar @{ $result_7->{errors} }, 1, 'Got the expected 1 error array size from import_patrons for dates tests' ); +is( + scalar @{ $result_7->{errors}->[0]->{missing_criticals} }, 3, + 'Got the expected 3 missing critical errors from import_patrons for dates tests' +); + +is( + $result_7->{errors}->[0]->{missing_criticals}->[0]->{bad_date}, 1, + 'Got the expected 1 bad_date error from import patrons for dates tests' +); +is( + $result_7->{errors}->[0]->{missing_criticals}->[0]->{borrowernumber}, 'UNDEF', + 'Got the expected undef borrower number error from import patrons for dates tests' +); +is( + $result_7->{errors}->[0]->{missing_criticals}->[0]->{key}, 'dateofbirth', + 'Got the expected dateofbirth key from import patrons for dates tests' +); +is( + $result_7->{errors}->[0]->{missing_criticals}->[0]->{line}, 3, + 'Got the expected 2 line number error from import patrons for dates tests' +); +is( + $result_7->{errors}->[0]->{missing_criticals}->[0]->{lineraw}, $input_no_date . "\r\n", + 'Got the expected lineraw error from import patrons for dates tests' +); +is( + $result_7->{errors}->[0]->{missing_criticals}->[0]->{surname}, 'Ralph', + 'Got the expected surname error from import patrons for dates tests' +); + +is( + $result_7->{errors}->[0]->{missing_criticals}->[1]->{key}, 'dateenrolled', + 'Got the expected dateenrolled key from import patrons for dates tests' +); +is( + $result_7->{errors}->[0]->{missing_criticals}->[2]->{key}, 'dateexpiry', + 'Got the expected dateexpiry key from import patrons for dates tests' +); + +is( scalar @{ $result_7->{feedback} }, 2, 'Got the expected 2 feedback from import patrons for dates tests' ); +is( $result_7->{feedback}->[0]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons for dates tests' ); +is( + $result_7->{feedback}->[0]->{name}, 'headerrow', + 'Got the expected header row name from import_patrons for dates tests' +); +is( + $result_7->{feedback}->[0]->{value}, $res_header, + 'Got the expected header row value from import_patrons for dates tests' +); + +is( $result_7->{feedback}->[1]->{feedback}, 1, 'Got the expected 1 feedback from import_patrons for dates tests' ); +is( + $result_7->{feedback}->[1]->{name}, 'lastimported', + 'Got the expected lastimported from import_patrons for dates tests' +); +like( + $result_7->{feedback}->[1]->{value}, qr/^Christina \/ \d+/, + 'Got the expected lastimported value from import_patrons for dates tests' +); + +is( $result_7->{imported}, 1, 'Got the expected 1 imported result from import patrons for dates tests' ); +is( $result_7->{invalid}, 1, 'Got the expected 1 invalid result from import patrons for dates tests' ); +is( $result_7->{overwritten}, 0, 'Got the expected 0 overwritten result from import patrons for dates tests' ); subtest 'test_import_without_cardnumber' => sub { plan tests => 2; #Remove possible existing user with a "" as cardnumber - my $blank_card = Koha::Patrons->find({ cardnumber => '' }); + my $blank_card = Koha::Patrons->find( { cardnumber => '' } ); $blank_card->delete if $blank_card; - my $branchcode = $builder->build({ source => "Branch"})->{branchcode}; - my $categorycode = $builder->build({ source => "Category"})->{categorycode}; + my $branchcode = $builder->build( { source => "Branch" } )->{branchcode}; + my $categorycode = $builder->build( { source => "Category" } )->{categorycode}; my $csv_headers = 'surname, branchcode, categorycode'; my $res_headers = 'surname, branchcode, categorycode'; my $csv_nocard_1 = "Squarepants,$branchcode,$categorycode"; my $csv_nocard_2 = "Star,$branchcode,$categorycode"; - my $filename_1 = make_csv($temp_dir, $csv_headers, $csv_nocard_1, $csv_nocard_2); - open(my $handle_1, "<", $filename_1) or die "cannot open < $filename_1: $!"; + my $filename_1 = make_csv( $temp_dir, $csv_headers, $csv_nocard_1, $csv_nocard_2 ); + open( my $handle_1, "<", $filename_1 ) or die "cannot open < $filename_1: $!"; my $params_1 = { file => $handle_1, }; - my $defaults = { cardnumber => "" }; #currently all the defaults come as "" if not filled + my $defaults = { cardnumber => "" }; #currently all the defaults come as "" if not filled - my $result = $patrons_import->import_patrons($params_1, $defaults); - like($result->{feedback}->[1]->{value}, qr/^Squarepants \/ \d+/, 'First borrower imported as expected'); - like($result->{feedback}->[2]->{value}, qr/^Star \/ \d+/, 'Second borrower imported as expected'); + my $result = $patrons_import->import_patrons( $params_1, $defaults ); + like( $result->{feedback}->[1]->{value}, qr/^Squarepants \/ \d+/, 'First borrower imported as expected' ); + like( $result->{feedback}->[2]->{value}, qr/^Star \/ \d+/, 'Second borrower imported as expected' ); }; @@ -461,25 +790,28 @@ subtest 'test_import_with_cardnumber_0' => sub { plan tests => 2; #Remove possible existing user with a "" as cardnumber - my $zero_card = Koha::Patrons->find({ cardnumber => 0 }); + my $zero_card = Koha::Patrons->find( { cardnumber => 0 } ); $zero_card->delete if $zero_card; - my $branchcode = $builder->build({ source => "Branch"})->{branchcode}; - my $categorycode = $builder->build({ source => "Category"})->{categorycode}; + my $branchcode = $builder->build( { source => "Branch" } )->{branchcode}; + my $categorycode = $builder->build( { source => "Category" } )->{categorycode}; my $csv_headers = 'cardnumber,surname, branchcode, categorycode'; my $res_headers = 'cardnumber,surname, branchcode, categorycode'; my $csv_nocard_1 = "0,Squarepants,$branchcode,$categorycode"; - my $filename_1 = make_csv($temp_dir, $csv_headers, $csv_nocard_1); - open(my $handle_1, "<", $filename_1) or die "cannot open < $filename_1: $!"; + my $filename_1 = make_csv( $temp_dir, $csv_headers, $csv_nocard_1 ); + open( my $handle_1, "<", $filename_1 ) or die "cannot open < $filename_1: $!"; my $params_1 = { file => $handle_1, }; - my $defaults = { cardnumber => "" }; #currently all the defaults come as "" if not filled + my $defaults = { cardnumber => "" }; #currently all the defaults come as "" if not filled - my $result = $patrons_import->import_patrons($params_1, $defaults); - like($result->{feedback}->[1]->{value}, qr/^Squarepants \/ \d+/, 'First borrower imported as expected'); - $zero_card = Koha::Patrons->find({ cardnumber => 0 }); - is($zero_card->surname.$zero_card->branchcode.$zero_card->categorycode,'Squarepants'.$branchcode.$categorycode,"Patron with cardnumber 0 is the imported patron"); + my $result = $patrons_import->import_patrons( $params_1, $defaults ); + like( $result->{feedback}->[1]->{value}, qr/^Squarepants \/ \d+/, 'First borrower imported as expected' ); + $zero_card = Koha::Patrons->find( { cardnumber => 0 } ); + is( + $zero_card->surname . $zero_card->branchcode . $zero_card->categorycode, + 'Squarepants' . $branchcode . $categorycode, "Patron with cardnumber 0 is the imported patron" + ); }; @@ -488,7 +820,7 @@ subtest 'Import patron with guarantor' => sub { t::lib::Mocks::mock_preference( 'borrowerRelationship', 'guarantor' ); my $category = $builder->build( { source => 'Category' } )->{categorycode}; - my $branch = $builder->build( { source => 'Branch' } )->{branchcode}; + my $branch = $builder->build( { source => 'Branch' } )->{branchcode}; my $guarantor = Koha::Patron->new( { surname => 'Guarantor', @@ -498,16 +830,16 @@ subtest 'Import patron with guarantor' => sub { )->store(); my $guarantor_id = $guarantor->id; - my $branchcode = $builder->build( { source => "Branch" } )->{branchcode}; + my $branchcode = $builder->build( { source => "Branch" } )->{branchcode}; my $categorycode = $builder->build( { source => "Category" } )->{categorycode}; - my $csv_headers = 'cardnumber,surname, branchcode, categorycode, guarantor_id, guarantor_relationship'; - my $csv = "kylemhall,Hall,$branchcode,$categorycode,$guarantor_id,guarantor"; + my $csv_headers = 'cardnumber,surname, branchcode, categorycode, guarantor_id, guarantor_relationship'; + my $csv = "kylemhall,Hall,$branchcode,$categorycode,$guarantor_id,guarantor"; my $filename_1 = make_csv( $temp_dir, $csv_headers, $csv ); open( my $handle_1, "<", $filename_1 ) or die "cannot open < $filename_1: $!"; my $params_1 = { file => $handle_1, }; - my $result = $patrons_import->import_patrons( $params_1 ); + my $result = $patrons_import->import_patrons($params_1); like( $result->{feedback}->[1]->{value}, qr/^Hall \/ \d+/, 'First borrower imported as expected' ); my $patron = Koha::Patrons->find( { cardnumber => 'kylemhall' } ); is( $patron->surname, "Hall", "Patron was created" ); @@ -521,69 +853,68 @@ subtest 'test_import_with_password_overwrite' => sub { plan tests => 8; #Remove possible existing user to avoid clashes - my $ernest = Koha::Patrons->find({ userid => 'ErnestP' }); + my $ernest = Koha::Patrons->find( { userid => 'ErnestP' } ); $ernest->delete if $ernest; #Setup our info - my $branchcode = $builder->build({ source => "Branch"})->{branchcode}; - my $categorycode = $builder->build({ source => "Category", value => { category_type => 'A' } })->{categorycode}; - my $staff_categorycode = $builder->build({ source => "Category", value => { category_type => 'S' } })->{categorycode}; - my $csv_headers = 'surname,userid,branchcode,categorycode,password'; - my $csv_password = "Worrell,ErnestP,$branchcode,$categorycode,Ernest11"; + my $branchcode = $builder->build( { source => "Branch" } )->{branchcode}; + my $categorycode = $builder->build( { source => "Category", value => { category_type => 'A' } } )->{categorycode}; + my $staff_categorycode = + $builder->build( { source => "Category", value => { category_type => 'S' } } )->{categorycode}; + my $csv_headers = 'surname,userid,branchcode,categorycode,password'; + my $csv_password = "Worrell,ErnestP,$branchcode,$categorycode,Ernest11"; my $csv_password_change = "Worrell,ErnestP,$branchcode,$categorycode,Vern1234"; - my $csv_blank_password = "Worel,ErnestP,$branchcode,$categorycode,"; - my $defaults = { cardnumber => "" }; #currently all the defaults come as "" if not filled + my $csv_blank_password = "Worel,ErnestP,$branchcode,$categorycode,"; + my $defaults = { cardnumber => "" }; #currently all the defaults come as "" if not filled my $csv_staff_password_change = "Worrell,ErnestP,$branchcode,$staff_categorycode,Vern1234"; #Make the test files for importing - my $filename_1 = make_csv($temp_dir, $csv_headers, $csv_password); - open(my $handle_1, "<", $filename_1) or die "cannot open < $filename_1: $!"; - my $params_1 = { file => $handle_1, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1}; - my $filename_2 = make_csv($temp_dir, $csv_headers, $csv_password_change); - open(my $handle_2, "<", $filename_2) or die "cannot open < $filename_2: $!"; - my $params_2 = { file => $handle_2, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1}; - - my $filename_3 = make_csv($temp_dir, $csv_headers, $csv_blank_password); - open(my $handle_3, "<", $filename_3) or die "cannot open < $filename_3: $!"; - my $params_3 = { file => $handle_3, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1}; + my $filename_1 = make_csv( $temp_dir, $csv_headers, $csv_password ); + open( my $handle_1, "<", $filename_1 ) or die "cannot open < $filename_1: $!"; + my $params_1 = { file => $handle_1, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1 }; + my $filename_2 = make_csv( $temp_dir, $csv_headers, $csv_password_change ); + open( my $handle_2, "<", $filename_2 ) or die "cannot open < $filename_2: $!"; + my $params_2 = { file => $handle_2, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1 }; - my $filename_4 = make_csv($temp_dir, $csv_headers, $csv_staff_password_change); - open(my $handle_4, "<", $filename_4) or die "cannot open < $filename_4: $!"; - my $params_4 = { file => $handle_4, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1}; + my $filename_3 = make_csv( $temp_dir, $csv_headers, $csv_blank_password ); + open( my $handle_3, "<", $filename_3 ) or die "cannot open < $filename_3: $!"; + my $params_3 = { file => $handle_3, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1 }; + my $filename_4 = make_csv( $temp_dir, $csv_headers, $csv_staff_password_change ); + open( my $handle_4, "<", $filename_4 ) or die "cannot open < $filename_4: $!"; + my $params_4 = { file => $handle_4, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1 }; - my $result = $patrons_import->import_patrons($params_1, $defaults); - like($result->{feedback}->[1]->{value}, qr/^Worrell \/ \d+/, 'First borrower imported as expected'); - $ernest = Koha::Patrons->find({ userid => 'ErnestP' }); - isnt($ernest->password,'Ernest',"New patron is imported, password is encrypted"); + my $result = $patrons_import->import_patrons( $params_1, $defaults ); + like( $result->{feedback}->[1]->{value}, qr/^Worrell \/ \d+/, 'First borrower imported as expected' ); + $ernest = Koha::Patrons->find( { userid => 'ErnestP' } ); + isnt( $ernest->password, 'Ernest', "New patron is imported, password is encrypted" ); #Save info to double check my $orig_pass = $ernest->password; - $result = $patrons_import->import_patrons($params_2, $defaults); - $ernest = Koha::Patrons->find({ userid => 'ErnestP' }); - isnt($ernest->password,$orig_pass,"New patron is overwritten, password is overwritten"); - isnt($ernest->password,'Vern',"Password is overwritten and is encrypted from value provided"); + $result = $patrons_import->import_patrons( $params_2, $defaults ); + $ernest = Koha::Patrons->find( { userid => 'ErnestP' } ); + isnt( $ernest->password, $orig_pass, "New patron is overwritten, password is overwritten" ); + isnt( $ernest->password, 'Vern', "Password is overwritten and is encrypted from value provided" ); #Save info to check not changed $orig_pass = $ernest->password; - $result = $patrons_import->import_patrons($params_3, $defaults); - $ernest = Koha::Patrons->find({ userid => 'ErnestP' }); - is($ernest->surname,'Worel',"Patron is overwritten, surname changed"); - is($ernest->password,$orig_pass,"Patron was overwritten but password is not overwritten if blank"); + $result = $patrons_import->import_patrons( $params_3, $defaults ); + $ernest = Koha::Patrons->find( { userid => 'ErnestP' } ); + is( $ernest->surname, 'Worel', "Patron is overwritten, surname changed" ); + is( $ernest->password, $orig_pass, "Patron was overwritten but password is not overwritten if blank" ); $ernest->category($staff_categorycode); $ernest->store; - $result = $patrons_import->import_patrons($params_4, $defaults); - $ernest = Koha::Patrons->find({ userid => 'ErnestP' }); - is($ernest->surname,'Worrell',"Patron is overwritten, surname changed"); - is($ernest->password,$orig_pass,"Patron is imported, password is not changed for staff"); + $result = $patrons_import->import_patrons( $params_4, $defaults ); + $ernest = Koha::Patrons->find( { userid => 'ErnestP' } ); + is( $ernest->surname, 'Worrell', "Patron is overwritten, surname changed" ); + is( $ernest->password, $orig_pass, "Patron is imported, password is not changed for staff" ); }; - subtest 'test_prepare_columns' => sub { plan tests => 16; @@ -592,15 +923,16 @@ subtest 'test_prepare_columns' => sub { my @errors_0; # When ... - my @csvcolumns_0 = $patrons_import->prepare_columns({headerrow => undef, keycol => \%csvkeycol_0, errors => \@errors_0, }); + my @csvcolumns_0 = + $patrons_import->prepare_columns( { headerrow => undef, keycol => \%csvkeycol_0, errors => \@errors_0, } ); # Then ... - is(scalar @csvcolumns_0, 0, 'Got the expected empty column array from prepare columns with no header row'); + is( scalar @csvcolumns_0, 0, 'Got the expected empty column array from prepare columns with no header row' ); - is(scalar @errors_0, 1, 'Got the expected 1 entry in error array from prepare columns with no header row'); - is($errors_0[0]->{badheader}, 1, 'Got the expected 1 badheader from prepare columns with no header row'); - is($errors_0[0]->{line}, 1, 'Got the expected 1 line from prepare columns with no header row'); - is($errors_0[0]->{lineraw}, undef, 'Got the expected undef lineraw from prepare columns with no header row'); + is( scalar @errors_0, 1, 'Got the expected 1 entry in error array from prepare columns with no header row' ); + is( $errors_0[0]->{badheader}, 1, 'Got the expected 1 badheader from prepare columns with no header row' ); + is( $errors_0[0]->{line}, 1, 'Got the expected 1 line from prepare columns with no header row' ); + is( $errors_0[0]->{lineraw}, undef, 'Got the expected undef lineraw from prepare columns with no header row' ); # Given ... a good header row with plenty of whitespaces my $headerrow_1 = 'a, b , c, , d'; @@ -608,21 +940,22 @@ subtest 'test_prepare_columns' => sub { my @errors_1; # When ... - my @csvcolumns_1 = $patrons_import->prepare_columns({headerrow => $headerrow_1, keycol => \%csvkeycol_1, errors => \@errors_1, }); + my @csvcolumns_1 = $patrons_import->prepare_columns( + { headerrow => $headerrow_1, keycol => \%csvkeycol_1, errors => \@errors_1, } ); # Then ... - is(scalar @csvcolumns_1, 5, 'Got the expected 5 column array from prepare columns'); - is($csvcolumns_1[0], 'a', 'Got the expected a header from prepare columns'); - is($csvcolumns_1[1], 'b', 'Got the expected b header from prepare columns'); - is($csvcolumns_1[2], 'c', 'Got the expected c header from prepare columns'); - is($csvcolumns_1[3], '', 'Got the expected empty header from prepare columns'); - is($csvcolumns_1[4], 'd', 'Got the expected d header from prepare columns'); - - is($csvkeycol_1{a}, 0, 'Got the expected 0 value for key a from prepare columns hash'); - is($csvkeycol_1{b}, 1, 'Got the expected 1 value for key b from prepare columns hash'); - is($csvkeycol_1{c}, 2, 'Got the expected 2 value for key c from prepare columns hash'); - is($csvkeycol_1{''}, 3, 'Got the expected 3 value for empty string key from prepare columns hash'); - is($csvkeycol_1{d}, 4, 'Got the expected 4 value for key d from prepare columns hash'); + is( scalar @csvcolumns_1, 5, 'Got the expected 5 column array from prepare columns' ); + is( $csvcolumns_1[0], 'a', 'Got the expected a header from prepare columns' ); + is( $csvcolumns_1[1], 'b', 'Got the expected b header from prepare columns' ); + is( $csvcolumns_1[2], 'c', 'Got the expected c header from prepare columns' ); + is( $csvcolumns_1[3], '', 'Got the expected empty header from prepare columns' ); + is( $csvcolumns_1[4], 'd', 'Got the expected d header from prepare columns' ); + + is( $csvkeycol_1{a}, 0, 'Got the expected 0 value for key a from prepare columns hash' ); + is( $csvkeycol_1{b}, 1, 'Got the expected 1 value for key b from prepare columns hash' ); + is( $csvkeycol_1{c}, 2, 'Got the expected 2 value for key c from prepare columns hash' ); + is( $csvkeycol_1{''}, 3, 'Got the expected 3 value for empty string key from prepare columns hash' ); + is( $csvkeycol_1{d}, 4, 'Got the expected 4 value for key d from prepare columns hash' ); }; subtest 'test_set_column_keys' => sub { @@ -631,21 +964,24 @@ subtest 'test_set_column_keys' => sub { # Given ... nothing at all # When ... Then ... my $attr_type_0 = $patrons_import->set_attribute_types(undef); - is($attr_type_0, undef, 'Got the expected undef attribute type from set attribute types with nothing'); + is( $attr_type_0, undef, 'Got the expected undef attribute type from set attribute types with nothing' ); # Given ... extended but not matchpoint my $params_1 = { extended => 1, matchpoint => undef, }; # When ... Then ... my $attr_type_1 = $patrons_import->set_attribute_types($params_1); - is($attr_type_1, undef, 'Got the expected undef attribute type from set attribute types with no matchpoint'); + is( $attr_type_1, undef, 'Got the expected undef attribute type from set attribute types with no matchpoint' ); # Given ... extended and unexpected matchpoint my $params_2 = { extended => 1, matchpoint => 'unexpected', }; # When ... Then ... my $attr_type_2 = $patrons_import->set_attribute_types($params_2); - is($attr_type_2, undef, 'Got the expected undef attribute type from set attribute types with unexpected matchpoint'); + is( + $attr_type_2, undef, + 'Got the expected undef attribute type from set attribute types with unexpected matchpoint' + ); # Given ... my $code_3 = 'SHOW_BCODE'; @@ -655,27 +991,35 @@ subtest 'test_set_column_keys' => sub { my $attr_type_3 = $patrons_import->set_attribute_types($params_3); # Then ... - isa_ok($attr_type_3, 'Koha::Patron::Attribute::Type'); - is($attr_type_3->code, $code_3, 'Got the expected code attribute type from set attribute types'); + isa_ok( $attr_type_3, 'Koha::Patron::Attribute::Type' ); + is( $attr_type_3->code, $code_3, 'Got the expected code attribute type from set attribute types' ); }; subtest 'test_set_column_keys' => sub { plan tests => 2; my @columns = Koha::Patrons->columns; + # Given ... nothing at all # When ... Then ... my @columnkeys_0 = $patrons_import->set_column_keys(undef); + # -1 because we do not want the borrowernumber column # +2 for guarantor id and guarantor relationship - is(scalar @columnkeys_0, @columns - 1 + 2, 'Got the expected array size from set column keys with undef extended'); + is( + scalar @columnkeys_0, @columns - 1 + 2, + 'Got the expected array size from set column keys with undef extended' + ); # Given ... extended. my $extended = 1; # When ... Then ... my @columnkeys_1 = $patrons_import->set_column_keys($extended); - is(scalar @columnkeys_1, @columns - 1 + 2 + $extended, 'Got the expected array size from set column keys with extended'); + is( + scalar @columnkeys_1, @columns - 1 + 2 + $extended, + 'Got the expected array size from set column keys with extended' + ); }; subtest 'test_generate_patron_attributes' => sub { @@ -683,15 +1027,15 @@ subtest 'test_generate_patron_attributes' => sub { # Given ... nothing at all # When ... Then ... - my $result_0 = $patrons_import->generate_patron_attributes(undef, undef, undef); - is($result_0, undef, 'Got the expected undef from set patron attributes with nothing'); + my $result_0 = $patrons_import->generate_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 = $patrons_import->generate_patron_attributes($extended_1, undef, undef); - is($result_1, undef, 'Got the expected undef from set patron attributes with not extended'); + my $result_1 = $patrons_import->generate_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; @@ -699,31 +1043,43 @@ subtest 'test_generate_patron_attributes' => sub { my @feedback_2; # When ... - my $result_2 = $patrons_import->generate_patron_attributes($extended_2, $patron_attributes_2, \@feedback_2); + my $result_2 = $patrons_import->generate_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'); + 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 = $patrons_import->generate_patron_attributes($extended_2, $patron_attributes_3, \@feedback_3); + my $result_3 = $patrons_import->generate_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]->{attribute}, '01', 'Got the expected first value from set patron attributes'); + 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]->{attribute}, '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]->{attribute}, 1150605, 'Got the expected second value from set patron attributes'); + is( $result_3->[1]->{code}, 'homeroom', 'Got the expected second code from set patron attributes' ); + is( $result_3->[1]->{attribute}, 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'); + 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 { @@ -735,44 +1091,74 @@ subtest 'test_check_branch_code' => sub { my @missing_criticals = (); # When ... - $patrons_import->check_branch_code(undef, $borrowerline, $line_number, \@missing_criticals); + $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( + 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'); + 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 $borrowerline_1 = 'some, line,' . $branchcode_1; my $line_number_1 = 79; my @missing_criticals_1 = (); # When ... - $patrons_import->check_branch_code($branchcode_1, $borrowerline_1, $line_number_1, \@missing_criticals_1); + $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( + 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'); + 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 $borrowerline_2 = 'some, line,' . $branchcode_2; my $line_number_2 = 80; my @missing_criticals_2 = (); # When ... - $patrons_import->check_branch_code($branchcode_2, $borrowerline_2, $line_number_2, \@missing_criticals_2); + $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'); + 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 { @@ -784,44 +1170,74 @@ subtest 'test_check_borrower_category' => sub { my @missing_criticals = (); # When ... - $patrons_import->check_borrower_category(undef, $borrowerline, $line_number, \@missing_criticals); + $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( + 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'); + 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 $borrowerline_1 = 'some, line, line, ' . $categorycode_1; my $line_number_1 = 791; my @missing_criticals_1 = (); # When ... - $patrons_import->check_borrower_category($categorycode_1, $borrowerline_1, $line_number_1, \@missing_criticals_1); + $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( + 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'); + 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 $borrowerline_2 = 'some, line,' . $categorycode_2; my $line_number_2 = 801; my @missing_criticals_2 = (); # When ... - $patrons_import->check_borrower_category($categorycode_2, $borrowerline_2, $line_number_2, \@missing_criticals_2); + $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'); + is( scalar @missing_criticals_2, 0, 'Got the expected missing critical array size of 0 from check_branch_code' ); }; subtest 'test_format_dates' => sub { @@ -832,75 +1248,135 @@ subtest 'test_format_dates' => sub { my $line_number = 987; my @missing_criticals = (); my %borrower; - my $params = {borrower => \%borrower, lineraw => $borrowerline, line => $line_number, missing_criticals => \@missing_criticals, }; + my $params = { + borrower => \%borrower, lineraw => $borrowerline, line => $line_number, + missing_criticals => \@missing_criticals, + }; # When ... $patrons_import->format_dates($params); # Then ... - ok( not(%borrower), 'Got the expected no borrower from format_dates with no dates'); - is(scalar @missing_criticals, 0, 'Got the expected missing critical array size of 0 from format_dates with no dates'); + ok( not(%borrower), 'Got the expected no borrower from format_dates with no dates' ); + is( + scalar @missing_criticals, 0, + 'Got the expected missing critical array size of 0 from format_dates with no dates' + ); # Given ... some good dates my @missing_criticals_1 = (); - my $dateofbirth_1 = '2016-05-03'; - my $dateenrolled_1 = '2016-05-04'; - my $dateexpiry_1 = '2016-05-06'; - my $borrower_1 = { dateofbirth => $dateofbirth_1, dateenrolled => $dateenrolled_1, dateexpiry => $dateexpiry_1, }; - my $params_1 = {borrower => $borrower_1, lineraw => $borrowerline, line => $line_number, missing_criticals => \@missing_criticals_1, }; + my $dateofbirth_1 = '2016-05-03'; + my $dateenrolled_1 = '2016-05-04'; + my $dateexpiry_1 = '2016-05-06'; + my $borrower_1 = { dateofbirth => $dateofbirth_1, dateenrolled => $dateenrolled_1, dateexpiry => $dateexpiry_1, }; + my $params_1 = { + borrower => $borrower_1, lineraw => $borrowerline, line => $line_number, + missing_criticals => \@missing_criticals_1, + }; # When ... $patrons_import->format_dates($params_1); # Then ... - is($borrower_1->{dateofbirth}, $dateofbirth_1, 'Got the expected date of birth from format_dates with good dates'); - is($borrower_1->{dateenrolled}, $dateenrolled_1, 'Got the expected date of birth from format_dates with good dates'); - is($borrower_1->{dateexpiry}, $dateexpiry_1, 'Got the expected date of birth from format_dates with good dates'); - is(scalar @missing_criticals_1, 0, 'Got the expected missing critical array size of 0 from check_branch_code with good dates'); + is( + $borrower_1->{dateofbirth}, $dateofbirth_1, + 'Got the expected date of birth from format_dates with good dates' + ); + is( + $borrower_1->{dateenrolled}, $dateenrolled_1, + 'Got the expected date of birth from format_dates with good dates' + ); + is( $borrower_1->{dateexpiry}, $dateexpiry_1, 'Got the expected date of birth from format_dates with good dates' ); + is( + scalar @missing_criticals_1, 0, + 'Got the expected missing critical array size of 0 from check_branch_code with good dates' + ); # Given ... some very bad dates my @missing_criticals_2 = (); - my $dateofbirth_2 = '03-2016-05'; - my $dateenrolled_2 = '04-2016-05'; - my $dateexpiry_2 = '06-2016-05'; - my $borrower_2 = { dateofbirth => $dateofbirth_2, dateenrolled => $dateenrolled_2, dateexpiry => $dateexpiry_2, }; - my $params_2 = {borrower => $borrower_2, lineraw => $borrowerline, line => $line_number, missing_criticals => \@missing_criticals_2, }; + my $dateofbirth_2 = '03-2016-05'; + my $dateenrolled_2 = '04-2016-05'; + my $dateexpiry_2 = '06-2016-05'; + my $borrower_2 = { dateofbirth => $dateofbirth_2, dateenrolled => $dateenrolled_2, dateexpiry => $dateexpiry_2, }; + my $params_2 = { + borrower => $borrower_2, lineraw => $borrowerline, line => $line_number, + missing_criticals => \@missing_criticals_2, + }; # When ... $patrons_import->format_dates($params_2); # Then ... - is($borrower_2->{dateofbirth}, '', 'Got the expected empty date of birth from format_dates with bad dates'); - is($borrower_2->{dateenrolled}, '', 'Got the expected emptydate of birth from format_dates with bad dates'); - is($borrower_2->{dateexpiry}, '', 'Got the expected empty date of birth from format_dates with bad dates'); - - is(scalar @missing_criticals_2, 3, 'Got the expected missing critical array size of 3 from check_branch_code with bad dates'); - is($missing_criticals_2[0]->{bad_date}, 1, 'Got the expected first bad date flag from check_branch_code with bad dates'); - is($missing_criticals_2[0]->{key}, 'dateofbirth', 'Got the expected dateofbirth key from check_branch_code with bad dates'); - is($missing_criticals_2[0]->{line}, $line_number, 'Got the expected first line from check_branch_code with bad dates'); - is($missing_criticals_2[0]->{lineraw}, $borrowerline, 'Got the expected first lineraw from check_branch_code with bad dates'); - - is($missing_criticals_2[1]->{bad_date}, 1, 'Got the expected second bad date flag from check_branch_code with bad dates'); - is($missing_criticals_2[1]->{key}, 'dateenrolled', 'Got the expected dateenrolled key from check_branch_code with bad dates'); - is($missing_criticals_2[1]->{line}, $line_number, 'Got the expected second line from check_branch_code with bad dates'); - is($missing_criticals_2[1]->{lineraw}, $borrowerline, 'Got the expected second lineraw from check_branch_code with bad dates'); - - is($missing_criticals_2[2]->{bad_date}, 1, 'Got the expected third bad date flag from check_branch_code with bad dates'); - is($missing_criticals_2[2]->{key}, 'dateexpiry', 'Got the expected dateexpiry key from check_branch_code with bad dates'); - is($missing_criticals_2[2]->{line}, $line_number, 'Got the expected third line from check_branch_code with bad dates'); - is($missing_criticals_2[2]->{lineraw}, $borrowerline, 'Got the expected third lineraw from check_branch_code with bad dates'); + is( $borrower_2->{dateofbirth}, '', 'Got the expected empty date of birth from format_dates with bad dates' ); + is( $borrower_2->{dateenrolled}, '', 'Got the expected emptydate of birth from format_dates with bad dates' ); + is( $borrower_2->{dateexpiry}, '', 'Got the expected empty date of birth from format_dates with bad dates' ); + + is( + scalar @missing_criticals_2, 3, + 'Got the expected missing critical array size of 3 from check_branch_code with bad dates' + ); + is( + $missing_criticals_2[0]->{bad_date}, 1, + 'Got the expected first bad date flag from check_branch_code with bad dates' + ); + is( + $missing_criticals_2[0]->{key}, 'dateofbirth', + 'Got the expected dateofbirth key from check_branch_code with bad dates' + ); + is( + $missing_criticals_2[0]->{line}, $line_number, + 'Got the expected first line from check_branch_code with bad dates' + ); + is( + $missing_criticals_2[0]->{lineraw}, $borrowerline, + 'Got the expected first lineraw from check_branch_code with bad dates' + ); + + is( + $missing_criticals_2[1]->{bad_date}, 1, + 'Got the expected second bad date flag from check_branch_code with bad dates' + ); + is( + $missing_criticals_2[1]->{key}, 'dateenrolled', + 'Got the expected dateenrolled key from check_branch_code with bad dates' + ); + is( + $missing_criticals_2[1]->{line}, $line_number, + 'Got the expected second line from check_branch_code with bad dates' + ); + is( + $missing_criticals_2[1]->{lineraw}, $borrowerline, + 'Got the expected second lineraw from check_branch_code with bad dates' + ); + + is( + $missing_criticals_2[2]->{bad_date}, 1, + 'Got the expected third bad date flag from check_branch_code with bad dates' + ); + is( + $missing_criticals_2[2]->{key}, 'dateexpiry', + 'Got the expected dateexpiry key from check_branch_code with bad dates' + ); + is( + $missing_criticals_2[2]->{line}, $line_number, + 'Got the expected third line from check_branch_code with bad dates' + ); + is( + $missing_criticals_2[2]->{lineraw}, $borrowerline, + 'Got the expected third lineraw from check_branch_code with bad dates' + ); }; subtest 'patron_attributes' => sub { plan tests => 17; - t::lib::Mocks::mock_preference('ExtendedPatronAttributes', 1); + t::lib::Mocks::mock_preference( 'ExtendedPatronAttributes', 1 ); my $unique_attribute_type = $builder->build_object( { class => 'Koha::Patron::Attribute::Types', - value => { unique_id=> 1, repeatable => 0 } + value => { unique_id => 1, repeatable => 0 } } ); my $repeatable_attribute_type = $builder->build_object( @@ -929,32 +1405,35 @@ subtest 'patron_attributes' => sub { sub build_csv { my ($attributes) = @_; - my $csv_headers = 'cardnumber,surname,firstname,branchcode,categorycode,patron_attributes'; - my @attributes_str = map { my $code = $_; map { sprintf "%s:%s", $code, $_ } @{ $attributes->{$code} } } keys %$attributes; + my $csv_headers = 'cardnumber,surname,firstname,branchcode,categorycode,patron_attributes'; + my @attributes_str = map { + my $code = $_; + map { sprintf "%s:%s", $code, $_ } @{ $attributes->{$code} } + } keys %$attributes; my $attributes_str = join ',', @attributes_str; - my $csv_line = sprintf '%s,John,D,MPL,PT,"%s"', $cardnumber, $attributes_str; - my $filename = make_csv( $temp_dir, $csv_headers, $csv_line ); + my $csv_line = sprintf '%s,John,D,MPL,PT,"%s"', $cardnumber, $attributes_str; + my $filename = make_csv( $temp_dir, $csv_headers, $csv_line ); open( my $fh, "<:encoding(utf8)", $filename ) or die "cannot open $filename: $!"; return $fh; } - { # Everything good, we create a patron with 3 attributes + { # Everything good, we create a patron with 3 attributes my $attributes = { - $unique_attribute_type->code => ['my unique attribute 1'], + $unique_attribute_type->code => ['my unique attribute 1'], $repeatable_attribute_type->code => [ 'my repeatable attribute 1', 'my repeatable attribute 2' ], - $normal_attribute_type->code => ['my normal attribute 1'], + $normal_attribute_type->code => ['my normal attribute 1'], }; - my $fh = build_csv({ %$attributes }); - my $result = $patrons_import->import_patrons({file => $fh}); + my $fh = build_csv( {%$attributes} ); + my $result = $patrons_import->import_patrons( { file => $fh } ); is( $result->{imported}, 1 ); - my $patron = Koha::Patrons->find({cardnumber => $cardnumber}); - compare_patron_attributes($patron->extended_attributes->unblessed, { %$attributes } ); + my $patron = Koha::Patrons->find( { cardnumber => $cardnumber } ); + compare_patron_attributes( $patron->extended_attributes->unblessed, {%$attributes} ); $patron->delete; } - { # UniqueIDConstraint + { # UniqueIDConstraint $builder->build_object( { class => 'Koha::Patron::Attributes', @@ -966,53 +1445,53 @@ subtest 'patron_attributes' => sub { $unique_attribute_type->code => ['unique'], $normal_attribute_type->code => ['my normal attribute 1'] }; - my $fh = build_csv({ %$attributes }); + my $fh = build_csv( {%$attributes} ); - my $result = $patrons_import->import_patrons({file => $fh, matchpoint => 'cardnumber'}); - my $error = $result->{errors}->[0]; + my $result = $patrons_import->import_patrons( { file => $fh, matchpoint => 'cardnumber' } ); + my $error = $result->{errors}->[0]; is( $error->{patron_attribute_unique_id_constraint}, 1 ); - is( $error->{patron_id}, $cardnumber ); - is( $error->{attribute}->code, $unique_attribute_type->code ); + is( $error->{patron_id}, $cardnumber ); + is( $error->{attribute}->code, $unique_attribute_type->code ); - my $patron = Koha::Patrons->find({cardnumber => $cardnumber}); + my $patron = Koha::Patrons->find( { cardnumber => $cardnumber } ); is( $patron, undef, 'Patron is not created' ); } - { #InvalidType + { #InvalidType my $attributes = { $non_existent_attribute_type_code => ['my non-existent attribute'], $normal_attribute_type->code => ['my attribute 1'], }; - my $fh = build_csv({ %$attributes }); + my $fh = build_csv( {%$attributes} ); - my $result = $patrons_import->import_patrons({file => $fh, matchpoint => 'cardnumber'}); + my $result = $patrons_import->import_patrons( { file => $fh, matchpoint => 'cardnumber' } ); is( $result->{imported}, 0 ); my $error = $result->{errors}->[0]; is( $error->{patron_attribute_invalid_type}, 1 ); - is( $error->{patron_id}, $cardnumber ); - is( $error->{attribute_type_code}, $non_existent_attribute_type_code ); + is( $error->{patron_id}, $cardnumber ); + is( $error->{attribute_type_code}, $non_existent_attribute_type_code ); - my $patron = Koha::Patrons->find({cardnumber => $cardnumber}); + my $patron = Koha::Patrons->find( { cardnumber => $cardnumber } ); is( $patron, undef ); } - { # NonRepeatable + { # NonRepeatable my $attributes = { - $repeatable_attribute_type->code => ['my repeatable attribute 1', 'my repeatable attribute 2'], - $normal_attribute_type->code => ['my normal attribute 1', 'my normal attribute 2'], - }; - my $fh = build_csv({ %$attributes }); - my $result = $patrons_import->import_patrons({file => $fh, matchpoint => 'cardnumber'}); + $repeatable_attribute_type->code => [ 'my repeatable attribute 1', 'my repeatable attribute 2' ], + $normal_attribute_type->code => [ 'my normal attribute 1', 'my normal attribute 2' ], + }; + my $fh = build_csv( {%$attributes} ); + my $result = $patrons_import->import_patrons( { file => $fh, matchpoint => 'cardnumber' } ); is( $result->{imported}, 0 ); my $error = $result->{errors}->[0]; is( $error->{patron_attribute_non_repeatable}, 1 ); - is( $error->{patron_id}, $cardnumber ); - is( $error->{attribute}->code, $normal_attribute_type->code ); + is( $error->{patron_id}, $cardnumber ); + is( $error->{attribute}->code, $normal_attribute_type->code ); - my $patron = Koha::Patrons->find({cardnumber => $cardnumber}); + my $patron = Koha::Patrons->find( { cardnumber => $cardnumber } ); is( $patron, undef ); } @@ -1027,11 +1506,11 @@ subtest 'patron_attributes' => sub { ); my $attributes = { - $unique_attribute_type->code => ['my unique attribute 1'], + $unique_attribute_type->code => ['my unique attribute 1'], $repeatable_attribute_type->code => [ 'my repeatable attribute 1', 'my repeatable attribute 2' ], - $normal_attribute_type->code => ['my normal attribute 1'], + $normal_attribute_type->code => ['my normal attribute 1'], }; - my $fh = build_csv({ %$attributes }); + my $fh = build_csv( {%$attributes} ); my $result = $patrons_import->import_patrons( { file => $fh, @@ -1043,13 +1522,13 @@ subtest 'patron_attributes' => sub { is( $result->{overwritten}, 1 ); - compare_patron_attributes($patron->extended_attributes->unblessed, { %$attributes } ); + compare_patron_attributes( $patron->extended_attributes->unblessed, {%$attributes} ); # Adding a new non-repeatable attribute my $new_attributes = { $normal_attribute_type->code => ['my normal attribute 2'], }; - $fh = build_csv({ %$new_attributes }); + $fh = build_csv( {%$new_attributes} ); $result = $patrons_import->import_patrons( { file => $fh, @@ -1062,10 +1541,10 @@ subtest 'patron_attributes' => sub { is( $result->{overwritten}, 1 ); # The normal_attribute_type has been replaced with 'my normal attribute 2' - compare_patron_attributes($patron->extended_attributes->unblessed, { %$attributes, %$new_attributes } ); + compare_patron_attributes( $patron->extended_attributes->unblessed, { %$attributes, %$new_attributes } ); # UniqueIDConstraint - $patron->extended_attributes->delete; # reset + $patron->extended_attributes->delete; # reset $builder->build_object( { class => 'Koha::Patron::Attributes', @@ -1073,11 +1552,11 @@ subtest 'patron_attributes' => sub { } ); $attributes = { - $unique_attribute_type->code => ['unique'], + $unique_attribute_type->code => ['unique'], $repeatable_attribute_type->code => [ 'my repeatable attribute 1', 'my repeatable attribute 2' ], - $normal_attribute_type->code => ['my normal attribute 1'], + $normal_attribute_type->code => ['my normal attribute 1'], }; - $fh = build_csv({ %$attributes }); + $fh = build_csv( {%$attributes} ); $result = $patrons_import->import_patrons( { file => $fh, @@ -1090,18 +1569,17 @@ subtest 'patron_attributes' => sub { is( $result->{overwritten}, 0 ); my $error = $result->{errors}->[0]; is( $error->{patron_attribute_unique_id_constraint}, 1 ); - is( $error->{borrowernumber}, $patron->borrowernumber ); - is( $error->{attribute}->code, $unique_attribute_type->code ); - - compare_patron_attributes($patron->extended_attributes->unblessed, {}, ); + is( $error->{borrowernumber}, $patron->borrowernumber ); + is( $error->{attribute}->code, $unique_attribute_type->code ); + compare_patron_attributes( $patron->extended_attributes->unblessed, {}, ); #InvalidType $attributes = { $non_existent_attribute_type_code => ['my non-existent attribute'], $normal_attribute_type->code => ['my attribute 1'], }; - $fh = build_csv({ %$attributes }); + $fh = build_csv( {%$attributes} ); $result = $patrons_import->import_patrons( { @@ -1115,15 +1593,15 @@ subtest 'patron_attributes' => sub { $error = $result->{errors}->[0]; is( $error->{patron_attribute_invalid_type}, 1 ); - is( $error->{borrowernumber}, $patron->borrowernumber ); - is( $error->{attribute_type_code}, $non_existent_attribute_type_code ); + is( $error->{borrowernumber}, $patron->borrowernumber ); + is( $error->{attribute_type_code}, $non_existent_attribute_type_code ); # NonRepeatable $attributes = { - $repeatable_attribute_type->code => ['my repeatable attribute 1', 'my repeatable attribute 2'], - $normal_attribute_type->code => ['my normal attribute 1', 'my normal attribute 2'], - }; - $fh = build_csv({ %$attributes }); + $repeatable_attribute_type->code => [ 'my repeatable attribute 1', 'my repeatable attribute 2' ], + $normal_attribute_type->code => [ 'my normal attribute 1', 'my normal attribute 2' ], + }; + $fh = build_csv( {%$attributes} ); $result = $patrons_import->import_patrons( { file => $fh, @@ -1136,15 +1614,15 @@ subtest 'patron_attributes' => sub { $error = $result->{errors}->[0]; is( $error->{patron_attribute_non_repeatable}, 1 ); - is( $error->{borrowernumber}, $patron->borrowernumber ); - is( $error->{attribute}->code, $normal_attribute_type->code ); + is( $error->{borrowernumber}, $patron->borrowernumber ); + is( $error->{attribute}->code, $normal_attribute_type->code ); # Don't preserve existing attributes $attributes = { - $repeatable_attribute_type->code => ['my repeatable attribute 3', 'my repeatable attribute 4'], - $normal_attribute_type->code => ['my normal attribute 1'], - }; - $fh = build_csv({ %$attributes }); + $repeatable_attribute_type->code => [ 'my repeatable attribute 3', 'my repeatable attribute 4' ], + $normal_attribute_type->code => ['my normal attribute 1'], + }; + $fh = build_csv( {%$attributes} ); $result = $patrons_import->import_patrons( { file => $fh, @@ -1155,7 +1633,7 @@ subtest 'patron_attributes' => sub { ); is( $result->{overwritten}, 1 ); - compare_patron_attributes($patron->extended_attributes->unblessed, { %$attributes } ); + compare_patron_attributes( $patron->extended_attributes->unblessed, {%$attributes} ); }; @@ -1166,25 +1644,29 @@ subtest 'welcome_email' => sub { plan tests => 3; #Setup our info - my $branchcode = $builder->build({ source => "Branch"})->{branchcode}; - my $categorycode = $builder->build({ source => "Category", value => { category_type => 'A' } })->{categorycode}; - my $staff_categorycode = $builder->build({ source => "Category", value => { category_type => 'S' } })->{categorycode}; - my $csv_headers = 'surname,userid,branchcode,categorycode,password,email'; - my $csv_new = "Spagobi,EldridgeS,$branchcode,$categorycode,H4ckR".',me@myemail.com'; - my $defaults = { cardnumber => "" }; #currently all the defaults come as "" if not filled + my $branchcode = $builder->build( { source => "Branch" } )->{branchcode}; + my $categorycode = $builder->build( { source => "Category", value => { category_type => 'A' } } )->{categorycode}; + my $staff_categorycode = + $builder->build( { source => "Category", value => { category_type => 'S' } } )->{categorycode}; + my $csv_headers = 'surname,userid,branchcode,categorycode,password,email'; + my $csv_new = "Spagobi,EldridgeS,$branchcode,$categorycode,H4ckR" . ',me@myemail.com'; + my $defaults = { cardnumber => "" }; #currently all the defaults come as "" if not filled #Make the test files for importing - my $filename_1 = make_csv($temp_dir, $csv_headers, $csv_new); - open(my $handle_1, "<", $filename_1) or die "cannot open < $filename_1: $!"; + my $filename_1 = make_csv( $temp_dir, $csv_headers, $csv_new ); + open( my $handle_1, "<", $filename_1 ) or die "cannot open < $filename_1: $!"; - my $params_1 = { file => $handle_1, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1, send_welcome => 1}; + my $params_1 = { + file => $handle_1, matchpoint => 'userid', overwrite_passwords => 1, overwrite_cardnumber => 1, + send_welcome => 1 + }; - my $result = $patrons_import->import_patrons($params_1, $defaults); - is($result->{already_in_db}, 0, 'New borrower imported as expected'); - is($result->{feedback}->[3]->{name}, 'welcome_sent', 'Email send reported'); - my $eldridge = Koha::Patrons->find({ userid => 'EldridgeS'}); - my $notices = Koha::Notice::Messages->search({ borrowernumber => $eldridge->borrowernumber }); - is($notices->count, 1, 'Notice was queued'); + my $result = $patrons_import->import_patrons( $params_1, $defaults ); + is( $result->{already_in_db}, 0, 'New borrower imported as expected' ); + is( $result->{feedback}->[3]->{name}, 'welcome_sent', 'Email send reported' ); + my $eldridge = Koha::Patrons->find( { userid => 'EldridgeS' } ); + my $notices = Koha::Notice::Messages->search( { borrowernumber => $eldridge->borrowernumber } ); + is( $notices->count, 1, 'Notice was queued' ); }; subtest 'test update_dateexpiry when no dateexpiry in file' => sub { @@ -1246,6 +1728,7 @@ subtest 'test update_dateexpiry when no dateexpiry in file' => sub { }; subtest 'prevent regression in update of dateexpiry with no date related flags' => sub { + # If the --update-expiration or --expiration-from-today flgas are not passed, the behaviour should be as foolows: # 1) dateexpiry column is blank - preserve existing patron expiry date # 2) dateexpiry column has a date value - update expiry date to match this new date @@ -1253,10 +1736,10 @@ subtest 'prevent regression in update of dateexpiry with no date related flags' my $csv_headers = 'cardnumber,surname,branchcode,categorycode,dateenrolled,dateexpiry'; my $patron = $builder->build_object( { class => 'Koha::Patrons' } ); - $patron->dateexpiry( '2099-12-31' ); + $patron->dateexpiry('2099-12-31'); $patron->dateenrolled( dt_from_string->add( months => '-24', end_of_month => 'limit' ) )->store; my $csv_values = join( - ',', $patron->cardnumber, $patron->surname, $patron->branchcode, $patron->categorycode, + ',', $patron->cardnumber, $patron->surname, $patron->branchcode, $patron->categorycode, $patron->dateenrolled, '' ); @@ -1272,7 +1755,7 @@ subtest 'prevent regression in update of dateexpiry with no date related flags' ); $csv_values = join( - ',', $patron->cardnumber, $patron->surname, $patron->branchcode, $patron->categorycode, + ',', $patron->cardnumber, $patron->surname, $patron->branchcode, $patron->categorycode, $patron->dateenrolled, '2098-01-01' ); @@ -1288,35 +1771,30 @@ subtest 'prevent regression in update of dateexpiry with no date related flags' ); }; - # got is { code => $code, attribute => $attribute } # expected is { $code => \@attributes } sub compare_patron_attributes { my ( $got, $expected ) = @_; - $got = [ map { { code => $_->{code}, attribute => $_->{attribute} } } @$got ]; + $got = [ map { { code => $_->{code}, attribute => $_->{attribute} } } @$got ]; $expected = [ map { my $code = $_; map { { code => $code, attribute => $_ } } @{ $expected->{$code} } - } keys %$expected + } keys %$expected ]; for my $v ( $got, $expected ) { - $v = [ - sort { - $a->{code} cmp $b->{code} || $a->{attribute} cmp $b->{attribute} - } @$v - ]; + $v = [ sort { $a->{code} cmp $b->{code} || $a->{attribute} cmp $b->{attribute} } @$v ]; } - is_deeply($got, $expected); + is_deeply( $got, $expected ); } # ###### Test utility ########### sub make_csv { - my ($temp_dir, @lines) = @_; + my ( $temp_dir, @lines ) = @_; - my ($fh, $filename) = tempfile( DIR => $temp_dir) or die $!; - print $fh $_."\r\n" foreach @lines; + my ( $fh, $filename ) = tempfile( DIR => $temp_dir ) or die $!; + print $fh $_ . "\r\n" foreach @lines; close $fh or die $!; return $filename; -- 2.39.5