Attachment 120610 Details for Bug 28220 – Bug 28220: Handle InvalidType

[patch] Bug 28220: Handle InvalidType

Bug-28220-Handle-InvalidType.patch (text/plain), 3.04 KB, created by Jonathan Druart on 2021-05-06 10:49:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2021-05-06 10:49:08 UTC

Size: 3.04 KB

patch

obsolete

>From bb214cde30e5d5913a70820f29614dd9f3d8d3e6 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 6 May 2021 10:46:24 +0200
>Subject: [PATCH] Bug 28220: Handle InvalidType
>
>---
> Koha/Patrons/Import.pm               |  4 +++-
> t/db_dependent/Koha/Patrons/Import.t | 21 +++++++++++++++++++--
> 2 files changed, 22 insertions(+), 3 deletions(-)
>
>diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm
>index 13597c34236..e3880eda441 100644
>--- a/Koha/Patrons/Import.pm
>+++ b/Koha/Patrons/Import.pm
>@@ -397,9 +397,11 @@ sub import_patrons {
>                 });
>             } catch {
>                 $invalid++;
>+                my $patron_id = defined $matchpoint ? $borrower{$matchpoint} : $matchpoint_attr_type;
>                 if ( $_->isa('Koha::Exceptions::Patron::Attribute::UniqueIDConstraint') ) {
>-                    my $patron_id = defined $matchpoint ? $borrower{$matchpoint} : $matchpoint_attr_type;
>                     push @errors, { patron_attribute_unique_id_constraint => 1, patron_id => $patron_id, attribute => $_->attribute };
>+                } elsif ( $_->isa('Koha::Exceptions::Patron::Attribute::InvalidType') ) {
>+                    push @errors, { patron_attribute_invalid_type => 1, patron_id => $patron_id, attribute_type_code => $_->type };
>                 } else {
>                     push @errors, { unknown_error => 1 };
>                 }
>diff --git a/t/db_dependent/Koha/Patrons/Import.t b/t/db_dependent/Koha/Patrons/Import.t
>index b343b60f86c..edc9544944e 100755
>--- a/t/db_dependent/Koha/Patrons/Import.t
>+++ b/t/db_dependent/Koha/Patrons/Import.t
>@@ -845,7 +845,7 @@ subtest 'test_format_dates' => sub {
> 
> subtest 'patron_attributes' => sub {
> 
>-    plan tests => 6;
>+    plan tests => 10;
> 
>     t::lib::Mocks::mock_preference('ExtendedPatronAttributes', 1);
> 
>@@ -906,7 +906,7 @@ subtest 'patron_attributes' => sub {
>         $patron->delete;
>     }
> 
>-    {
>+    { # UniqueIDConstraint
>         $builder->build_object(
>             {
>                 class => 'Koha::Patron::Attributes',
>@@ -926,6 +926,23 @@ subtest 'patron_attributes' => sub {
>         is( $error->{patron_id}, $cardnumber );
>         is( $error->{attribute}->code, $unique_attribute_type->code );
> 
>+        my $patron = Koha::Patrons->find({cardnumber => $cardnumber});
>+        is( $patron, undef, 'Patron is not created' );
>+    }
>+
>+    { #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 $result = $patrons_import->import_patrons({file => $fh, matchpoint => 'cardnumber'});
>+        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 );
>+
>         my $patron = Koha::Patrons->find({cardnumber => $cardnumber});
>         is( $patron, undef );
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 28220: 120549 | 120607 | 120608 | 120609 | 120610 | 120611 | 120612 | 120613 | 120614 | 120783 | 120784 | 120785 | 120786 | 120787 | 120788 | 120789 | 120790 | 120885 | 120886 | 120887 | 120888 | 120889 | 120890 | 120891 | 120892