gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 38689: Add logging tests for process_quote 

This adds missing tests for the Koha::Logger based logging of messages
in the process_quote process.  We also tidy up the log lines a tiny bit
for consistency.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Martin Renvoize 2025-01-03 16:32:12 +00:00 committed by Katrin Fischer
parent 7a686e3f66
commit c1dacd1b95
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
2 changed files with 68 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Koha/EDI.pm
View File

@ -312,7 +312,7 @@ sub process_invoice {
}
);
my $invoiceid = $new_invoice->invoiceid;
$logger->trace("Added as invoiceno :$invoiceid");
$logger->trace("Added as invoiceno: $invoiceid");
my $lines = $msg->lineitems();
foreach my $line ( @{$lines} ) {
@ -480,7 +480,7 @@ sub receipt_items {
details => "Cannot fine aqorder item"
}
);
$logger->warn("Cannot find aqorder item for $i :Order:$ordernumber");
$logger->warn("Cannot find aqorder item for $i: Order: $ordernumber");
next;
}
my $b = $item->get_column('homebranch');
@ -649,7 +649,7 @@ sub process_quote {
} else {
$quote_message->basketno($basketno);
}
$logger->trace("Created basket :$basketno");
$logger->trace("Created basket: $basketno");
my $items = $msg->lineitems();
my $refnum = $msg->message_refno;
@ -855,7 +855,7 @@ sub quote_item {
$order_hash->{budget_id} = $budget->budget_id;
my $first_order = $schema->resultset('Aqorder')->create($order_hash);
my $o = $first_order->ordernumber();
$logger->trace("Order created :$o");
$logger->trace("Order created: $o");
# should be done by database settings
$first_order->parent_ordernumber( $first_order->ordernumber() );
@ -941,7 +941,7 @@ sub quote_item {
my $new_order = $schema->resultset('Aqorder')->create($order_hash);
my $o = $new_order->ordernumber();
$logger->trace("Order created :$o");
$logger->trace("Order created: $o");
# should be done by database settings
$new_order->parent_ordernumber( $new_order->ordernumber() );

71
t/db_dependent/Koha/EDI.t
View File

@ -36,7 +36,7 @@ my $builder = t::lib::TestBuilder->new;
my $logger = t::lib::Mocks::Logger->new();
subtest 'process_quote' => sub {
plan tests => 7;
plan tests => 16;
$schema->storage->txn_begin;
@ -93,11 +93,45 @@ subtest 'process_quote' => sub {
}
);
t::lib::Mocks::mock_preference( 'CataloguingLog', 0 );
# Process the test quote file
process_quote($quote);
my $error;
eval {
process_quote($quote);
1;
} or do {
$error = $@;
};
ok( !$error, 'process_quote completed without dying' );
# Test for expected warnings for the passed quote file
#
is( $logger->count, 8, "8 log lines recorded for passed quote file" );
#$logger->diag();
$logger->trace_like(
qr/Created basket:.*/,
"Trace recorded adding basket"
)->trace_like(
qr/Checking db for matches.*/,
"Trace recorded checking db for matches"
)->trace_like(
qr/New biblio added.*/,
"Trace recoded adding new biblio"
)->trace_like(
qr/Order created:.*/,
"Trace recorded adding order"
)->trace_like(
qr/Added item:.*/,
"Trace recorded adding new item"
)->trace_like(
qr/Item added to rota.*/,
"Trace recrded adding item to rota"
)->debug_like(
qr/.*specialUpdate biblioserver$/,
"Trace recorded biblioserver index"
)->clear();
# Test for quote status change
$quote->get_from_storage;
is( $quote->status, 'received', 'Quote status was set to received' );
@ -294,7 +328,7 @@ subtest '_handle_008_field' => sub {
};
subtest 'process_invoice' => sub {
plan tests => 12;
plan tests => 19;
$schema->storage->txn_begin;
@ -372,6 +406,9 @@ subtest 'process_invoice' => sub {
};
ok( !$error, 'process_invoice completed without dying' );
is( $logger->count, 14, "14 log lines recorded for passed invoice file" );
#$logger->diag();
$logger->trace_like(
qr/Adding invoice:.*/,
"Trace recorded adding invoice"
@ -380,22 +417,40 @@ subtest 'process_invoice' => sub {
"Trace recorded invoice added"
)->error_is(
'Skipping invoice line, no associated ordernumber',
"Received expected log line for missing ordernumber line"
"Error recorded for missing ordernumber line"
)->error_like(
qr/Skipping invoice line, no order found for.*/,
'Received expected log line for unmatched ordernumber line'
'Error recorded for unmatched ordernumber line'
)->error_like(
qr/Skipping invoice line, no bibliographic.*/,
'Received expected log line for unmatched biblionumber line'
'Error recorded for unmatched biblionumber line'
)->trace_like(
qr/Receipting order:.*/,
'Trace recorded invoice receipted'
)->trace_like(
qr/Updating bib:.*/,
'Trace recorded bib updated'
)->trace_like(
qr/Receipting order:.*/,
'Trace recorded invoice receipted - Check why this happens a second time'
)->trace_like(
qr/Updating bib:.*/,
'Trace recorded bib updated - same bib, different id'
)->error_like(
qr/Cannot find vendor with ean.*/,
'Received expected log line for missing ean'
'Error recorded for missing ean'
)->warn_like(
qr/transferring.*/,
'Warn recorded for transferring items'
)->warn_like(
qr/Unmatched item at branch:.*/,
'Warn recorded for unmatched item'
)->warn_like(
qr/transferring.*/,
'Warn recorded for transferring items'
)->warn_like(
qr/Unmatched item at branch:.*/,
'Warn recorded for unmatched item'
)->clear();
my $invoice3 = Koha::Acquisition::Invoices->search( { invoicenumber => 'INV00003' }, { rows => 1 } )->single;