Lines 117-124
my $my_message = {
Link Here
|
117 |
to_address => undef, |
117 |
to_address => undef, |
118 |
from_address => 'from@example.com', |
118 |
from_address => 'from@example.com', |
119 |
}; |
119 |
}; |
120 |
my $message_id = C4::Letters::EnqueueLetter($my_message); |
120 |
is( C4::Letters::EnqueueLetter($my_message), undef, 'EnqueueLetter without the letter argument returns undef' ); |
121 |
is( $message_id, undef, 'EnqueueLetter without the letter argument returns undef' ); |
|
|
122 |
|
121 |
|
123 |
delete $my_message->{message_transport_type}; |
122 |
delete $my_message->{message_transport_type}; |
124 |
$my_message->{letter} = { |
123 |
$my_message->{letter} = { |
Lines 129-141
$my_message->{letter} = {
Link Here
|
129 |
content_type => 'text/plain', |
128 |
content_type => 'text/plain', |
130 |
}; |
129 |
}; |
131 |
|
130 |
|
132 |
$message_id = C4::Letters::EnqueueLetter($my_message); |
131 |
my @message_ids = C4::Letters::EnqueueLetter($my_message); |
133 |
is( $message_id, undef, 'EnqueueLetter without the message type argument argument returns undef' ); |
132 |
is( scalar @message_ids, 0, 'EnqueueLetter without the message type argument argument returns an empty list' ); |
134 |
|
133 |
|
135 |
$my_message->{message_transport_type} = 'sms'; |
134 |
$my_message->{message_transport_type} = 'sms'; |
136 |
$message_id = C4::Letters::EnqueueLetter($my_message); |
135 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
137 |
ok(defined $message_id && $message_id > 0, 'new message successfully queued'); |
136 |
is(scalar @message_ids, 1, 'new message successfully queued'); |
138 |
|
|
|
139 |
|
137 |
|
140 |
# GetQueuedMessages |
138 |
# GetQueuedMessages |
141 |
my $messages = C4::Letters::GetQueuedMessages(); |
139 |
my $messages = C4::Letters::GetQueuedMessages(); |
Lines 143-149
is( @$messages, 1, 'GetQueuedMessages without argument returns all the entries'
Link Here
|
143 |
|
141 |
|
144 |
$messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber }); |
142 |
$messages = C4::Letters::GetQueuedMessages({ borrowernumber => $borrowernumber }); |
145 |
is( @$messages, 1, 'one message stored for the borrower' ); |
143 |
is( @$messages, 1, 'one message stored for the borrower' ); |
146 |
is( $messages->[0]->{message_id}, $message_id, 'EnqueueLetter returns the message id correctly' ); |
|
|
147 |
is( $messages->[0]->{borrowernumber}, $borrowernumber, 'EnqueueLetter stores the borrower number correctly' ); |
144 |
is( $messages->[0]->{borrowernumber}, $borrowernumber, 'EnqueueLetter stores the borrower number correctly' ); |
148 |
is( $messages->[0]->{subject}, $my_message->{letter}->{title}, 'EnqueueLetter stores the subject correctly' ); |
145 |
is( $messages->[0]->{subject}, $my_message->{letter}->{title}, 'EnqueueLetter stores the subject correctly' ); |
149 |
is( $messages->[0]->{content}, $my_message->{letter}->{content}, 'EnqueueLetter stores the content correctly' ); |
146 |
is( $messages->[0]->{content}, $my_message->{letter}->{content}, 'EnqueueLetter stores the content correctly' ); |
Lines 863-870
subtest 'Test SMS handling in SendQueuedMessages' => sub {
Link Here
|
863 |
is( $@, '', 'SendQueuedMessages should not explode if the patron does not have a sms provider set' ); |
860 |
is( $@, '', 'SendQueuedMessages should not explode if the patron does not have a sms provider set' ); |
864 |
|
861 |
|
865 |
my $sms_pro = $builder->build_object({ class => 'Koha::SMS::Providers', value => { domain => 'kidclamp.rocks' } }); |
862 |
my $sms_pro = $builder->build_object({ class => 'Koha::SMS::Providers', value => { domain => 'kidclamp.rocks' } }); |
866 |
$patron->set( { smsalertnumber => '5555555555', sms_provider_id => $sms_pro->id() } )->store; |
863 |
$patron->set( { smsalertnumber => '5555555555', sms_provider_id => $sms_pro->id(), email => '', emailpro => '' } )->store; |
867 |
$message_id = C4::Letters::EnqueueLetter($my_message); #using datas set around line 95 and forward |
864 |
C4::Letters::EnqueueLetter($my_message); #using datas set around line 95 and forward |
868 |
|
865 |
|
869 |
warning_like { C4::Letters::SendQueuedMessages(); } |
866 |
warning_like { C4::Letters::SendQueuedMessages(); } |
870 |
qr|Fake send_or_die|, |
867 |
qr|Fake send_or_die|, |
Lines 887-893
subtest 'Test SMS handling in SendQueuedMessages' => sub {
Link Here
|
887 |
|
884 |
|
888 |
t::lib::Mocks::mock_preference('EmailSMSSendDriverFromAddress', 'override@example.com'); |
885 |
t::lib::Mocks::mock_preference('EmailSMSSendDriverFromAddress', 'override@example.com'); |
889 |
|
886 |
|
890 |
$message_id = C4::Letters::EnqueueLetter($my_message); |
887 |
C4::Letters::EnqueueLetter($my_message); |
891 |
warning_like { C4::Letters::SendQueuedMessages(); } |
888 |
warning_like { C4::Letters::SendQueuedMessages(); } |
892 |
qr|Fake send_or_die|, |
889 |
qr|Fake send_or_die|, |
893 |
"SendAlerts is using the mocked send_or_die routine (claimissues)"; |
890 |
"SendAlerts is using the mocked send_or_die routine (claimissues)"; |
Lines 905-911
subtest 'Test SMS handling in SendQueuedMessages' => sub {
Link Here
|
905 |
|
902 |
|
906 |
$schema->resultset('MessageQueue')->search({borrowernumber => $borrowernumber,status => 'sent'})->delete(); #clear borrower queue |
903 |
$schema->resultset('MessageQueue')->search({borrowernumber => $borrowernumber,status => 'sent'})->delete(); #clear borrower queue |
907 |
$my_message->{to_address} = 'fixme@kidclamp.iswrong'; |
904 |
$my_message->{to_address} = 'fixme@kidclamp.iswrong'; |
908 |
$message_id = C4::Letters::EnqueueLetter($my_message); |
905 |
C4::Letters::EnqueueLetter($my_message); |
909 |
|
906 |
|
910 |
my $number_attempted = C4::Letters::SendQueuedMessages({ |
907 |
my $number_attempted = C4::Letters::SendQueuedMessages({ |
911 |
borrowernumber => -1, # -1 still triggers the borrowernumber condition |
908 |
borrowernumber => -1, # -1 still triggers the borrowernumber condition |
Lines 919-924
subtest 'Test SMS handling in SendQueuedMessages' => sub {
Link Here
|
919 |
|
916 |
|
920 |
my $sms_message_address = $schema->resultset('MessageQueue')->search({ |
917 |
my $sms_message_address = $schema->resultset('MessageQueue')->search({ |
921 |
borrowernumber => $borrowernumber, |
918 |
borrowernumber => $borrowernumber, |
|
|
919 |
message_transport_type => 'sms', |
922 |
status => 'sent' |
920 |
status => 'sent' |
923 |
})->next()->to_address(); |
921 |
})->next()->to_address(); |
924 |
is( $sms_message_address, '5555555555@kidclamp.rocks', 'SendQueuedMessages populates the to address correctly for SMS by email when to_address is set incorrectly' ); |
922 |
is( $sms_message_address, '5555555555@kidclamp.rocks', 'SendQueuedMessages populates the to address correctly for SMS by email when to_address is set incorrectly' ); |
Lines 1157-1163
subtest 'Test message_id parameter for SendQueuedMessages' => sub {
Link Here
|
1157 |
'message_transport_type' => 'email', |
1155 |
'message_transport_type' => 'email', |
1158 |
'from_address' => '@example.com' # invalid from_address |
1156 |
'from_address' => '@example.com' # invalid from_address |
1159 |
}; |
1157 |
}; |
1160 |
my $message_id = C4::Letters::EnqueueLetter($my_message); |
1158 |
my ($message_id) = C4::Letters::EnqueueLetter($my_message); |
1161 |
$send_or_die_count = 0; # reset |
1159 |
$send_or_die_count = 0; # reset |
1162 |
my $processed = C4::Letters::SendQueuedMessages( { message_id => $message_id } ); |
1160 |
my $processed = C4::Letters::SendQueuedMessages( { message_id => $message_id } ); |
1163 |
is( $send_or_die_count, 0, 'Nothing sent when one message_id passed' ); |
1161 |
is( $send_or_die_count, 0, 'Nothing sent when one message_id passed' ); |
Lines 1166-1172
subtest 'Test message_id parameter for SendQueuedMessages' => sub {
Link Here
|
1166 |
is( $message_1->{failure_code}, 'INVALID_EMAIL:from', 'Failure code set correctly for invalid email parameter'); |
1164 |
is( $message_1->{failure_code}, 'INVALID_EMAIL:from', 'Failure code set correctly for invalid email parameter'); |
1167 |
|
1165 |
|
1168 |
$my_message->{from_address} = 'root@example.org'; # valid from_address |
1166 |
$my_message->{from_address} = 'root@example.org'; # valid from_address |
1169 |
$message_id = C4::Letters::EnqueueLetter($my_message); |
1167 |
($message_id) = C4::Letters::EnqueueLetter($my_message); |
1170 |
warning_like { C4::Letters::SendQueuedMessages( { message_id => $message_id } ); } |
1168 |
warning_like { C4::Letters::SendQueuedMessages( { message_id => $message_id } ); } |
1171 |
qr|Fake send_or_die|, |
1169 |
qr|Fake send_or_die|, |
1172 |
"SendQueuedMessages is using the mocked send_or_die routine"; |
1170 |
"SendQueuedMessages is using the mocked send_or_die routine"; |
Lines 1176-1178
subtest 'Test message_id parameter for SendQueuedMessages' => sub {
Link Here
|
1176 |
is( $message_1->{status}, 'failed', 'Message 1 status is unchanged' ); |
1174 |
is( $message_1->{status}, 'failed', 'Message 1 status is unchanged' ); |
1177 |
is( $message_2->{status}, 'sent', 'Valid from_address => status sent' ); |
1175 |
is( $message_2->{status}, 'sent', 'Valid from_address => status sent' ); |
1178 |
}; |
1176 |
}; |
|
|
1177 |
|
1178 |
subtest 'EnqueueLetter and EmailFieldPrimary' => sub { |
1179 |
plan tests => 19; |
1180 |
|
1181 |
my ( $email, $emailpro ) = ( 'email@example.org', 'emailpro@example.org' ); |
1182 |
my $borrowernumber = Koha::Patron->new( |
1183 |
{ firstname => 'Jane', |
1184 |
surname => 'Smith', |
1185 |
categorycode => $patron_category, |
1186 |
branchcode => $library->{branchcode}, |
1187 |
dateofbirth => $date, |
1188 |
smsalertnumber => undef, |
1189 |
email => $email, |
1190 |
emailpro => $emailpro, |
1191 |
} |
1192 |
)->store->borrowernumber; |
1193 |
|
1194 |
my $my_message = { |
1195 |
borrowernumber => $borrowernumber, |
1196 |
message_transport_type => 'email', |
1197 |
to_address => 'to@example.com', |
1198 |
from_address => 'from@example.com', |
1199 |
letter => { |
1200 |
content => 'a message', |
1201 |
title => 'message title', |
1202 |
metadata => 'metadata', |
1203 |
code => 'TEST_MESSAGE', |
1204 |
content_type => 'text/plain', |
1205 |
}, |
1206 |
}; |
1207 |
|
1208 |
$dbh->do(q|DELETE FROM message_queue|); |
1209 |
t::lib::Mocks::mock_preference( 'EmailFieldPrimary', 'email' ); |
1210 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1211 |
is( scalar @message_ids, 1, 'message successfully queued' ); |
1212 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1213 |
is( scalar(@$messages), 1, 'The message has been queued for the expected patron' ); |
1214 |
is( $messages->[0]{to_address}, 'to@example.com', 'EmailFieldPrimary=email, EnqueueLetter used the to_address given in parameter' ); |
1215 |
|
1216 |
$dbh->do(q|DELETE FROM message_queue|); |
1217 |
delete $my_message->{to_address}; |
1218 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1219 |
is( scalar @message_ids, 1, 'message successfully queued' ); |
1220 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1221 |
is( scalar(@$messages), 1, 'The message has been queued for the expected patron' ); |
1222 |
is( $messages->[0]{to_address}, $email, 'EmailFieldPrimary=email, EnqueueLetter used the patron email address if no to_address is given in parameter' ); |
1223 |
|
1224 |
$dbh->do(q|DELETE FROM message_queue|); |
1225 |
t::lib::Mocks::mock_preference( 'EmailFieldPrimary', 'emailpro' ); |
1226 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1227 |
is( scalar @message_ids, 1, 'message successfully queued' ); |
1228 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1229 |
is( scalar(@$messages), 1, 'The message has been queued for the expected patron' ); |
1230 |
is( $messages->[0]{to_address}, $emailpro, 'EmailFieldPrimary=emailpro, EnqueueLetter used the patron emailpro address if no to_address is given in parameter' ); |
1231 |
|
1232 |
$dbh->do(q|DELETE FROM message_queue|); |
1233 |
t::lib::Mocks::mock_preference( 'EmailFieldPrimary', 'OFF' ); |
1234 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1235 |
is( scalar @message_ids, 1, 'message successfully queued' ); |
1236 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1237 |
is( scalar(@$messages), 1, 'The message has been queued for the expected patron' ); |
1238 |
is( $messages->[0]{to_address}, $email, 'EmailFieldPrimary=OFF, EnqueueLetter used the patron email address if no to_address is given in parameter' ); |
1239 |
|
1240 |
$dbh->do(q|DELETE FROM message_queue|); |
1241 |
t::lib::Mocks::mock_preference( 'EmailFieldPrimary', 'email,OFF,emailpro' ); # This is no consistent. OFF should be alone. |
1242 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1243 |
is( scalar @message_ids, 1, 'message successfully queued' ); |
1244 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1245 |
is( scalar(@$messages), 1, 'The message has been queued for the expected patron' ); |
1246 |
is( $messages->[0]{to_address}, $email, 'EmailFieldPrimary=email,OFF,emailpro, EnqueueLetter used the patron email address if no to_address is given in parameter' ); |
1247 |
|
1248 |
$dbh->do(q|DELETE FROM message_queue|); |
1249 |
t::lib::Mocks::mock_preference( 'EmailFieldPrimary', 'email,emailpro' ); |
1250 |
@message_ids = C4::Letters::EnqueueLetter($my_message); |
1251 |
is( scalar @message_ids, 2, 'messages successfully queued' ); |
1252 |
$messages = C4::Letters::GetQueuedMessages( { borrowernumber => $borrowernumber } ); |
1253 |
is( scalar(@$messages), 2, 'The messages have been queued for the expected patron' ); |
1254 |
is( $messages->[0]{to_address}, $email, 'EmailFieldPrimary=email,emailpro, EnqueueLetter used the patron email address for the first letter' ); |
1255 |
is( $messages->[1]{to_address}, $emailpro, 'EmailFieldPrimary=email,emailpro, EnqueueLetter used the patron emailpro address for the second letter' ); |
1256 |
}; |