Attachment #146538 for bug #17499

View | Details | Raw Unified | Return to bug 17499
Collapse All | Expand All




package Koha::Exceptions::Patron::MessagePreference;

# This file is part of Koha.
#


use Exception::Class (

    'Koha::Exceptions::Patron::MessagePreference' => {
        description => 'Something went wrong'
    },
    'Koha::Exceptions::Patron::MessagePreference::AttributeNotFound' => {
        isa => 'Koha::Exceptions::Patron::MessagePreference',
        description => "Message attribute not found",
        fields => ['message_attribute_id']
    },
    'Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceOutOfRange' => {
        isa => 'Koha::Exceptions::Patron::MessagePreference',
        description => "Days in advance is out of range",
        fields => ['min','max', 'message_name']
    },
    'Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceNotAvailable' => {
        isa => 'Koha::Exceptions::Patron::MessagePreference',
        description => "Days in advance cannot be selected for this preference",
        fields => ['message_name']
    },
    'Koha::Exceptions::Patron::MessagePreference::DigestNotAvailable' => {
        isa => 'Koha::Exceptions::Patron::MessagePreference',
        description => "Digest is not available for this message type",
        fields => ['message_name']
    },
    'Koha::Exceptions::Patron::MessagePreference::DigestRequired' => {
        isa => 'Koha::Exceptions::Patron::MessagePreference',
        description => "Digest must be selected for this message type",
        fields => ['message_name']
    },
    'Koha::Exceptions::Patron::MessagePreference::EmailAddressRequired' => {
        isa => 'Koha::Exceptions::Patron::MessagePreference',
        description => "Patron has no email address, cannot use email transport type.",
        fields => ['message_name', 'borrowernumber' ]
    },
    'Koha::Exceptions::Patron::MessagePreference::NoTransportType' => {
        isa => 'Koha::Exceptions::Patron::MessagePreference',
        description => "Transport type not available for this message.",
        fields => ['message_name', 'transport_type']
    },
    'Koha::Exceptions::Patron::MessagePreference::PhoneNumberRequired' => {
        isa => 'Koha::Exceptions::Patron::MessagePreference',
        description => "Patron has no phone number, cannot use phone transport type.",
        fields => ['message_name', 'borrowernumber' ]
    },
    'Koha::Exceptions::Patron::MessagePreference::SMSNumberRequired' => {
        isa => 'Koha::Exceptions::Patron::MessagePreference',
        description => "Patron has no SMS number, cannot use sms transport type.",
        fields => ['message_name', 'borrowernumber' ]
    },
    'Koha::Exceptions::Patron::MessagePreference::TalkingTechItivaPhoneNotificationRequired' => {
        isa => 'Koha::Exceptions::Patron::MessagePreference',
        description => "System preference TalkingTechItivaPhoneNotification is disabled, cannot use itiva transport type.",
        fields => ['message_name', 'borrowernumber' ]
    },

Lines 1-4 Link Here

(-)a/Koha/Exceptions/Patron/Message/Transport.pm (-4 / +4 lines)
1	package Koha::Exceptions::Patron::Message::Transport;	1	package Koha::Exceptions::Patron::MessagePreference::Transport;
2		2
3	# This file is part of Koha.	3	# This file is part of Koha.
4	#	4	#
Lines 19-29 use Modern::Perl; Link Here
19		19
20	use Exception::Class (	20	use Exception::Class (
21		21
22	'Koha::Exceptions::Patron::Message::Transport' => {	22	'Koha::Exceptions::Patron::MessagePreference::Transport' => {
23	description => 'Something went wrong'	23	description => 'Something went wrong'
24	},	24	},
25	'Koha::Exceptions::Patron::Message::Transport::TypeNotFound' => {	25	'Koha::Exceptions::Patron::MessagePreference::Transport::TypeNotFound' => {
26	isa => 'Koha::Exceptions::Patron::Message::Transport',	26	isa => 'Koha::Exceptions::Patron::MessagePreference::Transport',
27	description => "Transport type does not exist.",	27	description => "Transport type does not exist.",
28	fields => ['transport_type']	28	fields => ['transport_type']
29	},	29	},




use Koha::Patron::Images;
use Koha::Patron::Messages;
use Koha::Patron::Modifications;
use Koha::Patron::MessagePreferences;
use Koha::Patron::Relationships;
use Koha::Patron::Restrictions;
use Koha::Patrons;


Sets default messaging preferences on patron.

See Koha::Patron::MessagePreference(s) for more documentation, especially on
thrown exceptions.

=cut

sub set_default_messaging_preferences {
    my ($self, $categorycode) = @_;

    my $options = Koha::Patron::MessagePreferences->get_options;

    foreach my $option (@$options) {
        # Check that this option has preference configuration for this category
        unless (Koha::Patron::MessagePreferences->search({
            message_attribute_id => $option->{message_attribute_id},
            categorycode         => $categorycode || $self->categorycode,
        })->count) {

        }

        # Delete current setting
        Koha::Patron::MessagePreferences->search({
             borrowernumber => $self->borrowernumber,
             message_attribute_id => $option->{message_attribute_id},
        })->delete;

        Koha::Patron::MessagePreference->new_from_default({
            borrowernumber => $self->borrowernumber,
            categorycode   => $categorycode || $self->categorycode,
            message_attribute_id => $option->{message_attribute_id},




package Koha::Patron::MessagePreference;

# Copyright Koha-Suomi Oy 2016
#


use Koha::Database;
use Koha::Exceptions;
use Koha::Exceptions::Patron::MessagePreference;
use Koha::Exceptions::Patron::MessagePreference::Transport;
use Koha::Exceptions::Patron::Category;
use Koha::Patron::Categories;
use Koha::Patron::MessagePreference::Attributes;
use Koha::Patron::MessagePreferences;
use Koha::Patron::MessagePreference::Transport::Preferences;
use Koha::Patron::MessagePreference::Transport::Types;
use Koha::Patron::MessagePreference::Transports;
use Koha::Patrons;

use base qw(Koha::Object);

=head1 NAME

Koha::Patron::MessagePreference - Koha Patron Message Preference object class

=head1 API



=head3 new

my $preference = Koha::Patron::MessagePreference->new({
   borrowernumber => 123,
   #categorycode => 'ABC',
   message_attribute_id => 4,


=head3 new_from_default

my $preference = Koha::Patron::MessagePreference->new_from_default({
    borrowernumber => 123,
    categorycode   => 'ABC',   # if not given, patron's categorycode will be used
    message_attribute_id => 1,

        $params->{'categorycode'} = $patron->categorycode;
    }

    my $default = Koha::Patron::MessagePreferences->find({
        categorycode => $params->{'categorycode'},
        message_attribute_id => $params->{'message_attribute_id'},
    });


    # Set default messaging transport types
    my $default_transport_types =
    Koha::Patron::MessagePreference::Transport::Preferences->search({
        borrower_message_preference_id =>
                    $default->{'borrower_message_preference_id'}
    });
    while (my $transport = $default_transport_types->next) {
        Koha::Patron::MessagePreference::Transport::Preference->new({
            borrower_message_preference_id => $self->borrower_message_preference_id,
            message_transport_type => $transport->message_transport_type,
        })->store;

    if ($self->{'_message_name'}) {
        return $self->{'_message_name'};
    }
    $self->{'_message_name'} = Koha::Patron::MessagePreference::Attributes->find({
        message_attribute_id => $self->message_attribute_id,
    })->message_name;
    return $self->{'_message_name'};

            return $self->{'_message_transport_types'};
        }
        map {
            my $transport = Koha::Patron::MessagePreference::Transports->find({
                message_attribute_id => $self->message_attribute_id,
                message_transport_type => $_->message_transport_type,
                is_digest => $self->wants_digest

            $self->{'_message_transport_types'}->{$_->message_transport_type}
                = $transport ? $transport->letter_code : ' ';
        }
        Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $self->borrower_message_preference_id,
        })->as_list;
        return $self->{'_message_transport_types'} || {};


    # store message transport types
    if (exists $self->{'_message_transport_types'}) {
        Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id =>
                $self->borrower_message_preference_id,
        })->delete;
        foreach my $type (keys %{$self->{'_message_transport_types'}}) {
            Koha::Patron::MessagePreference::Transport::Preference->new({
                borrower_message_preference_id =>
                    $self->borrower_message_preference_id,
                message_transport_type => $type,


Makes a basic validation for object.

Returns Koha::Patron::MessagePreference object, or throws and exception.

=cut


    }

    if (!$self->in_storage) {
        my $previous = Koha::Patron::MessagePreferences->search({
            borrowernumber => $self->borrowernumber,
            categorycode   => $self->categorycode,
            message_attribute_id => $self->message_attribute_id,

        }
    }

    my $attr = Koha::Patron::MessagePreference::Attributes->find(
        $self->message_attribute_id
    );
    unless ($attr) {
        Koha::Exceptions::Patron::MessagePreference::AttributeNotFound->throw(
            error => 'Message attribute with id '.$self->message_attribute_id
            .' not found',
            message_attribute_id => $self->message_attribute_id,

    }
    if (defined $self->days_in_advance) {
        if ($attr && $attr->takes_days == 0) {
            Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceNotAvailable->throw(
                error => 'days_in_advance cannot be defined for '.
                $attr->message_name . '.',
                message_name => $attr->message_name,
            );
        }
        elsif ($self->days_in_advance < 0 || $self->days_in_advance > 30) {
            Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceOutOfRange->throw(
                error => 'days_in_advance has to be a value between 0-30 for '.
                $attr->message_name . '.',
                message_name => $attr->message_name,

        }
    }
    if (defined $self->wants_digest) {
        my $transports = Koha::Patron::MessagePreference::Transports->search({
            message_attribute_id => $self->message_attribute_id,
            is_digest            => $self->wants_digest ? 1 : 0,
        });
        unless ($transports->count) {
            if (!$self->wants_digest) {
                Koha::Exceptions::Patron::MessagePreference::DigestRequired->throw(
                    error => 'Digest must be selected for '.$attr->message_name.'.',
                    message_name => $attr->message_name
                );
            } else {
                Koha::Exceptions::Patron::MessagePreference::DigestNotAvailable->throw(
                    error => 'Digest cannot be selected for '.$attr->message_name.'.',
                    message_name => $attr->message_name
                );

    $self->_validate_message_transport_types({ message_transport_types => $types });
    foreach my $type (@$types) {
        unless (exists $self->{'_message_transport_types'}->{$type}) {
            my $transport = Koha::Patron::MessagePreference::Transports->search({
                message_attribute_id => $self->message_attribute_id,
                message_transport_type => $type
            })->next;
            unless ($transport) {
                Koha::Exceptions::Patron::MessagePreference::NoTransportType->throw(
                    error => 'No transport configured for '.$self->message_name.
                        " transport type $type.",
                    message_name => $self->message_name,

            }
            if (defined $self->borrowernumber) {
                if ( ! $self->mtt_deliverable($type) ) {
                    Koha::Exceptions::Patron::MessagePreference::EmailAddressRequired->throw(
                        error => 'Patron has not set email address, '.
                                  'cannot use email as message transport',
                        message_name => $self->message_name,
                        borrowernumber => $self->borrowernumber,
                    ) if $type eq 'email';
                    Koha::Exceptions::Patron::MessagePreference::TalkingTechItivaPhoneNotificationRequired->throw(
                        error => 'System preference TalkingTechItivaPhoneNotification disabled'.
                                 'cannot use itiva as message transport',
                        message_name => $self->message_name,
                        borrowernumber => $self->borrowernumber,
                    ) if $type eq 'itiva';
                    Koha::Exceptions::Patron::MessagePreference::PhoneNumberRequired->throw(
                        error => 'Patron has not set phone number'.
                                 'cannot use phone as message transport',
                        message_name => $self->message_name,
                        borrowernumber => $self->borrowernumber,
                    ) if $type eq 'phone';
                    Koha::Exceptions::Patron::MessagePreference::SMSNumberRequired->throw(
                        error => 'Patron has not set SMS number'.
                                 'cannot use sms as message transport',
                        message_name => $self->message_name,

        my $types = $params->{'message_transport_types'};

        foreach my $type (@{$types}) {
            unless (Koha::Patron::MessagePreference::Transport::Types->find({
                message_transport_type => $type
            })) {
                Koha::Exceptions::Patron::MessagePreference::Transport::TypeNotFound->throw(
                    error => "Message transport type '$type' does not exist",
                    transport_type => $type,
                );

Lines 1-4 Link Here

(-)a/Koha/Patron/Message/Attribute.pm (-2 / +2 lines)
1	package Koha::Patron::Message::Attribute;	1	package Koha::Patron::MessagePreference::Attribute;
2		2
3	# Copyright Koha-Suomi Oy 2016	3	# Copyright Koha-Suomi Oy 2016
4	#	4	#
Lines 25-31 use base qw(Koha::Object); Link Here
25		25
26	=head1 NAME	26	=head1 NAME
27		27
28	Koha::Patron::Message::Attribute - Koha Patron Message Attribute object class	28	Koha::Patron::MessagePreference::Attribute - Koha Patron Message Attribute object class
29		29
30	=head1 API	30	=head1 API
31		31




package Koha::Patron::MessagePreference::Attributes;

# Copyright Koha-Suomi Oy 2016
#

use Modern::Perl;

use Koha::Database;
use Koha::Patron::MessagePreference::Attribute;

use base qw(Koha::Objects);

=head1 NAME

Koha::Patron::MessagePreference::Attributes - Koha Patron Message Attributes object class

=head1 API


=cut

sub object_class {
    return 'Koha::Patron::MessagePreference::Attribute';
}

=head1 AUTHOR

Lines 1-4 Link Here

(-)a/Koha/Patron/Message/Transport.pm (-2 / +2 lines)
1	package Koha::Patron::Message::Transport;	1	package Koha::Patron::MessagePreference::Transport;
2		2
3	# Copyright Koha-Suomi Oy 2016	3	# Copyright Koha-Suomi Oy 2016
4	#	4	#
Lines 25-31 use base qw(Koha::Object); Link Here
25		25
26	=head1 NAME	26	=head1 NAME
27		27
28	Koha::Patron::Message::Transport - Koha Patron Message Transport object class	28	Koha::Patron::MessagePreference::Transport - Koha Patron Message Transport object class
29		29
30	=head1 API	30	=head1 API
31		31

Lines 1-4 Link Here

(-)a/Koha/Patron/Message/Transport/Preference.pm (-2 / +2 lines)
1	package Koha::Patron::Message::Transport::Preference;	1	package Koha::Patron::MessagePreference::Transport::Preference;
2		2
3	# Copyright Koha-Suomi Oy 2016	3	# Copyright Koha-Suomi Oy 2016
4	#	4	#
Lines 25-31 use base qw(Koha::Object); Link Here
25		25
26	=head1 NAME	26	=head1 NAME
27		27
28	Koha::Patron::Message::Transport::Preference - Koha Patron Message Transport	28	Koha::Patron::MessagePreference::Transport::Preference - Koha Patron Message Transport
29	Preference object class	29	Preference object class
30		30
31	=head1 API	31	=head1 API




package Koha::Patron::MessagePreference::Transport::Preferences;

# Copyright Koha-Suomi Oy 2016
#

use Modern::Perl;

use Koha::Database;
use Koha::Patron::MessagePreference::Transport::Preference;

use base qw(Koha::Objects);

=head1 NAME

Koha::Patron::MessagePreference::Transport::Preferences - Koha Patron Message Transport
Preferences object class

=head1 API

=cut

sub object_class {
    return 'Koha::Patron::MessagePreference::Transport::Preference';
}

=head1 AUTHOR

Lines 1-4 Link Here

(-)a/Koha/Patron/Message/Transport/Type.pm (-2 / +2 lines)
1	package Koha::Patron::Message::Transport::Type;	1	package Koha::Patron::MessagePreference::Transport::Type;
2		2
3	# Copyright Koha-Suomi Oy 2016	3	# Copyright Koha-Suomi Oy 2016
4	#	4	#
Lines 25-31 use base qw(Koha::Object); Link Here
25		25
26	=head1 NAME	26	=head1 NAME
27		27
28	Koha::Patron::Message::Transport::Type - Koha Patron Message Transport Type	28	Koha::Patron::MessagePreference::Transport::Type - Koha Patron Message Transport Type
29	object class	29	object class
30		30
31	=head1 API	31	=head1 API




package Koha::Patron::MessagePreference::Transport::Types;

# Copyright Koha-Suomi Oy 2016
#

use Modern::Perl;

use Koha::Database;
use Koha::Patron::MessagePreference::Transport::Type;

use base qw(Koha::Objects);

=head1 NAME

Koha::Patron::MessagePreference::Transport::Types - Koha Patron Message Transport Types
object class

=head1 API

=cut

sub object_class {
    return 'Koha::Patron::MessagePreference::Transport::Type';
}

=head1 AUTHOR




package Koha::Patron::MessagePreference::Transports;

# Copyright Koha-Suomi Oy 2016
#

use Modern::Perl;

use Koha::Database;
use Koha::Patron::MessagePreference::Transport;

use base qw(Koha::Objects);

=head1 NAME

Koha::Patron::MessagePreference::Transports - Koha Patron Message Transports object class

=head1 API


=cut

sub object_class {
    return 'Koha::Patron::MessagePreference::Transport';
}

=head1 AUTHOR




package Koha::Patron::MessagePreferences;

# Copyright Koha-Suomi Oy 2016
#

use Modern::Perl;

use Koha::Database;
use Koha::Patron::MessagePreference::Attributes;
use Koha::Patron::MessagePreference;
use Koha::Patron::MessagePreference::Transports;

use base qw(Koha::Objects);

=head1 NAME

Koha::Patron::MessagePreferences - Koha Patron Message Preferences object class

=head1 API



=head3 find_with_message_name

Koha::Patron::MessagePreferences->find_with_message_name({
    borrowernumber => 123,
    message_name => 'Hold_Filled',
});

    my ($self, $id) = @_;

    if (ref($id) eq "HASH" && $id->{'message_name'}) {
        my $attr = Koha::Patron::MessagePreference::Attributes->find({
            message_name => $id->{'message_name'},
        });
        $id->{'message_attribute_id'} = ($attr) ?


=head3 get_options

my $messaging_options = Koha::Patron::MessagePreferences->get_options

Returns an ARRAYref of HASHrefs on available messaging options.


sub get_options {
    my ($self) = @_;

    my $transports = Koha::Patron::MessagePreference::Transports->search(undef,
        {
            join => ['message_attribute'],
            '+select' => ['message_attribute.message_name', 'message_attribute.takes_days'],


=head3 search_with_message_name

Koha::Patron::MessagePreferences->search_with_message_name({
    borrowernumber => 123,
    message_name => 'Hold_Filled',
});

Converts C<message_name> into C<message_attribute_id> and continues search. Use
Koha::Patron::MessagePreferences->search with a proper join for more complicated
searches.

=cut

    my ($self, $params, $attributes) = @_;

    if (ref($params) eq "HASH" && $params->{'message_name'}) {
        my $attr = Koha::Patron::MessagePreference::Attributes->find({
            message_name => $params->{'message_name'},
        });
        $params->{'message_attribute_id'} = ($attr) ?

=cut

sub object_class {
    return 'Koha::Patron::MessagePreference';
}

=head1 AUTHOR

Lines 196-205 __PACKAGE__->many_to_many( Link Here

(-)a/Koha/Schema/Result/BorrowerMessagePreference.pm (-2 / +2 lines)
196	# You can replace this text with custom content, and it will be preserved on regeneration	196	# You can replace this text with custom content, and it will be preserved on regeneration
197		197
198	sub koha_object_class {	198	sub koha_object_class {
199	'Koha::Patron::Message::Preference';	199	'Koha::Patron::MessagePreference';
200	}	200	}
201	sub koha_objects_class {	201	sub koha_objects_class {
202	'Koha::Patron::Message::Preferences';	202	'Koha::Patron::MessagePreferences';
203	}	203	}
204		204
205	1;	205	1;

Lines 114-123 __PACKAGE__->belongs_to( Link Here

(-)a/Koha/Schema/Result/BorrowerMessageTransportPreference.pm (-2 / +2 lines)
114	# You can replace this text with custom content, and it will be preserved on regeneration	114	# You can replace this text with custom content, and it will be preserved on regeneration
115		115
116	sub koha_object_class {	116	sub koha_object_class {
117	'Koha::Patron::Message::Transport::Preference';	117	'Koha::Patron::MessagePreference::Transport::Preference';
118	}	118	}
119	sub koha_objects_class {	119	sub koha_objects_class {
120	'Koha::Patron::Message::Transport::Preferences';	120	'Koha::Patron::MessagePreference::Transport::Preferences';
121	}	121	}
122		122
123	1;	123	1;

Lines 119-128 __PACKAGE__->has_many( Link Here

(-)a/Koha/Schema/Result/MessageAttribute.pm (-2 / +2 lines)
119	# You can replace this text with custom content, and it will be preserved on regeneration	119	# You can replace this text with custom content, and it will be preserved on regeneration
120		120
121	sub koha_object_class {	121	sub koha_object_class {
122	'Koha::Patron::Message::Attribute';	122	'Koha::Patron::MessagePreference::Attribute';
123	}	123	}
124	sub koha_objects_class {	124	sub koha_objects_class {
125	'Koha::Patron::Message::Attributes';	125	'Koha::Patron::MessagePreference::Attributes';
126	}	126	}
127		127
128	1;	128	1;

Lines 136-145 __PACKAGE__->belongs_to( Link Here

(-)a/Koha/Schema/Result/MessageTransport.pm (-2 / +2 lines)
136	# You can replace this text with custom content, and it will be preserved on regeneration	136	# You can replace this text with custom content, and it will be preserved on regeneration
137		137
138	sub koha_object_class {	138	sub koha_object_class {
139	'Koha::Patron::Message::Transport';	139	'Koha::Patron::MessagePreference::Transport';
140	}	140	}
141	sub koha_objects_class {	141	sub koha_objects_class {
142	'Koha::Patron::Message::Transports';	142	'Koha::Patron::MessagePreference::Transports';
143	}	143	}
144		144
145	1;	145	1;

Lines 157-166 __PACKAGE__->many_to_many( Link Here

(-)a/Koha/Schema/Result/MessageTransportType.pm (-2 / +2 lines)
157	# You can replace this text with custom content, and it will be preserved on regeneration	157	# You can replace this text with custom content, and it will be preserved on regeneration
158		158
159	sub koha_object_class {	159	sub koha_object_class {
160	'Koha::Patron::Message::Transport::Type';	160	'Koha::Patron::MessagePreference::Transport::Type';
161	}	161	}
162	sub koha_objects_class {	162	sub koha_objects_class {
163	'Koha::Patron::Message::Transport::Types';	163	'Koha::Patron::MessagePreference::Transport::Types';
164	}	164	}
165		165
166	1;	166	1;




subtest 'Test class imports' => sub {
    plan tests => 2;

    use_ok('Koha::Patron::MessagePreference::Attribute');
    use_ok('Koha::Patron::MessagePreference::Attributes');
};

subtest 'Test Koha::Patron::MessagePreference::Attributes' => sub {
    plan tests => 6;

    $schema->storage->txn_begin;

    Koha::Patron::MessagePreference::Attribute->new({
        message_name => 'Test_Attribute'
    })->store;
    Koha::Patron::MessagePreference::Attribute->new({
        message_name => 'Test_Attribute2',
        takes_days   => 1
    })->store;

    my $attribute  = Koha::Patron::MessagePreference::Attributes->find({
        message_name => 'Test_Attribute' });
    my $attribute2 = Koha::Patron::MessagePreference::Attributes->find({
        message_name => 'Test_Attribute2' });

    is($attribute->message_name, 'Test_Attribute',


    $attribute->delete;
    $attribute2->delete;
    is(Koha::Patron::MessagePreference::Attributes->find({
        message_name => 'Test_Attribute' }), undef,
       'Deleted the first message attribute.');
    is(Koha::Patron::MessagePreference::Attributes->find({
        message_name => 'Test_Attribute2' }), undef,
       'Deleted the second message attribute.');






use Koha::Notice::Templates;
use Koha::Patron::Categories;
use Koha::Patron::MessagePreference::Attributes;
use Koha::Patron::MessagePreferences;
use Koha::Patron::MessagePreference::Transport::Types;
use Koha::Patron::MessagePreference::Transports;
use Koha::Patrons;

my $schema  = Koha::Database->new->schema;

subtest 'Test class imports' => sub {
    plan tests => 2;

    use_ok('Koha::Patron::MessagePreference::Transport::Preference');
    use_ok('Koha::Patron::MessagePreference::Transport::Preferences');
};

subtest 'Test Koha::Patron::MessagePreference::Transport::Preferences' => sub {
    plan tests => 2;

    $schema->storage->txn_begin;

    my $attribute = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Attributes' });
    my $mtt       = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });
    my $letter    = build_a_test_letter({
        mtt => $mtt->message_transport_type
    });
    Koha::Patron::MessagePreference::Transport->new({
        message_attribute_id   => $attribute->message_attribute_id,
        message_transport_type => $mtt->message_transport_type,
        is_digest              => 0,


    subtest 'For a patron' => sub {
        my $patron    = $builder->build_object({ class => 'Koha::Patrons' });
        my $preference = Koha::Patron::MessagePreference->new({
            borrowernumber       => $patron->borrowernumber,
            message_attribute_id => $attribute->message_attribute_id,
            wants_digest         => 0,

        })->store;

        my $pref_id = $preference->borrower_message_preference_id;
        my $transport_pref = Koha::Patron::MessagePreference::Transport::Preference->new({
            borrower_message_preference_id => $pref_id,
            message_transport_type => $mtt->message_transport_type,
        })->store;
        is(ref($transport_pref), 'Koha::Patron::MessagePreference::Transport::Preference',
           'Added a new messaging transport preference for patron.');

        $transport_pref->delete;
        is(Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $pref_id,
            message_transport_type => $mtt->message_transport_type,
        })->count, 0, 'Deleted the messaging transport preference.');


    subtest 'For a category' => sub {
        my $category   = $builder->build_object({ class => 'Koha::Patron::Categories' });
        my $preference = Koha::Patron::MessagePreference->new({
            categorycode         => $category->categorycode,
            message_attribute_id => $attribute->message_attribute_id,
            wants_digest         => 0,

        })->store;

        my $pref_id = $preference->borrower_message_preference_id;
        my $transport_pref = Koha::Patron::MessagePreference::Transport::Preference->new({
            borrower_message_preference_id => $pref_id,
            message_transport_type => $mtt->message_transport_type,
        })->store;
        is(ref($transport_pref), 'Koha::Patron::MessagePreference::Transport::Preference',
           'Added a new messaging transport preference for category.');

        $transport_pref->delete;
        is(Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $pref_id,
            message_transport_type => $mtt->message_transport_type,
        })->count, 0, 'Deleted the messaging transport preference.');




subtest 'Test class imports' => sub {
    plan tests => 2;

    use_ok('Koha::Patron::MessagePreference::Transport::Type');
    use_ok('Koha::Patron::MessagePreference::Transport::Types');
};

subtest 'Test Koha::Patron::MessagePreference::Transport::Types' => sub {
    plan tests => 2;

    $schema->storage->txn_begin;

    my $transport_type = Koha::Patron::MessagePreference::Transport::Type->new({
        message_transport_type => 'test'
    })->store;


       'Added a new message transport type.');

    $transport_type->delete;
    is(Koha::Patron::MessagePreference::Transport::Types->find('test'), undef,
       'Deleted the message transport type.');

    $schema->storage->txn_rollback;




use t::lib::TestBuilder;

use Koha::Notice::Templates;
use Koha::Patron::MessagePreference::Attributes;
use Koha::Patron::MessagePreference::Transport::Types;

my $schema  = Koha::Database->new->schema;
my $builder = t::lib::TestBuilder->new;

subtest 'Test class imports' => sub {
    plan tests => 2;

    use_ok('Koha::Patron::MessagePreference::Transport');
    use_ok('Koha::Patron::MessagePreference::Transports');
};

subtest 'Test Koha::Patron::MessagePreference::Transports' => sub {
    plan tests => 2;

    $schema->storage->txn_begin;

    my $attribute = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Attributes' });
    my $mtt       = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });
    my $letter    = build_a_test_letter({
        mtt => $mtt->message_transport_type
    });

    my $transport = Koha::Patron::MessagePreference::Transport->new({
        message_attribute_id   => $attribute->message_attribute_id,
        message_transport_type => $mtt->message_transport_type,
        is_digest              => 0,

       'Added a new messaging transport.');

    $transport->delete;
    is(Koha::Patron::MessagePreference::Transports->search({
        message_attribute_id => $attribute->message_attribute_id,
        message_transport_type => $mtt->message_transport_type,
        is_digest => 0





use Koha::Notice::Templates;
use Koha::Patron::Categories;
use Koha::Patron::MessagePreference::Attributes;
use Koha::Patron::MessagePreference::Transport::Types;
use Koha::Patron::MessagePreference::Transports;
use Koha::Patrons;

use File::Temp qw/tempfile/;

subtest 'Test class imports' => sub {
    plan tests => 2;

    use_ok('Koha::Patron::MessagePreference');
    use_ok('Koha::Patron::MessagePreferences');
};

subtest 'Test Koha::Patron::MessagePreferences' => sub {
    plan tests => 2;

    $schema->storage->txn_begin;

    my $attribute = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Attributes' });
    my $letter = build_a_test_letter();
    my $mtt = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });
    Koha::Patron::MessagePreference::Transport->new({
        message_attribute_id   => $attribute->message_attribute_id,
        message_transport_type => $mtt->message_transport_type,
        is_digest              => 0,

        plan tests => 3;

        my $patron = $builder->build_object({ class => 'Koha::Patrons' });
        Koha::Patron::MessagePreference->new({
            borrowernumber       => $patron->borrowernumber,
            message_attribute_id => $attribute->message_attribute_id,
            wants_digest         => 0,
            days_in_advance      => undef,
        })->store;

        my $preference = Koha::Patron::MessagePreferences->find({
            borrowernumber       => $patron->borrowernumber,
            message_attribute_id => $attribute->message_attribute_id
        });

        subtest 'Test set not throwing an exception on duplicate object' => sub {
            plan tests => 1;

            Koha::Patron::MessagePreference::Attributes->find({
                message_attribute_id => $attribute->message_attribute_id
            })->set({ takes_days => 1 })->store;
            $preference->set({ days_in_advance => 1 })->store;
            is(ref($preference), 'Koha::Patron::MessagePreference',
             'Updating the preference does not cause duplicate object exception');
        };

        $preference->delete;
        is(Koha::Patron::MessagePreferences->search({
            borrowernumber       => $patron->borrowernumber,
            message_attribute_id => $attribute->message_attribute_id
        })->count, 0, 'Deleted the messaging preference.');


    subtest 'Test for a category' => sub {
        my $category = $builder->build_object({ class => 'Koha::Patron::Categories' });
        Koha::Patron::MessagePreference->new({
            categorycode         => $category->categorycode,
            message_attribute_id => $attribute->message_attribute_id,
            wants_digest         => 0,
            days_in_advance      => undef,
        })->store;

        my $preference = Koha::Patron::MessagePreferences->find({
            categorycode         => $category->categorycode,
            message_attribute_id => $attribute->message_attribute_id
        });

           'Added a new messaging preference for category.');

        $preference->delete;
        is(Koha::Patron::MessagePreferences->search({
            categorycode         => $category->categorycode,
            message_attribute_id => $attribute->message_attribute_id
        })->count, 0, 'Deleted the messaging preference.');

    $schema->storage->txn_rollback;
};

subtest 'Test Koha::Patron::MessagePreferences->get_options' => sub {
    plan tests => 2;

    subtest 'Test method availability and return value' => sub {
        plan tests => 3;

        ok(Koha::Patron::MessagePreferences->can('get_options'),
            'Method get_options is available.');
        ok(my $options = Koha::Patron::MessagePreferences->get_options,
            'Called get_options successfully.');
        is(ref($options), 'ARRAY', 'get_options returns a ARRAYref');
    };

    subtest 'Make sure options are correct' => sub {
        $schema->storage->txn_begin;
        my $options = Koha::Patron::MessagePreferences->get_options;

        foreach my $option (@$options) {
            my $n = $option->{'message_name'};
            my $attr = Koha::Patron::MessagePreference::Attributes->find($option->{'message_attribute_id'});
            is($option->{'message_attribute_id'}, $attr->message_attribute_id,
               '$n: message_attribute_id is set');
            is($option->{'message_name'}, $attr->message_name, '$n: message_name is set');
            is($option->{'takes_days'}, $attr->takes_days, '$n: takes_days is set');
            my $transports = Koha::Patron::MessagePreference::Transports->search({
                message_attribute_id => $option->{'message_attribute_id'},
                is_digest => $option->{'has_digest'} || 0,
            });

    my ($default, $mtt1, $mtt2) = build_a_test_category_preference({
        patron => $patron,
    });
    ok(Koha::Patron::MessagePreference->new_from_default({
        borrowernumber       => $patron->borrowernumber,
        categorycode         => $patron->categorycode,
        message_attribute_id => $default->message_attribute_id,
    })->store, 'Added a default preference to patron.');
    ok(my $pref = Koha::Patron::MessagePreferences->find({
        borrowernumber       => $patron->borrowernumber,
        message_attribute_id => $default->message_attribute_id,
    }), 'Found the default preference from patron.');
    is(Koha::Patron::MessagePreference::Transport::Preferences->search({
        borrower_message_preference_id => $pref->borrower_message_preference_id
    })->count, 2, 'Found the two transport types that we set earlier');

    $schema->storage->txn_rollback;
};

subtest 'Test Koha::Patron::MessagePreference->message_transport_types' => sub {
    plan tests => 4;

    ok(Koha::Patron::MessagePreference->can('message_transport_types'),
       'Method message_transport_types available');

    subtest 'get message_transport_types' => sub {

        my ($preference, $mtt1, $mtt2) = build_a_test_complete_preference({
            patron => $patron
        });
        Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
        })->delete;
        Koha::Patron::MessagePreference::Transport::Preference->new({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
            message_transport_type => $mtt1->message_transport_type,
        })->store;
        Koha::Patron::MessagePreference::Transport::Preference->new({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
            message_transport_type => $mtt2->message_transport_type,
        })->store;
        my $stored_transports = Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
        });
        my $transport1 = Koha::Patron::MessagePreference::Transports->find({
            message_attribute_id => $preference->message_attribute_id,
            message_transport_type => $mtt1->message_transport_type,
        });
        my $transport2 = Koha::Patron::MessagePreference::Transports->find({
            message_attribute_id => $preference->message_attribute_id,
            message_transport_type => $mtt2->message_transport_type,
        });

            my $appenders = Log::Log4perl->appenders;
            my $appender = Log::Log4perl->appenders->{OPAC};

            my $pref = Koha::Patron::MessagePreferences->find(
                $preference->borrower_message_preference_id
            );
            my $transports = $pref->message_transport_types;
            is($appender, undef, 'Nothing in buffer yet');

            my $mtt_new = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });
            Koha::Patron::MessagePreference::Transport::Preference->new({
                borrower_message_preference_id =>
                                $pref->borrower_message_preference_id,
                message_transport_type => $mtt_new->message_transport_type,
            })->store;
            $pref = Koha::Patron::MessagePreferences->find(
                $pref->borrower_message_preference_id
            );
            $transports = $pref->message_transport_types;

        my $mtt1_str = $mtt1->message_transport_type;
        my $mtt2_str = $mtt2->message_transport_type;
        # 1/3, use message_transport_types(list)
        Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
        })->delete;
        ok($preference->message_transport_types($mtt1_str, $mtt2_str)->store,
           '1/3 Set returned true.');
        my $stored_transports = Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
            '-or' => [
                message_transport_type => $mtt1_str,

        is($stored_transports->count, 2, 'Two transports selected');

        # 2/3, use message_transport_types(ARRAYREF)
        Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
        })->delete;
        ok($preference->message_transport_types([$mtt1_str, $mtt2_str])->store,
           '2/3 Set returned true.');
        $stored_transports = Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
            '-or' => [
                message_transport_type => $mtt1_str,

        is($stored_transports->count, 2, 'Two transports selected');

        # 3/3, use set({ message_transport_types => ARRAYREF })
        Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
        })->delete;
        ok($preference->set({
            message_transport_types => [$mtt1_str, $mtt2_str]})->store,
           '3/3 Set returned true.');
        $stored_transports = Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
            '-or' => [
                message_transport_type => $mtt1_str,

        is($stored_transports->count, 2, 'Two transports selected');

        # Test contact information validation
        eval { Koha::Patron::MessagePreference::Transport::Types->new({
                message_transport_type => 'email'
            })->store };
        eval { Koha::Patron::MessagePreference::Transport::Types->new({
                message_transport_type => 'itiva'
            })->store };
        eval { Koha::Patron::MessagePreference::Transport::Types->new({
                message_transport_type => 'phone'
            })->store };
        eval { Koha::Patron::MessagePreference::Transport::Types->new({
                message_transport_type => 'sms'
            })->store };
        Koha::Patron::MessagePreference::Transport->new({
            message_attribute_id   => $preference->message_attribute_id,
            message_transport_type => 'email',
            is_digest              => 1
        })->store;
        Koha::Patron::MessagePreference::Transport->new({
            message_attribute_id   => $preference->message_attribute_id,
            message_transport_type => 'itiva',
            is_digest              => 1
        })->store;
        Koha::Patron::MessagePreference::Transport->new({
            message_attribute_id   => $preference->message_attribute_id,
            message_transport_type => 'phone',
            is_digest              => 1
        })->store;
        Koha::Patron::MessagePreference::Transport->new({
            message_attribute_id   => $preference->message_attribute_id,
            message_transport_type => 'sms',
            is_digest              => 1

        eval {
            $preference->message_transport_types('email')->store;
        };
        is (ref $@, 'Koha::Exceptions::Patron::MessagePreference::EmailAddressRequired',
            'Adding a message preference with invalid message_transport_type'
            .' => Koha::Exceptions::Patron::MessagePreference::EmailAddressRequired');
        is ($@->message_name, $preference->message_name, 'The previous exception '
            .' tells us it which message name it was.');
        is ($@->borrowernumber, $patron->borrowernumber, 'The previous exception '

        eval {
            $preference->message_transport_types('itiva')->store;
        };
        is (ref $@, 'Koha::Exceptions::Patron::MessagePreference::TalkingTechItivaPhoneNotificationRequired',
            'Adding a message preference with invalid message_transport_type'
            .' => Koha::Exceptions::Patron::MessagePreference::TalkingTechItivaPhoneNotificationRequired');
        is ($@->message_name, $preference->message_name, 'The previous exception '
            .' tells us it which message name it was.');
        is ($@->borrowernumber, $patron->borrowernumber, 'The previous exception '

        eval {
            $preference->message_transport_types('phone')->store;
        };
        is (ref $@, 'Koha::Exceptions::Patron::MessagePreference::PhoneNumberRequired',
            'Adding a message preference with invalid message_transport_type'
            .' => Koha::Exceptions::Patron::MessagePreference::PhoneNumberRequired');
        is ($@->message_name, $preference->message_name, 'The previous exception '
            .' tells us it which message name it was.');
        is ($@->borrowernumber, $patron->borrowernumber, 'The previous exception '

        eval {
            $preference->message_transport_types('sms')->store;
        };
        is (ref $@, 'Koha::Exceptions::Patron::MessagePreference::SMSNumberRequired',
            'Adding a message preference with invalid message_transport_type'
            .' => Koha::Exceptions::Patron::MessagePreference::SMSNumberRequired');
        is ($@->message_name, $preference->message_name, 'The previous exception '
            .' tells us it which message name it was.');
        is ($@->borrowernumber, $patron->borrowernumber, 'The previous exception '


        my $patron    = $builder->build_object({ class => 'Koha::Patrons' });
        my $letter    = build_a_test_letter();
        my $attribute = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Attributes' });
        my $mtt       = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });
        Koha::Patron::MessagePreference::Transport->new({
            message_attribute_id   => $attribute->message_attribute_id,
            message_transport_type => $mtt->message_transport_type,
            is_digest              => 0,
            letter_module          => $letter->module,
            letter_code            => $letter->code,
        })->store;
        ok(my $preference = Koha::Patron::MessagePreference->new({
            borrowernumber => $patron->borrowernumber,
            message_attribute_id => $attribute->message_attribute_id,
            wants_digest => 0,

        })->store, 'Added a new messaging preference and transport types to patron.');
        ok($preference->message_transport_types->{$mtt->message_transport_type},
           'The transport type is stored in the object.');
        my $stored_transports = Koha::Patron::MessagePreference::Transport::Preferences->search({
            borrower_message_preference_id => $preference->borrower_message_preference_id,
        });
        is($stored_transports->next->message_transport_type, $mtt->message_transport_type,

    };
};

subtest 'Test Koha::Patron::MessagePreference->message_name' => sub {
    plan tests => 1;

    $schema->storage->txn_begin;

    my $patron      = $builder->build_object({ class => 'Koha::Patrons' });
    my $attribute   = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Attributes' });
    my ($preference, $mtt1, $mtt2) = build_a_test_complete_preference({
        patron => $patron,
        attr   => $attribute,
    });
    my $message_name_pref = Koha::Patron::MessagePreferences->search_with_message_name({
        borrowernumber => $patron->{'borrowernumber'},
        message_name => $attribute->message_name,
    })->next;

    $schema->storage->txn_rollback;
};

subtest 'Test Koha::Patron::MessagePreference->mtt_deliverable' => sub {
    plan tests => 10;

    $schema->storage->txn_begin;

    });

    # Test email and smsalertnumber validation
    eval { Koha::Patron::MessagePreference::Transport::Types->new({
            message_transport_type => 'email'
        })->store };
    eval { Koha::Patron::MessagePreference::Transport::Types->new({
            message_transport_type => 'sms'
        })->store };
    eval { Koha::Patron::MessagePreference::Transport::Types->new({
            message_transport_type => 'phone'
        })->store };
    eval { Koha::Patron::MessagePreference::Transport::Types->new({
            message_transport_type => 'itiva'
        })->store };
    Koha::Patron::MessagePreference::Transport->new({
        message_attribute_id   => $preference->message_attribute_id,
        message_transport_type => 'email',
        is_digest              => 1
    })->store;
    Koha::Patron::MessagePreference::Transport->new({
        message_attribute_id   => $preference->message_attribute_id,
        message_transport_type => 'sms',
        is_digest              => 1
    })->store;
    Koha::Patron::MessagePreference::Transport->new({
        message_attribute_id   => $preference->message_attribute_id,
        message_transport_type => 'phone',
        is_digest              => 1
    })->store;
    Koha::Patron::MessagePreference::Transport->new({
        message_attribute_id   => $preference->message_attribute_id,
        message_transport_type => 'itiva',
        is_digest              => 1

    subtest 'Missing parameters' => sub {
        plan tests => 1;

        eval { Koha::Patron::MessagePreference->new->store };
        is(ref $@, 'Koha::Exceptions::MissingParameter',
            'Adding a message preference without parameters'
            .' => Koha::Exceptions::MissingParameter');

        $schema->storage->txn_begin;

        my $patron = $builder->build_object({ class => 'Koha::Patrons' });
        eval { Koha::Patron::MessagePreference->new({
            borrowernumber => $patron->borrowernumber,
            categorycode   => $patron->categorycode,
        })->store };


        $schema->storage->txn_begin;

        eval { Koha::Patron::MessagePreference->new({
                borrowernumber => -999,
            })->store };
        is(ref $@, 'Koha::Exceptions::Patron::NotFound',
            'Adding a message preference with invalid borrowernumber'
            .' => Koha::Exceptions::Patron::NotFound');

        eval { Koha::Patron::MessagePreference->new({
                categorycode => 'nonexistent',
            })->store };
        is(ref $@, 'Koha::Exceptions::Patron::Category::NotFound',


        my $attribute = build_a_test_attribute({ takes_days => 0 });
        my $patron    = $builder->build_object({ class => 'Koha::Patrons' });
        eval { Koha::Patron::MessagePreference->new({
                borrowernumber => $patron->borrowernumber,
                message_attribute_id => $attribute->message_attribute_id,
                days_in_advance => 10,
            })->store };
        is(ref $@, 'Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceNotAvailable',
            'Adding a message preference with days in advance option when not'
            .' available => Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceNotAvailable');

        $attribute->set({ takes_days => 1 })->store;
        eval { Koha::Patron::MessagePreference->new({
                borrowernumber => $patron->borrowernumber,
                message_attribute_id => $attribute->message_attribute_id,
                days_in_advance => -1,
            })->store };
        is(ref $@, 'Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceOutOfRange',
            'Adding a message preference with days in advance option is out of range'
            .' => Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceOutOfRange');
        is ($@->min, 0, 'The previous exception min value is 0.');

        eval { Koha::Patron::MessagePreference->new({
                borrowernumber => $patron->borrowernumber,
                message_attribute_id => $attribute->message_attribute_id,
                days_in_advance => 31,
            })->store };
        is(ref $@, 'Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceOutOfRange',
            'Adding a message preference with days in advance option is out of range'
            .' => Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceOutOfRange');
        is ($@->max, 30, 'The previous exception max value is 30.');

        eval { Koha::Patron::MessagePreference->new({
                borrowernumber => $patron->borrowernumber,
                message_transport_types => ['nonexistent']
            })->store };
        is (ref $@, 'Koha::Exceptions::Patron::MessagePreference::Transport::TypeNotFound',
            'Adding a message preference with invalid message_transport_type'
            .' => Koha::Exceptions::Patron::MessagePreference::Transport::TypeNotFound');
        is ($@->transport_type, 'nonexistent', 'The previous exception '
            .'tells us it which transport type it was.');

        my $mtt_new = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });
        eval {
            Koha::Patron::MessagePreference->new({
                borrowernumber => $patron->borrowernumber,
                message_attribute_id => $attribute->message_attribute_id,
                message_transport_types => [$mtt_new->message_transport_type],
                wants_digest => 1,
            })->store };
        is (ref $@, 'Koha::Exceptions::Patron::MessagePreference::NoTransportType',
            'Adding a message preference with invalid message_transport_type'
           .' => Koha::Exceptions::Patron::MessagePreference::NoTransportType');
        is ($@->message_name, $attribute->message_name, 'The previous exception '
            .'tells us which message it was.');
        is ($@->transport_type, $mtt_new->message_transport_type, 'The previous exception '
            .'tells us which message transport type it was.');

        eval {
            Koha::Patron::MessagePreference->new({
                borrowernumber => $patron->borrowernumber,
                message_attribute_id => $attribute->message_attribute_id,
                message_transport_types => [],
                wants_digest => 1,
            })->store };
        is (ref $@, 'Koha::Exceptions::Patron::MessagePreference::DigestNotAvailable',
            'Adding a message preference that has no digest setting'
            .' => Koha::Exceptions::Patron::MessagePreference::DigestNotAvailable');
        is ($@->message_name, $attribute->message_name, 'The previous exception tells us'
            .' which message it was');

        eval {
            Koha::Patron::MessagePreference->new({
                borrowernumber => $patron->borrowernumber,
                message_attribute_id => $attribute->message_attribute_id,
                message_transport_types => [],
                wants_digest => 0,
            })->store };
        is (ref $@, 'Koha::Exceptions::Patron::MessagePreference::DigestRequired',
            'Adding a message preference, that requires digest, with no digest'
            .' => Koha::Exceptions::Patron::MessagePreference::DigestRequired');
        is ($@->message_name, $attribute->message_name, 'The previous exception tells us'
            .' which message it was');
        eval {
            Koha::Patron::MessagePreference->new({
                borrowernumber => $patron->borrowernumber,
                message_attribute_id => -1,
                message_transport_types => [],
            })->store };
        is (ref $@, 'Koha::Exceptions::Patron::MessagePreference::AttributeNotFound',
            'Adding a message preference with invalid message_transport_type'
            .' => KKoha::Exceptions::Patron::MessagePreference::AttributeNotFound');
        is ($@->message_attribute_id, -1, 'The previous exception tells'
            .' us which message attribute id it was.');



        $schema->storage->txn_begin;

        my $attribute = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Attributes' });
        my $letter = build_a_test_letter();
        my $mtt = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });
        Koha::Patron::MessagePreference::Transport->new({
            message_attribute_id   => $attribute->message_attribute_id,
            message_transport_type => $mtt->message_transport_type,
            is_digest              => 0,

            letter_code            => $letter->code,
        })->store;
        my $patron    = $builder->build_object({ class => 'Koha::Patrons' });
        my $preference = Koha::Patron::MessagePreference->new({
            borrowernumber => $patron->borrowernumber,
            message_attribute_id => $attribute->message_attribute_id,
            wants_digest => 0,

        })->store;
        ok($preference->borrower_message_preference_id,
           'Added a new messaging preference for patron.');
        eval { Koha::Patron::MessagePreference->new({
            borrowernumber => $patron->borrowernumber,
            message_attribute_id => $attribute->message_attribute_id,
            wants_digest => 0,

        value => $params,
    });

    return Koha::Patron::MessagePreference::Attributes->find(
        $attribute->{message_attribute_id}
    );
}

                    : build_a_test_attribute($params->{days_in_advance});

    my $letter = $params->{letter} ? $params->{letter} : build_a_test_letter();
    my $mtt1 = $params->{mtt1} ? $params->{mtt1} : $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });
    my $mtt2 = $params->{mtt2} ? $params->{mtt2} : $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });

    Koha::Patron::MessagePreference::Transport->new({
        message_attribute_id   => $attr->message_attribute_id,
        message_transport_type => $mtt1->message_transport_type,
        is_digest              => $params->{digest} ? 1 : 0,

        letter_code            => $letter->code,
    })->store;

    Koha::Patron::MessagePreference::Transport->new({
        message_attribute_id   => $attr->message_attribute_id,
        message_transport_type => $mtt2->message_transport_type,
        is_digest              => $params->{digest} ? 1 : 0,

        letter_code            => $letter->code,
    })->store;

    my $default = Koha::Patron::MessagePreference->new({
        categorycode         => $patron->categorycode,
        message_attribute_id => $attr->message_attribute_id,
        wants_digest         => $params->{digest} ? 1 : 0,

                                 ? $params->{days_in_advance} : undef,
    })->store;

    Koha::Patron::MessagePreference::Transport::Preference->new({
        borrower_message_preference_id => $default->borrower_message_preference_id,
        message_transport_type         => $mtt1->message_transport_type,
    })->store;
    Koha::Patron::MessagePreference::Transport::Preference->new({
        borrower_message_preference_id => $default->borrower_message_preference_id,
        message_transport_type         => $mtt2->message_transport_type,
    })->store;

    my ($default, $mtt1, $mtt2) = build_a_test_category_preference($params);
    my $patron = $params->{patron};
    $patron->set_default_messaging_preferences;
    return (Koha::Patron::MessagePreferences->search({
        borrowernumber => $patron->borrowernumber
    })->next, $mtt1, $mtt2);
}
- 

Return to bug 17499

Lines 50-56 use Koha::Patron::HouseboundRole; Link Here

(-)a/Koha/Patron.pm (-6 / +6 lines)
50	use Koha::Patron::Images;	50	use Koha::Patron::Images;
51	use Koha::Patron::Messages;	51	use Koha::Patron::Messages;
52	use Koha::Patron::Modifications;	52	use Koha::Patron::Modifications;
53	use Koha::Patron::Message::Preferences;	53	use Koha::Patron::MessagePreferences;
54	use Koha::Patron::Relationships;	54	use Koha::Patron::Relationships;
55	use Koha::Patron::Restrictions;	55	use Koha::Patron::Restrictions;
56	use Koha::Patrons;	56	use Koha::Patrons;
Lines 2057-2063 sub get_extended_attribute { Link Here
2057		2057
2058	Sets default messaging preferences on patron.	2058	Sets default messaging preferences on patron.
2059		2059
2060	See Koha::Patron::Message::Preference(s) for more documentation, especially on	2060	See Koha::Patron::MessagePreference(s) for more documentation, especially on
2061	thrown exceptions.	2061	thrown exceptions.
2062		2062
2063	=cut	2063	=cut
Lines 2065-2075 thrown exceptions. Link Here
2065	sub set_default_messaging_preferences {	2065	sub set_default_messaging_preferences {
2066	my ($self, $categorycode) = @_;	2066	my ($self, $categorycode) = @_;
2067		2067
2068	my $options = Koha::Patron::Message::Preferences->get_options;	2068	my $options = Koha::Patron::MessagePreferences->get_options;
2069		2069
2070	foreach my $option (@$options) {	2070	foreach my $option (@$options) {
2071	# Check that this option has preference configuration for this category	2071	# Check that this option has preference configuration for this category
2072	unless (Koha::Patron::Message::Preferences->search({	2072	unless (Koha::Patron::MessagePreferences->search({
2073	message_attribute_id => $option->{message_attribute_id},	2073	message_attribute_id => $option->{message_attribute_id},
2074	categorycode => $categorycode \|\| $self->categorycode,	2074	categorycode => $categorycode \|\| $self->categorycode,
2075	})->count) {	2075	})->count) {
Lines 2077-2088 sub set_default_messaging_preferences { Link Here
2077	}	2077	}
2078		2078
2079	# Delete current setting	2079	# Delete current setting
2080	Koha::Patron::Message::Preferences->search({	2080	Koha::Patron::MessagePreferences->search({
2081	borrowernumber => $self->borrowernumber,	2081	borrowernumber => $self->borrowernumber,
2082	message_attribute_id => $option->{message_attribute_id},	2082	message_attribute_id => $option->{message_attribute_id},
2083	})->delete;	2083	})->delete;
2084		2084
2085	Koha::Patron::Message::Preference->new_from_default({	2085	Koha::Patron::MessagePreference->new_from_default({
2086	borrowernumber => $self->borrowernumber,	2086	borrowernumber => $self->borrowernumber,
2087	categorycode => $categorycode \|\| $self->categorycode,	2087	categorycode => $categorycode \|\| $self->categorycode,
2088	message_attribute_id => $option->{message_attribute_id},	2088	message_attribute_id => $option->{message_attribute_id},

Lines 1-4 Link Here

(-)a/Koha/Exceptions/Patron/Message/Preference.pm (-22 / +22 lines)
1	package Koha::Exceptions::Patron::Message::Preference;	1	package Koha::Exceptions::Patron::MessagePreference;
2		2
3	# This file is part of Koha.	3	# This file is part of Koha.
4	#	4	#
Lines 19-74 use Modern::Perl; Link Here
19		19
20	use Exception::Class (	20	use Exception::Class (
21		21
22	'Koha::Exceptions::Patron::Message::Preference' => {	22	'Koha::Exceptions::Patron::MessagePreference' => {
23	description => 'Something went wrong'	23	description => 'Something went wrong'
24	},	24	},
25	'Koha::Exceptions::Patron::Message::Preference::AttributeNotFound' => {	25	'Koha::Exceptions::Patron::MessagePreference::AttributeNotFound' => {
26	isa => 'Koha::Exceptions::Patron::Message::Preference',	26	isa => 'Koha::Exceptions::Patron::MessagePreference',
27	description => "Message attribute not found",	27	description => "Message attribute not found",
28	fields => ['message_attribute_id']	28	fields => ['message_attribute_id']
29	},	29	},
30	'Koha::Exceptions::Patron::Message::Preference::DaysInAdvanceOutOfRange' => {	30	'Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceOutOfRange' => {
31	isa => 'Koha::Exceptions::Patron::Message::Preference',	31	isa => 'Koha::Exceptions::Patron::MessagePreference',
32	description => "Days in advance is out of range",	32	description => "Days in advance is out of range",
33	fields => ['min','max', 'message_name']	33	fields => ['min','max', 'message_name']
34	},	34	},
35	'Koha::Exceptions::Patron::Message::Preference::DaysInAdvanceNotAvailable' => {	35	'Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceNotAvailable' => {
36	isa => 'Koha::Exceptions::Patron::Message::Preference',	36	isa => 'Koha::Exceptions::Patron::MessagePreference',
37	description => "Days in advance cannot be selected for this preference",	37	description => "Days in advance cannot be selected for this preference",
38	fields => ['message_name']	38	fields => ['message_name']
39	},	39	},
40	'Koha::Exceptions::Patron::Message::Preference::DigestNotAvailable' => {	40	'Koha::Exceptions::Patron::MessagePreference::DigestNotAvailable' => {
41	isa => 'Koha::Exceptions::Patron::Message::Preference',	41	isa => 'Koha::Exceptions::Patron::MessagePreference',
42	description => "Digest is not available for this message type",	42	description => "Digest is not available for this message type",
43	fields => ['message_name']	43	fields => ['message_name']
44	},	44	},
45	'Koha::Exceptions::Patron::Message::Preference::DigestRequired' => {	45	'Koha::Exceptions::Patron::MessagePreference::DigestRequired' => {
46	isa => 'Koha::Exceptions::Patron::Message::Preference',	46	isa => 'Koha::Exceptions::Patron::MessagePreference',
47	description => "Digest must be selected for this message type",	47	description => "Digest must be selected for this message type",
48	fields => ['message_name']	48	fields => ['message_name']
49	},	49	},
50	'Koha::Exceptions::Patron::Message::Preference::EmailAddressRequired' => {	50	'Koha::Exceptions::Patron::MessagePreference::EmailAddressRequired' => {
51	isa => 'Koha::Exceptions::Patron::Message::Preference',	51	isa => 'Koha::Exceptions::Patron::MessagePreference',
52	description => "Patron has no email address, cannot use email transport type.",	52	description => "Patron has no email address, cannot use email transport type.",
53	fields => ['message_name', 'borrowernumber' ]	53	fields => ['message_name', 'borrowernumber' ]
54	},	54	},
55	'Koha::Exceptions::Patron::Message::Preference::NoTransportType' => {	55	'Koha::Exceptions::Patron::MessagePreference::NoTransportType' => {
56	isa => 'Koha::Exceptions::Patron::Message::Preference',	56	isa => 'Koha::Exceptions::Patron::MessagePreference',
57	description => "Transport type not available for this message.",	57	description => "Transport type not available for this message.",
58	fields => ['message_name', 'transport_type']	58	fields => ['message_name', 'transport_type']
59	},	59	},
60	'Koha::Exceptions::Patron::Message::Preference::PhoneNumberRequired' => {	60	'Koha::Exceptions::Patron::MessagePreference::PhoneNumberRequired' => {
61	isa => 'Koha::Exceptions::Patron::Message::Preference',	61	isa => 'Koha::Exceptions::Patron::MessagePreference',
62	description => "Patron has no phone number, cannot use phone transport type.",	62	description => "Patron has no phone number, cannot use phone transport type.",
63	fields => ['message_name', 'borrowernumber' ]	63	fields => ['message_name', 'borrowernumber' ]
64	},	64	},
65	'Koha::Exceptions::Patron::Message::Preference::SMSNumberRequired' => {	65	'Koha::Exceptions::Patron::MessagePreference::SMSNumberRequired' => {
66	isa => 'Koha::Exceptions::Patron::Message::Preference',	66	isa => 'Koha::Exceptions::Patron::MessagePreference',
67	description => "Patron has no SMS number, cannot use sms transport type.",	67	description => "Patron has no SMS number, cannot use sms transport type.",
68	fields => ['message_name', 'borrowernumber' ]	68	fields => ['message_name', 'borrowernumber' ]
69	},	69	},
70	'Koha::Exceptions::Patron::Message::Preference::TalkingTechItivaPhoneNotificationRequired' => {	70	'Koha::Exceptions::Patron::MessagePreference::TalkingTechItivaPhoneNotificationRequired' => {
71	isa => 'Koha::Exceptions::Patron::Message::Preference',	71	isa => 'Koha::Exceptions::Patron::MessagePreference',
72	description => "System preference TalkingTechItivaPhoneNotification is disabled, cannot use itiva transport type.",	72	description => "System preference TalkingTechItivaPhoneNotification is disabled, cannot use itiva transport type.",
73	fields => ['message_name', 'borrowernumber' ]	73	fields => ['message_name', 'borrowernumber' ]
74	},	74	},

Lines 1-4 Link Here

(-)a/Koha/Patron/Message/Preference.pm (-36 / +36 lines)
1	package Koha::Patron::Message::Preference;	1	package Koha::Patron::MessagePreference;
2		2
3	# Copyright Koha-Suomi Oy 2016	3	# Copyright Koha-Suomi Oy 2016
4	#	4	#
Lines 21-42 use Modern::Perl; Link Here
21		21
22	use Koha::Database;	22	use Koha::Database;
23	use Koha::Exceptions;	23	use Koha::Exceptions;
24	use Koha::Exceptions::Patron::Message::Preference;	24	use Koha::Exceptions::Patron::MessagePreference;
25	use Koha::Exceptions::Patron::Message::Transport;	25	use Koha::Exceptions::Patron::MessagePreference::Transport;
26	use Koha::Exceptions::Patron::Category;	26	use Koha::Exceptions::Patron::Category;
27	use Koha::Patron::Categories;	27	use Koha::Patron::Categories;
28	use Koha::Patron::Message::Attributes;	28	use Koha::Patron::MessagePreference::Attributes;
29	use Koha::Patron::Message::Preferences;	29	use Koha::Patron::MessagePreferences;
30	use Koha::Patron::Message::Transport::Preferences;	30	use Koha::Patron::MessagePreference::Transport::Preferences;
31	use Koha::Patron::Message::Transport::Types;	31	use Koha::Patron::MessagePreference::Transport::Types;
32	use Koha::Patron::Message::Transports;	32	use Koha::Patron::MessagePreference::Transports;
33	use Koha::Patrons;	33	use Koha::Patrons;
34		34
35	use base qw(Koha::Object);	35	use base qw(Koha::Object);
36		36
37	=head1 NAME	37	=head1 NAME
38		38
39	Koha::Patron::Message::Preference - Koha Patron Message Preference object class	39	Koha::Patron::MessagePreference - Koha Patron Message Preference object class
40		40
41	=head1 API	41	=head1 API
42		42
Lines 46-52 Koha::Patron::Message::Preference - Koha Patron Message Preference object class Link Here
46		46
47	=head3 new	47	=head3 new
48		48
49	my $preference = Koha::Patron::Message::Preference->new({	49	my $preference = Koha::Patron::MessagePreference->new({
50	borrowernumber => 123,	50	borrowernumber => 123,
51	#categorycode => 'ABC',	51	#categorycode => 'ABC',
52	message_attribute_id => 4,	52	message_attribute_id => 4,
Lines 89-95 sub new { Link Here
89		89
90	=head3 new_from_default	90	=head3 new_from_default
91		91
92	my $preference = Koha::Patron::Message::Preference->new_from_default({	92	my $preference = Koha::Patron::MessagePreference->new_from_default({
93	borrowernumber => 123,	93	borrowernumber => 123,
94	categorycode => 'ABC', # if not given, patron's categorycode will be used	94	categorycode => 'ABC', # if not given, patron's categorycode will be used
95	message_attribute_id => 1,	95	message_attribute_id => 1,
Lines 124-130 sub new_from_default { Link Here
124	$params->{'categorycode'} = $patron->categorycode;	124	$params->{'categorycode'} = $patron->categorycode;
125	}	125	}
126		126
127	my $default = Koha::Patron::Message::Preferences->find({	127	my $default = Koha::Patron::MessagePreferences->find({
128	categorycode => $params->{'categorycode'},	128	categorycode => $params->{'categorycode'},
129	message_attribute_id => $params->{'message_attribute_id'},	129	message_attribute_id => $params->{'message_attribute_id'},
130	});	130	});
Lines 144-155 sub new_from_default { Link Here
144		144
145	# Set default messaging transport types	145	# Set default messaging transport types
146	my $default_transport_types =	146	my $default_transport_types =
147	Koha::Patron::Message::Transport::Preferences->search({	147	Koha::Patron::MessagePreference::Transport::Preferences->search({
148	borrower_message_preference_id =>	148	borrower_message_preference_id =>
149	$default->{'borrower_message_preference_id'}	149	$default->{'borrower_message_preference_id'}
150	});	150	});
151	while (my $transport = $default_transport_types->next) {	151	while (my $transport = $default_transport_types->next) {
152	Koha::Patron::Message::Transport::Preference->new({	152	Koha::Patron::MessagePreference::Transport::Preference->new({
153	borrower_message_preference_id => $self->borrower_message_preference_id,	153	borrower_message_preference_id => $self->borrower_message_preference_id,
154	message_transport_type => $transport->message_transport_type,	154	message_transport_type => $transport->message_transport_type,
155	})->store;	155	})->store;
Lines 174-180 sub message_name { Link Here
174	if ($self->{'_message_name'}) {	174	if ($self->{'_message_name'}) {
175	return $self->{'_message_name'};	175	return $self->{'_message_name'};
176	}	176	}
177	$self->{'_message_name'} = Koha::Patron::Message::Attributes->find({	177	$self->{'_message_name'} = Koha::Patron::MessagePreference::Attributes->find({
178	message_attribute_id => $self->message_attribute_id,	178	message_attribute_id => $self->message_attribute_id,
179	})->message_name;	179	})->message_name;
180	return $self->{'_message_name'};	180	return $self->{'_message_name'};
Lines 201-207 sub message_transport_types { Link Here
201	return $self->{'_message_transport_types'};	201	return $self->{'_message_transport_types'};
202	}	202	}
203	map {	203	map {
204	my $transport = Koha::Patron::Message::Transports->find({	204	my $transport = Koha::Patron::MessagePreference::Transports->find({
205	message_attribute_id => $self->message_attribute_id,	205	message_attribute_id => $self->message_attribute_id,
206	message_transport_type => $_->message_transport_type,	206	message_transport_type => $_->message_transport_type,
207	is_digest => $self->wants_digest	207	is_digest => $self->wants_digest
Lines 217-223 sub message_transport_types { Link Here
217	$self->{'_message_transport_types'}->{$_->message_transport_type}	217	$self->{'_message_transport_types'}->{$_->message_transport_type}
218	= $transport ? $transport->letter_code : ' ';	218	= $transport ? $transport->letter_code : ' ';
219	}	219	}
220	Koha::Patron::Message::Transport::Preferences->search({	220	Koha::Patron::MessagePreference::Transport::Preferences->search({
221	borrower_message_preference_id => $self->borrower_message_preference_id,	221	borrower_message_preference_id => $self->borrower_message_preference_id,
222	})->as_list;	222	})->as_list;
223	return $self->{'_message_transport_types'} \|\| {};	223	return $self->{'_message_transport_types'} \|\| {};
Lines 295-306 sub store { Link Here
295		295
296	# store message transport types	296	# store message transport types
297	if (exists $self->{'_message_transport_types'}) {	297	if (exists $self->{'_message_transport_types'}) {
298	Koha::Patron::Message::Transport::Preferences->search({	298	Koha::Patron::MessagePreference::Transport::Preferences->search({
299	borrower_message_preference_id =>	299	borrower_message_preference_id =>
300	$self->borrower_message_preference_id,	300	$self->borrower_message_preference_id,
301	})->delete;	301	})->delete;
302	foreach my $type (keys %{$self->{'_message_transport_types'}}) {	302	foreach my $type (keys %{$self->{'_message_transport_types'}}) {
303	Koha::Patron::Message::Transport::Preference->new({	303	Koha::Patron::MessagePreference::Transport::Preference->new({
304	borrower_message_preference_id =>	304	borrower_message_preference_id =>
305	$self->borrower_message_preference_id,	305	$self->borrower_message_preference_id,
306	message_transport_type => $type,	306	message_transport_type => $type,
Lines 315-321 sub store { Link Here
315		315
316	Makes a basic validation for object.	316	Makes a basic validation for object.
317		317
318	Returns Koha::Patron::Message::Preference object, or throws and exception.	318	Returns Koha::Patron::MessagePreference object, or throws and exception.
319		319
320	=cut	320	=cut
321		321
Lines 344-350 sub validate { Link Here
344	}	344	}
345		345
346	if (!$self->in_storage) {	346	if (!$self->in_storage) {
347	my $previous = Koha::Patron::Message::Preferences->search({	347	my $previous = Koha::Patron::MessagePreferences->search({
348	borrowernumber => $self->borrowernumber,	348	borrowernumber => $self->borrowernumber,
349	categorycode => $self->categorycode,	349	categorycode => $self->categorycode,
350	message_attribute_id => $self->message_attribute_id,	350	message_attribute_id => $self->message_attribute_id,
Lines 357-367 sub validate { Link Here
357	}	357	}
358	}	358	}
359		359
360	my $attr = Koha::Patron::Message::Attributes->find(	360	my $attr = Koha::Patron::MessagePreference::Attributes->find(
361	$self->message_attribute_id	361	$self->message_attribute_id
362	);	362	);
363	unless ($attr) {	363	unless ($attr) {
364	Koha::Exceptions::Patron::Message::Preference::AttributeNotFound->throw(	364	Koha::Exceptions::Patron::MessagePreference::AttributeNotFound->throw(
365	error => 'Message attribute with id '.$self->message_attribute_id	365	error => 'Message attribute with id '.$self->message_attribute_id
366	.' not found',	366	.' not found',
367	message_attribute_id => $self->message_attribute_id,	367	message_attribute_id => $self->message_attribute_id,
Lines 369-382 sub validate { Link Here
369	}	369	}
370	if (defined $self->days_in_advance) {	370	if (defined $self->days_in_advance) {
371	if ($attr && $attr->takes_days == 0) {	371	if ($attr && $attr->takes_days == 0) {
372	Koha::Exceptions::Patron::Message::Preference::DaysInAdvanceNotAvailable->throw(	372	Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceNotAvailable->throw(
373	error => 'days_in_advance cannot be defined for '.	373	error => 'days_in_advance cannot be defined for '.
374	$attr->message_name . '.',	374	$attr->message_name . '.',
375	message_name => $attr->message_name,	375	message_name => $attr->message_name,
376	);	376	);
377	}	377	}
378	elsif ($self->days_in_advance < 0 \|\| $self->days_in_advance > 30) {	378	elsif ($self->days_in_advance < 0 \|\| $self->days_in_advance > 30) {
379	Koha::Exceptions::Patron::Message::Preference::DaysInAdvanceOutOfRange->throw(	379	Koha::Exceptions::Patron::MessagePreference::DaysInAdvanceOutOfRange->throw(
380	error => 'days_in_advance has to be a value between 0-30 for '.	380	error => 'days_in_advance has to be a value between 0-30 for '.
381	$attr->message_name . '.',	381	$attr->message_name . '.',
382	message_name => $attr->message_name,	382	message_name => $attr->message_name,
Lines 386-403 sub validate { Link Here
386	}	386	}
387	}	387	}
388	if (defined $self->wants_digest) {	388	if (defined $self->wants_digest) {
389	my $transports = Koha::Patron::Message::Transports->search({	389	my $transports = Koha::Patron::MessagePreference::Transports->search({
390	message_attribute_id => $self->message_attribute_id,	390	message_attribute_id => $self->message_attribute_id,
391	is_digest => $self->wants_digest ? 1 : 0,	391	is_digest => $self->wants_digest ? 1 : 0,
392	});	392	});
393	unless ($transports->count) {	393	unless ($transports->count) {
394	if (!$self->wants_digest) {	394	if (!$self->wants_digest) {
395	Koha::Exceptions::Patron::Message::Preference::DigestRequired->throw(	395	Koha::Exceptions::Patron::MessagePreference::DigestRequired->throw(
396	error => 'Digest must be selected for '.$attr->message_name.'.',	396	error => 'Digest must be selected for '.$attr->message_name.'.',
397	message_name => $attr->message_name	397	message_name => $attr->message_name
398	);	398	);
399	} else {	399	} else {
400	Koha::Exceptions::Patron::Message::Preference::DigestNotAvailable->throw(	400	Koha::Exceptions::Patron::MessagePreference::DigestNotAvailable->throw(
401	error => 'Digest cannot be selected for '.$attr->message_name.'.',	401	error => 'Digest cannot be selected for '.$attr->message_name.'.',
402	message_name => $attr->message_name	402	message_name => $attr->message_name
403	);	403	);
Lines 419-430 sub _set_message_transport_types { Link Here
419	$self->_validate_message_transport_types({ message_transport_types => $types });	419	$self->_validate_message_transport_types({ message_transport_types => $types });
420	foreach my $type (@$types) {	420	foreach my $type (@$types) {
421	unless (exists $self->{'_message_transport_types'}->{$type}) {	421	unless (exists $self->{'_message_transport_types'}->{$type}) {
422	my $transport = Koha::Patron::Message::Transports->search({	422	my $transport = Koha::Patron::MessagePreference::Transports->search({
423	message_attribute_id => $self->message_attribute_id,	423	message_attribute_id => $self->message_attribute_id,
424	message_transport_type => $type	424	message_transport_type => $type
425	})->next;	425	})->next;
426	unless ($transport) {	426	unless ($transport) {
427	Koha::Exceptions::Patron::Message::Preference::NoTransportType->throw(	427	Koha::Exceptions::Patron::MessagePreference::NoTransportType->throw(
428	error => 'No transport configured for '.$self->message_name.	428	error => 'No transport configured for '.$self->message_name.
429	" transport type $type.",	429	" transport type $type.",
430	message_name => $self->message_name,	430	message_name => $self->message_name,
Lines 433-457 sub _set_message_transport_types { Link Here
433	}	433	}
434	if (defined $self->borrowernumber) {	434	if (defined $self->borrowernumber) {
435	if ( ! $self->mtt_deliverable($type) ) {	435	if ( ! $self->mtt_deliverable($type) ) {
436	Koha::Exceptions::Patron::Message::Preference::EmailAddressRequired->throw(	436	Koha::Exceptions::Patron::MessagePreference::EmailAddressRequired->throw(
437	error => 'Patron has not set email address, '.	437	error => 'Patron has not set email address, '.
438	'cannot use email as message transport',	438	'cannot use email as message transport',
439	message_name => $self->message_name,	439	message_name => $self->message_name,
440	borrowernumber => $self->borrowernumber,	440	borrowernumber => $self->borrowernumber,
441	) if $type eq 'email';	441	) if $type eq 'email';
442	Koha::Exceptions::Patron::Message::Preference::TalkingTechItivaPhoneNotificationRequired->throw(	442	Koha::Exceptions::Patron::MessagePreference::TalkingTechItivaPhoneNotificationRequired->throw(
443	error => 'System preference TalkingTechItivaPhoneNotification disabled'.	443	error => 'System preference TalkingTechItivaPhoneNotification disabled'.
444	'cannot use itiva as message transport',	444	'cannot use itiva as message transport',
445	message_name => $self->message_name,	445	message_name => $self->message_name,
446	borrowernumber => $self->borrowernumber,	446	borrowernumber => $self->borrowernumber,
447	) if $type eq 'itiva';	447	) if $type eq 'itiva';
448	Koha::Exceptions::Patron::Message::Preference::PhoneNumberRequired->throw(	448	Koha::Exceptions::Patron::MessagePreference::PhoneNumberRequired->throw(
449	error => 'Patron has not set phone number'.	449	error => 'Patron has not set phone number'.
450	'cannot use phone as message transport',	450	'cannot use phone as message transport',
451	message_name => $self->message_name,	451	message_name => $self->message_name,
452	borrowernumber => $self->borrowernumber,	452	borrowernumber => $self->borrowernumber,
453	) if $type eq 'phone';	453	) if $type eq 'phone';
454	Koha::Exceptions::Patron::Message::Preference::SMSNumberRequired->throw(	454	Koha::Exceptions::Patron::MessagePreference::SMSNumberRequired->throw(
455	error => 'Patron has not set SMS number'.	455	error => 'Patron has not set SMS number'.
456	'cannot use sms as message transport',	456	'cannot use sms as message transport',
457	message_name => $self->message_name,	457	message_name => $self->message_name,
Lines 476-485 sub _validate_message_transport_types { Link Here
476	my $types = $params->{'message_transport_types'};	476	my $types = $params->{'message_transport_types'};
477		477
478	foreach my $type (@{$types}) {	478	foreach my $type (@{$types}) {
479	unless (Koha::Patron::Message::Transport::Types->find({	479	unless (Koha::Patron::MessagePreference::Transport::Types->find({
480	message_transport_type => $type	480	message_transport_type => $type
481	})) {	481	})) {
482	Koha::Exceptions::Patron::Message::Transport::TypeNotFound->throw(	482	Koha::Exceptions::Patron::MessagePreference::Transport::TypeNotFound->throw(
483	error => "Message transport type '$type' does not exist",	483	error => "Message transport type '$type' does not exist",
484	transport_type => $type,	484	transport_type => $type,
485	);	485	);

Lines 1-4 Link Here

(-)a/Koha/Patron/Message/Attributes.pm (-4 / +4 lines)
1	package Koha::Patron::Message::Attributes;	1	package Koha::Patron::MessagePreference::Attributes;
2		2
3	# Copyright Koha-Suomi Oy 2016	3	# Copyright Koha-Suomi Oy 2016
4	#	4	#
Lines 20-32 package Koha::Patron::Message::Attributes; Link Here
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22	use Koha::Database;	22	use Koha::Database;
23	use Koha::Patron::Message::Attribute;	23	use Koha::Patron::MessagePreference::Attribute;
24		24
25	use base qw(Koha::Objects);	25	use base qw(Koha::Objects);
26		26
27	=head1 NAME	27	=head1 NAME
28		28
29	Koha::Patron::Message::Attributes - Koha Patron Message Attributes object class	29	Koha::Patron::MessagePreference::Attributes - Koha Patron Message Attributes object class
30		30
31	=head1 API	31	=head1 API
32		32
Lines 49-55 sub _type { Link Here
49	=cut	49	=cut
50		50
51	sub object_class {	51	sub object_class {
52	return 'Koha::Patron::Message::Attribute';	52	return 'Koha::Patron::MessagePreference::Attribute';
53	}	53	}
54		54
55	=head1 AUTHOR	55	=head1 AUTHOR

Lines 1-4 Link Here

(-)a/Koha/Patron/Message/Transport/Types.pm (-4 / +4 lines)
1	package Koha::Patron::Message::Transport::Types;	1	package Koha::Patron::MessagePreference::Transport::Types;
2		2
3	# Copyright Koha-Suomi Oy 2016	3	# Copyright Koha-Suomi Oy 2016
4	#	4	#
Lines 20-32 package Koha::Patron::Message::Transport::Types; Link Here
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22	use Koha::Database;	22	use Koha::Database;
23	use Koha::Patron::Message::Transport::Type;	23	use Koha::Patron::MessagePreference::Transport::Type;
24		24
25	use base qw(Koha::Objects);	25	use base qw(Koha::Objects);
26		26
27	=head1 NAME	27	=head1 NAME
28		28
29	Koha::Patron::Message::Transport::Types - Koha Patron Message Transport Types	29	Koha::Patron::MessagePreference::Transport::Types - Koha Patron Message Transport Types
30	object class	30	object class
31		31
32	=head1 API	32	=head1 API
Lines 50-56 sub _type { Link Here
50	=cut	50	=cut
51		51
52	sub object_class {	52	sub object_class {
53	return 'Koha::Patron::Message::Transport::Type';	53	return 'Koha::Patron::MessagePreference::Transport::Type';
54	}	54	}
55		55
56	=head1 AUTHOR	56	=head1 AUTHOR

Lines 1-4 Link Here

(-)a/Koha/Patron/Message/Transports.pm (-4 / +4 lines)
1	package Koha::Patron::Message::Transports;	1	package Koha::Patron::MessagePreference::Transports;
2		2
3	# Copyright Koha-Suomi Oy 2016	3	# Copyright Koha-Suomi Oy 2016
4	#	4	#
Lines 20-32 package Koha::Patron::Message::Transports; Link Here
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22	use Koha::Database;	22	use Koha::Database;
23	use Koha::Patron::Message::Transport;	23	use Koha::Patron::MessagePreference::Transport;
24		24
25	use base qw(Koha::Objects);	25	use base qw(Koha::Objects);
26		26
27	=head1 NAME	27	=head1 NAME
28		28
29	Koha::Patron::Message::Transports - Koha Patron Message Transports object class	29	Koha::Patron::MessagePreference::Transports - Koha Patron Message Transports object class
30		30
31	=head1 API	31	=head1 API
32		32
Lines 49-55 sub _type { Link Here
49	=cut	49	=cut
50		50
51	sub object_class {	51	sub object_class {
52	return 'Koha::Patron::Message::Transport';	52	return 'Koha::Patron::MessagePreference::Transport';
53	}	53	}
54		54
55	=head1 AUTHOR	55	=head1 AUTHOR

Lines 1-4 Link Here

(-)a/Koha/Patron/Message/Preferences.pm (-13 / +13 lines)
1	package Koha::Patron::Message::Preferences;	1	package Koha::Patron::MessagePreferences;
2		2
3	# Copyright Koha-Suomi Oy 2016	3	# Copyright Koha-Suomi Oy 2016
4	#	4	#
Lines 20-34 package Koha::Patron::Message::Preferences; Link Here
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22	use Koha::Database;	22	use Koha::Database;
23	use Koha::Patron::Message::Attributes;	23	use Koha::Patron::MessagePreference::Attributes;
24	use Koha::Patron::Message::Preference;	24	use Koha::Patron::MessagePreference;
25	use Koha::Patron::Message::Transports;	25	use Koha::Patron::MessagePreference::Transports;
26		26
27	use base qw(Koha::Objects);	27	use base qw(Koha::Objects);
28		28
29	=head1 NAME	29	=head1 NAME
30		30
31	Koha::Patron::Message::Preferences - Koha Patron Message Preferences object class	31	Koha::Patron::MessagePreferences - Koha Patron Message Preferences object class
32		32
33	=head1 API	33	=head1 API
34		34
Lines 38-44 Koha::Patron::Message::Preferences - Koha Patron Message Preferences object clas Link Here
38		38
39	=head3 find_with_message_name	39	=head3 find_with_message_name
40		40
41	Koha::Patron::Message::Preferences->find_with_message_name({	41	Koha::Patron::MessagePreferences->find_with_message_name({
42	borrowernumber => 123,	42	borrowernumber => 123,
43	message_name => 'Hold_Filled',	43	message_name => 'Hold_Filled',
44	});	44	});
Lines 51-57 sub find_with_message_name { Link Here
51	my ($self, $id) = @_;	51	my ($self, $id) = @_;
52		52
53	if (ref($id) eq "HASH" && $id->{'message_name'}) {	53	if (ref($id) eq "HASH" && $id->{'message_name'}) {
54	my $attr = Koha::Patron::Message::Attributes->find({	54	my $attr = Koha::Patron::MessagePreference::Attributes->find({
55	message_name => $id->{'message_name'},	55	message_name => $id->{'message_name'},
56	});	56	});
57	$id->{'message_attribute_id'} = ($attr) ?	57	$id->{'message_attribute_id'} = ($attr) ?
Lines 64-70 sub find_with_message_name { Link Here
64		64
65	=head3 get_options	65	=head3 get_options
66		66
67	my $messaging_options = Koha::Patron::Message::Preferences->get_options	67	my $messaging_options = Koha::Patron::MessagePreferences->get_options
68		68
69	Returns an ARRAYref of HASHrefs on available messaging options.	69	Returns an ARRAYref of HASHrefs on available messaging options.
70		70
Lines 73-79 Returns an ARRAYref of HASHrefs on available messaging options. Link Here
73	sub get_options {	73	sub get_options {
74	my ($self) = @_;	74	my ($self) = @_;
75		75
76	my $transports = Koha::Patron::Message::Transports->search(undef,	76	my $transports = Koha::Patron::MessagePreference::Transports->search(undef,
77	{	77	{
78	join => ['message_attribute'],	78	join => ['message_attribute'],
79	'+select' => ['message_attribute.message_name', 'message_attribute.takes_days'],	79	'+select' => ['message_attribute.message_name', 'message_attribute.takes_days'],
Lines 99-111 sub get_options { Link Here
99		99
100	=head3 search_with_message_name	100	=head3 search_with_message_name
101		101
102	Koha::Patron::Message::Preferences->search_with_message_name({	102	Koha::Patron::MessagePreferences->search_with_message_name({
103	borrowernumber => 123,	103	borrowernumber => 123,
104	message_name => 'Hold_Filled',	104	message_name => 'Hold_Filled',
105	});	105	});
106		106
107	Converts C<message_name> into C<message_attribute_id> and continues search. Use	107	Converts C<message_name> into C<message_attribute_id> and continues search. Use
108	Koha::Patron::Message::Preferences->search with a proper join for more complicated	108	Koha::Patron::MessagePreferences->search with a proper join for more complicated
109	searches.	109	searches.
110		110
111	=cut	111	=cut
Lines 114-120 sub search_with_message_name { Link Here
114	my ($self, $params, $attributes) = @_;	114	my ($self, $params, $attributes) = @_;
115		115
116	if (ref($params) eq "HASH" && $params->{'message_name'}) {	116	if (ref($params) eq "HASH" && $params->{'message_name'}) {
117	my $attr = Koha::Patron::Message::Attributes->find({	117	my $attr = Koha::Patron::MessagePreference::Attributes->find({
118	message_name => $params->{'message_name'},	118	message_name => $params->{'message_name'},
119	});	119	});
120	$params->{'message_attribute_id'} = ($attr) ?	120	$params->{'message_attribute_id'} = ($attr) ?
Lines 138-144 sub _type { Link Here
138	=cut	138	=cut
139		139
140	sub object_class {	140	sub object_class {
141	return 'Koha::Patron::Message::Preference';	141	return 'Koha::Patron::MessagePreference';
142	}	142	}
143		143
144	=head1 AUTHOR	144	=head1 AUTHOR

Lines 28-53 my $schema = Koha::Database->new->schema; Link Here

(-)a/t/db_dependent/Koha/Patron/Message/Attributes.t (-9 / +9 lines)
28	subtest 'Test class imports' => sub {	28	subtest 'Test class imports' => sub {
29	plan tests => 2;	29	plan tests => 2;
30		30
31	use_ok('Koha::Patron::Message::Attribute');	31	use_ok('Koha::Patron::MessagePreference::Attribute');
32	use_ok('Koha::Patron::Message::Attributes');	32	use_ok('Koha::Patron::MessagePreference::Attributes');
33	};	33	};
34		34
35	subtest 'Test Koha::Patron::Message::Attributes' => sub {	35	subtest 'Test Koha::Patron::MessagePreference::Attributes' => sub {
36	plan tests => 6;	36	plan tests => 6;
37		37
38	$schema->storage->txn_begin;	38	$schema->storage->txn_begin;
39		39
40	Koha::Patron::Message::Attribute->new({	40	Koha::Patron::MessagePreference::Attribute->new({
41	message_name => 'Test_Attribute'	41	message_name => 'Test_Attribute'
42	})->store;	42	})->store;
43	Koha::Patron::Message::Attribute->new({	43	Koha::Patron::MessagePreference::Attribute->new({
44	message_name => 'Test_Attribute2',	44	message_name => 'Test_Attribute2',
45	takes_days => 1	45	takes_days => 1
46	})->store;	46	})->store;
47		47
48	my $attribute = Koha::Patron::Message::Attributes->find({	48	my $attribute = Koha::Patron::MessagePreference::Attributes->find({
49	message_name => 'Test_Attribute' });	49	message_name => 'Test_Attribute' });
50	my $attribute2 = Koha::Patron::Message::Attributes->find({	50	my $attribute2 = Koha::Patron::MessagePreference::Attributes->find({
51	message_name => 'Test_Attribute2' });	51	message_name => 'Test_Attribute2' });
52		52
53	is($attribute->message_name, 'Test_Attribute',	53	is($attribute->message_name, 'Test_Attribute',
Lines 61-70 subtest 'Test Koha::Patron::Message::Attributes' => sub { Link Here
61		61
62	$attribute->delete;	62	$attribute->delete;
63	$attribute2->delete;	63	$attribute2->delete;
64	is(Koha::Patron::Message::Attributes->find({	64	is(Koha::Patron::MessagePreference::Attributes->find({
65	message_name => 'Test_Attribute' }), undef,	65	message_name => 'Test_Attribute' }), undef,
66	'Deleted the first message attribute.');	66	'Deleted the first message attribute.');
67	is(Koha::Patron::Message::Attributes->find({	67	is(Koha::Patron::MessagePreference::Attributes->find({
68	message_name => 'Test_Attribute2' }), undef,	68	message_name => 'Test_Attribute2' }), undef,
69	'Deleted the second message attribute.');	69	'Deleted the second message attribute.');
70		70

Lines 26-35 use t::lib::TestBuilder; Link Here

(-)a/t/db_dependent/Koha/Patron/Message/Transport/Preferences.t (-18 / +18 lines)
26		26
27	use Koha::Notice::Templates;	27	use Koha::Notice::Templates;
28	use Koha::Patron::Categories;	28	use Koha::Patron::Categories;
29	use Koha::Patron::Message::Attributes;	29	use Koha::Patron::MessagePreference::Attributes;
30	use Koha::Patron::Message::Preferences;	30	use Koha::Patron::MessagePreferences;
31	use Koha::Patron::Message::Transport::Types;	31	use Koha::Patron::MessagePreference::Transport::Types;
32	use Koha::Patron::Message::Transports;	32	use Koha::Patron::MessagePreference::Transports;
33	use Koha::Patrons;	33	use Koha::Patrons;
34		34
35	my $schema = Koha::Database->new->schema;	35	my $schema = Koha::Database->new->schema;
Lines 38-58 my $builder = t::lib::TestBuilder->new; Link Here
38	subtest 'Test class imports' => sub {	38	subtest 'Test class imports' => sub {
39	plan tests => 2;	39	plan tests => 2;
40		40
41	use_ok('Koha::Patron::Message::Transport::Preference');	41	use_ok('Koha::Patron::MessagePreference::Transport::Preference');
42	use_ok('Koha::Patron::Message::Transport::Preferences');	42	use_ok('Koha::Patron::MessagePreference::Transport::Preferences');
43	};	43	};
44		44
45	subtest 'Test Koha::Patron::Message::Transport::Preferences' => sub {	45	subtest 'Test Koha::Patron::MessagePreference::Transport::Preferences' => sub {
46	plan tests => 2;	46	plan tests => 2;
47		47
48	$schema->storage->txn_begin;	48	$schema->storage->txn_begin;
49		49
50	my $attribute = $builder->build_object({ class => 'Koha::Patron::Message::Attributes' });	50	my $attribute = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Attributes' });
51	my $mtt = $builder->build_object({ class => 'Koha::Patron::Message::Transport::Types' });	51	my $mtt = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });
52	my $letter = build_a_test_letter({	52	my $letter = build_a_test_letter({
53	mtt => $mtt->message_transport_type	53	mtt => $mtt->message_transport_type
54	});	54	});
55	Koha::Patron::Message::Transport->new({	55	Koha::Patron::MessagePreference::Transport->new({
56	message_attribute_id => $attribute->message_attribute_id,	56	message_attribute_id => $attribute->message_attribute_id,
57	message_transport_type => $mtt->message_transport_type,	57	message_transport_type => $mtt->message_transport_type,
58	is_digest => 0,	58	is_digest => 0,
Lines 62-68 subtest 'Test Koha::Patron::Message::Transport::Preferences' => sub { Link Here
62		62
63	subtest 'For a patron' => sub {	63	subtest 'For a patron' => sub {
64	my $patron = $builder->build_object({ class => 'Koha::Patrons' });	64	my $patron = $builder->build_object({ class => 'Koha::Patrons' });
65	my $preference = Koha::Patron::Message::Preference->new({	65	my $preference = Koha::Patron::MessagePreference->new({
66	borrowernumber => $patron->borrowernumber,	66	borrowernumber => $patron->borrowernumber,
67	message_attribute_id => $attribute->message_attribute_id,	67	message_attribute_id => $attribute->message_attribute_id,
68	wants_digest => 0,	68	wants_digest => 0,
Lines 70-84 subtest 'Test Koha::Patron::Message::Transport::Preferences' => sub { Link Here
70	})->store;	70	})->store;
71		71
72	my $pref_id = $preference->borrower_message_preference_id;	72	my $pref_id = $preference->borrower_message_preference_id;
73	my $transport_pref = Koha::Patron::Message::Transport::Preference->new({	73	my $transport_pref = Koha::Patron::MessagePreference::Transport::Preference->new({
74	borrower_message_preference_id => $pref_id,	74	borrower_message_preference_id => $pref_id,
75	message_transport_type => $mtt->message_transport_type,	75	message_transport_type => $mtt->message_transport_type,
76	})->store;	76	})->store;
77	is(ref($transport_pref), 'Koha::Patron::Message::Transport::Preference',	77	is(ref($transport_pref), 'Koha::Patron::MessagePreference::Transport::Preference',
78	'Added a new messaging transport preference for patron.');	78	'Added a new messaging transport preference for patron.');
79		79
80	$transport_pref->delete;	80	$transport_pref->delete;
81	is(Koha::Patron::Message::Transport::Preferences->search({	81	is(Koha::Patron::MessagePreference::Transport::Preferences->search({
82	borrower_message_preference_id => $pref_id,	82	borrower_message_preference_id => $pref_id,
83	message_transport_type => $mtt->message_transport_type,	83	message_transport_type => $mtt->message_transport_type,
84	})->count, 0, 'Deleted the messaging transport preference.');	84	})->count, 0, 'Deleted the messaging transport preference.');
Lines 86-92 subtest 'Test Koha::Patron::Message::Transport::Preferences' => sub { Link Here
86		86
87	subtest 'For a category' => sub {	87	subtest 'For a category' => sub {
88	my $category = $builder->build_object({ class => 'Koha::Patron::Categories' });	88	my $category = $builder->build_object({ class => 'Koha::Patron::Categories' });
89	my $preference = Koha::Patron::Message::Preference->new({	89	my $preference = Koha::Patron::MessagePreference->new({
90	categorycode => $category->categorycode,	90	categorycode => $category->categorycode,
91	message_attribute_id => $attribute->message_attribute_id,	91	message_attribute_id => $attribute->message_attribute_id,
92	wants_digest => 0,	92	wants_digest => 0,
Lines 94-108 subtest 'Test Koha::Patron::Message::Transport::Preferences' => sub { Link Here
94	})->store;	94	})->store;
95		95
96	my $pref_id = $preference->borrower_message_preference_id;	96	my $pref_id = $preference->borrower_message_preference_id;
97	my $transport_pref = Koha::Patron::Message::Transport::Preference->new({	97	my $transport_pref = Koha::Patron::MessagePreference::Transport::Preference->new({
98	borrower_message_preference_id => $pref_id,	98	borrower_message_preference_id => $pref_id,
99	message_transport_type => $mtt->message_transport_type,	99	message_transport_type => $mtt->message_transport_type,
100	})->store;	100	})->store;
101	is(ref($transport_pref), 'Koha::Patron::Message::Transport::Preference',	101	is(ref($transport_pref), 'Koha::Patron::MessagePreference::Transport::Preference',
102	'Added a new messaging transport preference for category.');	102	'Added a new messaging transport preference for category.');
103		103
104	$transport_pref->delete;	104	$transport_pref->delete;
105	is(Koha::Patron::Message::Transport::Preferences->search({	105	is(Koha::Patron::MessagePreference::Transport::Preferences->search({
106	borrower_message_preference_id => $pref_id,	106	borrower_message_preference_id => $pref_id,
107	message_transport_type => $mtt->message_transport_type,	107	message_transport_type => $mtt->message_transport_type,
108	})->count, 0, 'Deleted the messaging transport preference.');	108	})->count, 0, 'Deleted the messaging transport preference.');

Lines 24-31 use Test::More tests => 2; Link Here

(-)a/t/db_dependent/Koha/Patron/Message/Transports.t (-9 / +9 lines)
24	use t::lib::TestBuilder;	24	use t::lib::TestBuilder;
25		25
26	use Koha::Notice::Templates;	26	use Koha::Notice::Templates;
27	use Koha::Patron::Message::Attributes;	27	use Koha::Patron::MessagePreference::Attributes;
28	use Koha::Patron::Message::Transport::Types;	28	use Koha::Patron::MessagePreference::Transport::Types;
29		29
30	my $schema = Koha::Database->new->schema;	30	my $schema = Koha::Database->new->schema;
31	my $builder = t::lib::TestBuilder->new;	31	my $builder = t::lib::TestBuilder->new;
Lines 33-54 my $builder = t::lib::TestBuilder->new; Link Here
33	subtest 'Test class imports' => sub {	33	subtest 'Test class imports' => sub {
34	plan tests => 2;	34	plan tests => 2;
35		35
36	use_ok('Koha::Patron::Message::Transport');	36	use_ok('Koha::Patron::MessagePreference::Transport');
37	use_ok('Koha::Patron::Message::Transports');	37	use_ok('Koha::Patron::MessagePreference::Transports');
38	};	38	};
39		39
40	subtest 'Test Koha::Patron::Message::Transports' => sub {	40	subtest 'Test Koha::Patron::MessagePreference::Transports' => sub {
41	plan tests => 2;	41	plan tests => 2;
42		42
43	$schema->storage->txn_begin;	43	$schema->storage->txn_begin;
44		44
45	my $attribute = $builder->build_object({ class => 'Koha::Patron::Message::Attributes' });	45	my $attribute = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Attributes' });
46	my $mtt = $builder->build_object({ class => 'Koha::Patron::Message::Transport::Types' });	46	my $mtt = $builder->build_object({ class => 'Koha::Patron::MessagePreference::Transport::Types' });
47	my $letter = build_a_test_letter({	47	my $letter = build_a_test_letter({
48	mtt => $mtt->message_transport_type	48	mtt => $mtt->message_transport_type
49	});	49	});
50		50
51	my $transport = Koha::Patron::Message::Transport->new({	51	my $transport = Koha::Patron::MessagePreference::Transport->new({
52	message_attribute_id => $attribute->message_attribute_id,	52	message_attribute_id => $attribute->message_attribute_id,
53	message_transport_type => $mtt->message_transport_type,	53	message_transport_type => $mtt->message_transport_type,
54	is_digest => 0,	54	is_digest => 0,
Lines 60-66 subtest 'Test Koha::Patron::Message::Transports' => sub { Link Here
60	'Added a new messaging transport.');	60	'Added a new messaging transport.');
61		61
62	$transport->delete;	62	$transport->delete;
63	is(Koha::Patron::Message::Transports->search({	63	is(Koha::Patron::MessagePreference::Transports->search({
64	message_attribute_id => $attribute->message_attribute_id,	64	message_attribute_id => $attribute->message_attribute_id,
65	message_transport_type => $mtt->message_transport_type,	65	message_transport_type => $mtt->message_transport_type,
66	is_digest => 0	66	is_digest => 0