next LINE;
}
- my $relationship = $borrower{relationship};
- my $guarantor_id = $borrower{guarantor_id};
- delete $borrower{relationship};
+ my $guarantor_relationship = $borrower{guarantor_relationship};
+ delete $borrower{guarantor_relationship};
+ my $guarantor_id = $borrower{guarantor_id};
delete $borrower{guarantor_id};
# Remove warning for int datatype that cannot be null
}
if ($extended) {
if ($ext_preserve) {
- $patron_attributes = $patron->extended_attributes->merge_with( $patron_attributes );
+ $patron_attributes = $patron->extended_attributes->merge_and_replace_with( $patron_attributes );
}
eval {
# We do not want to filter by branch, maybe we should?
);
}
else {
- my $patron = eval {
- Koha::Patron->new(\%borrower)->store;
- };
- unless ( $@ ) {
+ try {
+ $schema->storage->txn_do(sub {
+ my $patron = Koha::Patron->new(\%borrower)->store;
+ $borrowernumber = $patron->id;
- if ( $patron->is_debarred ) {
- AddDebarment(
- {
- borrowernumber => $patron->borrowernumber,
- expiration => $patron->debarred,
- comment => $patron->debarredcomment,
- }
- );
- }
+ if ( $patron->is_debarred ) {
+ AddDebarment(
+ {
+ borrowernumber => $patron->borrowernumber,
+ expiration => $patron->debarred,
+ comment => $patron->debarredcomment,
+ }
+ );
+ }
- if ($extended) {
- # FIXME Hum, we did not filter earlier and now we do?
- $patron->extended_attributes->filter_by_branch_limitations->delete;
- $patron->extended_attributes($patron_attributes);
- }
+ if ($extended) {
+ # FIXME Hum, we did not filter earlier and now we do?
+ $patron->extended_attributes->filter_by_branch_limitations->delete;
+ $patron->extended_attributes($patron_attributes);
+ }
- if ($set_messaging_prefs) {
- C4::Members::Messaging::SetMessagingPreferencesFromDefaults(
+ if ($set_messaging_prefs) {
+ C4::Members::Messaging::SetMessagingPreferencesFromDefaults(
+ {
+ borrowernumber => $patron->borrowernumber,
+ categorycode => $patron->categorycode,
+ }
+ );
+ }
+
+ $imported++;
+ push @imported_borrowers, $patron->borrowernumber; #for patronlist
+ push(
+ @feedback,
{
- borrowernumber => $patron->borrowernumber,
- categorycode => $patron->categorycode,
+ feedback => 1,
+ name => 'lastimported',
+ value => $patron->surname . ' / ' . $patron->borrowernumber,
}
);
- }
-
- $imported++;
- push @imported_borrowers, $patron->borrowernumber; #for patronlist
- push(
- @feedback,
- {
- feedback => 1,
- name => 'lastimported',
- value => $patron->surname . ' / ' . $patron->borrowernumber,
- }
- );
- }
- else {
+ });
+ } catch {
$invalid++;
- push @errors, { unknown_error => 1 };
+ 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 };
+ } else {
+ push @errors, { unknown_error => 1 };
+ }
push(
@errors,
{
value => $borrower{'surname'} . ' / Create patron',
}
);
- }
+ };
}
# Add a guarantor if we are given a relationship
if ( $guarantor_id ) {
- Koha::Patron::Relationship->new(
+ my $relationship = Koha::Patron::Relationships->find(
{
guarantee_id => $borrowernumber,
- relationship => $relationship,
guarantor_id => $guarantor_id,
}
- )->store();
+ );
+
+ if ( $relationship ) {
+ $relationship->relationship( $guarantor_relationship );
+ $relationship->store();
+ }
+ else {
+ Koha::Patron::Relationship->new(
+ {
+ guarantee_id => $borrowernumber,
+ relationship => $guarantor_relationship,
+ guarantor_id => $guarantor_id,
+ }
+ )->store();
+ }
}
}
my @columnkeys = map { $_ ne 'borrowernumber' ? $_ : () } Koha::Patrons->columns();
push( @columnkeys, 'patron_attributes' ) if $extended;
+ push( @columnkeys, qw( guarantor_relationship guarantor_id ) );
return @columnkeys;
}
my $ok = $csv->parse($string); # parse field again to get subfields!
my @list = $csv->fields();
my @patron_attributes =
- sort { $a->{code} cmp $b->{code} || $a->{value} cmp $b->{value} }
+ sort { $a->{code} cmp $b->{code} || $a->{attribute} cmp $b->{attribute} }
map {
my @arr = split /:/, $_, 2;
{ code => $arr[0], attribute => $arr[1] }