Lines 112-119
my $my_message = {
Link Here
|
112 |
to_address => undef, |
112 |
to_address => undef, |
113 |
from_address => 'from@example.com', |
113 |
from_address => 'from@example.com', |
114 |
}; |
114 |
}; |
115 |
my $message_id = C4::Letters::EnqueueLetter($my_message); |
115 |
is( C4::Letters::EnqueueLetter($my_message), undef, 'EnqueueLetter without the letter argument returns undef' ); |
116 |
is( $message_id, undef, 'EnqueueLetter without the letter argument returns undef' ); |
|
|
117 |
|
116 |
|
118 |
delete $my_message->{message_transport_type}; |
117 |
delete $my_message->{message_transport_type}; |
119 |
$my_message->{letter} = { |
118 |
$my_message->{letter} = { |
Lines 124-136
$my_message->{letter} = {
Link Here
|
124 |
content_type => 'text/plain', |
123 |
content_type => 'text/plain', |
125 |
}; |
124 |
}; |
126 |
|
125 |
|
127 |
$message_id = C4::Letters::EnqueueLetter($my_message); |
126 |
my @message_ids = C4::Letters::EnqueueLetter($my_message); |
128 |
is( $message_id, undef, 'EnqueueLetter without the message type argument argument returns undef' ); |
127 |
is( scalar @message_ids, 0, 'EnqueueLetter without the message type argument argument returns an empty list' ); |
129 |
|
128 |
|
130 |
$my_message->{message_transport_type} = 'sms'; |
129 |
$my_message->{message_transport_type} = 'sms'; |
131 |
$message_id = C4::Letters::EnqueueLetter($my_message); |
130 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
132 |
ok(defined $message_id && $message_id > 0, 'new message successfully queued'); |
131 |
is(scalar @message_ids, 1, 'new message successfully queued'); |
133 |
|
|
|
134 |
|
132 |
|
135 |
# GetQueuedMessages |
133 |
# GetQueuedMessages |
136 |
my $messages = C4::Letters::GetQueuedMessages(); |
134 |
my $messages = C4::Letters::GetQueuedMessages(); |
Lines 138-144
is( @$messages, 1, 'GetQueuedMessages without argument returns all the entries'
Link Here
|
138 |
|
136 |
|
139 |
$messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber }); |
137 |
$messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber }); |
140 |
is( @$messages, 1, 'one message stored for the borrower' ); |
138 |
is( @$messages, 1, 'one message stored for the borrower' ); |
141 |
is( $messages->[0]->{message_id}, $message_id, 'EnqueueLetter returns the message id correctly' ); |
|
|
142 |
is( $messages->[0]->{borrowernumber}, $borrowernumber, 'EnqueueLetter stores the borrower number correctly' ); |
139 |
is( $messages->[0]->{borrowernumber}, $borrowernumber, 'EnqueueLetter stores the borrower number correctly' ); |
143 |
is( $messages->[0]->{subject}, $my_message->{letter}->{title}, 'EnqueueLetter stores the subject correctly' ); |
140 |
is( $messages->[0]->{subject}, $my_message->{letter}->{title}, 'EnqueueLetter stores the subject correctly' ); |
144 |
is( $messages->[0]->{content}, $my_message->{letter}->{content}, 'EnqueueLetter stores the content correctly' ); |
141 |
is( $messages->[0]->{content}, $my_message->{letter}->{content}, 'EnqueueLetter stores the content correctly' ); |
Lines 847-854
subtest 'Test SMS handling in SendQueuedMessages' => sub {
Link Here
|
847 |
is( $@, '', 'SendQueuedMessages should not explode if the patron does not have a sms provider set' ); |
844 |
is( $@, '', 'SendQueuedMessages should not explode if the patron does not have a sms provider set' ); |
848 |
|
845 |
|
849 |
my $sms_pro = $builder->build_object({ class => 'Koha::SMS::Providers', value => { domain => 'kidclamp.rocks' } }); |
846 |
my $sms_pro = $builder->build_object({ class => 'Koha::SMS::Providers', value => { domain => 'kidclamp.rocks' } }); |
850 |
$patron->set( { smsalertnumber => '5555555555', sms_provider_id => $sms_pro->id() } )->store; |
847 |
$patron->set( { smsalertnumber => '5555555555', sms_provider_id => $sms_pro->id(), email => '', emailpro => '' } )->store; |
851 |
$message_id = C4::Letters::EnqueueLetter($my_message); #using datas set around line 95 and forward |
848 |
C4::Letters::EnqueueLetter($my_message); #using datas set around line 95 and forward |
852 |
|
849 |
|
853 |
warning_like { C4::Letters::SendQueuedMessages(); } |
850 |
warning_like { C4::Letters::SendQueuedMessages(); } |
854 |
qr|Fake send_or_die|, |
851 |
qr|Fake send_or_die|, |
Lines 871-877
subtest 'Test SMS handling in SendQueuedMessages' => sub {
Link Here
|
871 |
|
868 |
|
872 |
t::lib::Mocks::mock_preference('EmailSMSSendDriverFromAddress', 'override@example.com'); |
869 |
t::lib::Mocks::mock_preference('EmailSMSSendDriverFromAddress', 'override@example.com'); |
873 |
|
870 |
|
874 |
$message_id = C4::Letters::EnqueueLetter($my_message); |
871 |
C4::Letters::EnqueueLetter($my_message); |
875 |
warning_like { C4::Letters::SendQueuedMessages(); } |
872 |
warning_like { C4::Letters::SendQueuedMessages(); } |
876 |
qr|Fake send_or_die|, |
873 |
qr|Fake send_or_die|, |
877 |
"SendAlerts is using the mocked send_or_die routine (claimissues)"; |
874 |
"SendAlerts is using the mocked send_or_die routine (claimissues)"; |
Lines 889-895
subtest 'Test SMS handling in SendQueuedMessages' => sub {
Link Here
|
889 |
|
886 |
|
890 |
$schema->resultset('MessageQueue')->search({borrowernumber => $borrowernumber,status => 'sent'})->delete(); #clear borrower queue |
887 |
$schema->resultset('MessageQueue')->search({borrowernumber => $borrowernumber,status => 'sent'})->delete(); #clear borrower queue |
891 |
$my_message->{to_address} = 'fixme@kidclamp.iswrong'; |
888 |
$my_message->{to_address} = 'fixme@kidclamp.iswrong'; |
892 |
$message_id = C4::Letters::EnqueueLetter($my_message); |
889 |
C4::Letters::EnqueueLetter($my_message); |
893 |
|
890 |
|
894 |
my $number_attempted = C4::Letters::SendQueuedMessages({ |
891 |
my $number_attempted = C4::Letters::SendQueuedMessages({ |
895 |
borrowernumber => -1, # -1 still triggers the borrowernumber condition |
892 |
borrowernumber => -1, # -1 still triggers the borrowernumber condition |
Lines 903-908
subtest 'Test SMS handling in SendQueuedMessages' => sub {
Link Here
|
903 |
|
900 |
|
904 |
my $sms_message_address = $schema->resultset('MessageQueue')->search({ |
901 |
my $sms_message_address = $schema->resultset('MessageQueue')->search({ |
905 |
borrowernumber => $borrowernumber, |
902 |
borrowernumber => $borrowernumber, |
|
|
903 |
message_transport_type => 'sms', |
906 |
status => 'sent' |
904 |
status => 'sent' |
907 |
})->next()->to_address(); |
905 |
})->next()->to_address(); |
908 |
is( $sms_message_address, '5555555555@kidclamp.rocks', 'SendQueuedMessages populates the to address correctly for SMS by email when to_address is set incorrectly' ); |
906 |
is( $sms_message_address, '5555555555@kidclamp.rocks', 'SendQueuedMessages populates the to address correctly for SMS by email when to_address is set incorrectly' ); |
Lines 1091-1097
subtest 'Test message_id parameter for SendQueuedMessages' => sub {
Link Here
|
1091 |
'message_transport_type' => 'email', |
1089 |
'message_transport_type' => 'email', |
1092 |
'from_address' => '@example.com' # invalid from_address |
1090 |
'from_address' => '@example.com' # invalid from_address |
1093 |
}; |
1091 |
}; |
1094 |
my $message_id = C4::Letters::EnqueueLetter($my_message); |
1092 |
my ($message_id) = C4::Letters::EnqueueLetter($my_message); |
1095 |
my $processed = C4::Letters::SendQueuedMessages( { message_id => $message_id } ); |
1093 |
my $processed = C4::Letters::SendQueuedMessages( { message_id => $message_id } ); |
1096 |
is( $processed, 1, 'Processed 1 message when one message_id passed' ); |
1094 |
is( $processed, 1, 'Processed 1 message when one message_id passed' ); |
1097 |
my $message_1 = C4::Letters::GetMessage($message_id); |
1095 |
my $message_1 = C4::Letters::GetMessage($message_id); |
Lines 1099-1105
subtest 'Test message_id parameter for SendQueuedMessages' => sub {
Link Here
|
1099 |
is( $message_1->{failure_code}, 'INVALID_EMAIL:from', 'Failure code set correctly for invalid email parameter'); |
1097 |
is( $message_1->{failure_code}, 'INVALID_EMAIL:from', 'Failure code set correctly for invalid email parameter'); |
1100 |
|
1098 |
|
1101 |
$my_message->{from_address} = 'root@example.org'; # valid from_address |
1099 |
$my_message->{from_address} = 'root@example.org'; # valid from_address |
1102 |
$message_id = C4::Letters::EnqueueLetter($my_message); |
1100 |
($message_id) = C4::Letters::EnqueueLetter($my_message); |
1103 |
warning_like { C4::Letters::SendQueuedMessages( { message_id => $message_id } ); } |
1101 |
warning_like { C4::Letters::SendQueuedMessages( { message_id => $message_id } ); } |
1104 |
qr|Fake send_or_die|, |
1102 |
qr|Fake send_or_die|, |
1105 |
"SendQueuedMessages is using the mocked send_or_die routine"; |
1103 |
"SendQueuedMessages is using the mocked send_or_die routine"; |
Lines 1108-1110
subtest 'Test message_id parameter for SendQueuedMessages' => sub {
Link Here
|
1108 |
is( $message_1->{status}, 'failed', 'Message 1 status is unchanged' ); |
1106 |
is( $message_1->{status}, 'failed', 'Message 1 status is unchanged' ); |
1109 |
is( $message_2->{status}, 'sent', 'Valid from_address => status sent' ); |
1107 |
is( $message_2->{status}, 'sent', 'Valid from_address => status sent' ); |
1110 |
}; |
1108 |
}; |
|
|
1109 |
|
1110 |
subtest 'EnqueueLetter and AutoEmailPrimaryAddress' => sub { |
1111 |
plan tests => 19; |
1112 |
|
1113 |
my ( $email, $emailpro ) = ( 'email@example.org', 'emailpro@example.org' ); |
1114 |
my $borrowernumber = Koha::Patron->new( |
1115 |
{ firstname => 'Jane', |
1116 |
surname => 'Smith', |
1117 |
categorycode => $patron_category, |
1118 |
branchcode => $library->{branchcode}, |
1119 |
dateofbirth => $date, |
1120 |
smsalertnumber => undef, |
1121 |
email => $email, |
1122 |
emailpro => $emailpro, |
1123 |
} |
1124 |
)->store->borrowernumber; |
1125 |
|
1126 |
my $my_message = { |
1127 |
borrowernumber => $borrowernumber, |
1128 |
message_transport_type => 'email', |
1129 |
to_address => 'to@example.com', |
1130 |
from_address => 'from@example.com', |
1131 |
letter => { |
1132 |
content => 'a message', |
1133 |
title => 'message title', |
1134 |
metadata => 'metadata', |
1135 |
code => 'TEST_MESSAGE', |
1136 |
content_type => 'text/plain', |
1137 |
}, |
1138 |
}; |
1139 |
|
1140 |
$dbh->do(q|DELETE FROM message_queue|); |
1141 |
t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'email' ); |
1142 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1143 |
is( scalar @message_ids, 1, 'message successfully queued' ); |
1144 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1145 |
is( scalar(@$messages), 1, 'The message has been queued for the expected patron' ); |
1146 |
is( $messages->[0]{to_address}, 'to@example.com', 'AutoEmailPrimaryAddress=email, EnqueueLetter used the to_address given in parameter' ); |
1147 |
|
1148 |
$dbh->do(q|DELETE FROM message_queue|); |
1149 |
delete $my_message->{to_address}; |
1150 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1151 |
is( scalar @message_ids, 1, 'message successfully queued' ); |
1152 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1153 |
is( scalar(@$messages), 1, 'The message has been queued for the expected patron' ); |
1154 |
is( $messages->[0]{to_address}, $email, 'AutoEmailPrimaryAddress=email, EnqueueLetter used the patron email address if no to_address is given in parameter' ); |
1155 |
|
1156 |
$dbh->do(q|DELETE FROM message_queue|); |
1157 |
t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'emailpro' ); |
1158 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1159 |
is( scalar @message_ids, 1, 'message successfully queued' ); |
1160 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1161 |
is( scalar(@$messages), 1, 'The message has been queued for the expected patron' ); |
1162 |
is( $messages->[0]{to_address}, $emailpro, 'AutoEmailPrimaryAddress=emailpro, EnqueueLetter used the patron emailpro address if no to_address is given in parameter' ); |
1163 |
|
1164 |
$dbh->do(q|DELETE FROM message_queue|); |
1165 |
t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'OFF' ); |
1166 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1167 |
is( scalar @message_ids, 1, 'message successfully queued' ); |
1168 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1169 |
is( scalar(@$messages), 1, 'The message has been queued for the expected patron' ); |
1170 |
is( $messages->[0]{to_address}, $email, 'AutoEmailPrimaryAddress=OFF, EnqueueLetter used the patron email address if no to_address is given in parameter' ); |
1171 |
|
1172 |
$dbh->do(q|DELETE FROM message_queue|); |
1173 |
t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'email,OFF,emailpro' ); # This is no consistent. OFF should be alone. |
1174 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1175 |
is( scalar @message_ids, 1, 'message successfully queued' ); |
1176 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1177 |
is( scalar(@$messages), 1, 'The message has been queued for the expected patron' ); |
1178 |
is( $messages->[0]{to_address}, $email, 'AutoEmailPrimaryAddress=email,OFF,emailpro, EnqueueLetter used the patron email address if no to_address is given in parameter' ); |
1179 |
|
1180 |
$dbh->do(q|DELETE FROM message_queue|); |
1181 |
t::lib::Mocks::mock_preference( 'AutoEmailPrimaryAddress', 'email,emailpro' ); |
1182 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1183 |
is( scalar @message_ids, 2, 'messages successfully queued' ); |
1184 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1185 |
is( scalar(@$messages), 2, 'The messages have been queued for the expected patron' ); |
1186 |
is( $messages->[0]{to_address}, $email, 'AutoEmailPrimaryAddress=email,emailpro, EnqueueLetter used the patron email address for the first letter' ); |
1187 |
is( $messages->[1]{to_address}, $emailpro, 'AutoEmailPrimaryAddress=email,emailpro, EnqueueLetter used the patron emailpro address for the second letter' ); |
1188 |
}; |