From 261d762fc93ce550742fa1b6403a65d713349e8c Mon Sep 17 00:00:00 2001 From: Emmi Takkinen Date: Mon, 22 Apr 2024 14:02:20 +0300 Subject: [PATCH 1/2] Bug 32132: Fix failing tests Some tests failed due changes made to aqbudgets.budget_period_id. Tests failed with error: DBIx::Class::Storage::DBI::_dbh_execute(): DBI Exception: DBD::mysql::st execute failed: Field 'budget_period_id' doesn't have a default value at... This patch fixes those tests. To test run following lines: prove t/db_dependent/Acquisition/CancelReceipt.t prove t/db_dependent/Acquisition/GetBasketAsCSV.t prove t/db_dependent/Acquisition/GetBasketGroupAsCSV.t prove t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t prove t/db_dependent/Acquisition/GetOrdersByBiblionumber.t prove t/db_dependent/Acquisition/Invoices.t prove t/db_dependent/Acquisition/NewOrder.t prove t/db_dependent/Acquisition/OrderUsers.t prove t/db_dependent/Acquisition/TransferOrder.t prove t/db_dependent/Acquisition/close_reopen_basket.t prove t/db_dependent/Koha/Acquisition/Funds.t prove t/db_dependent/Letters.t Sponsored-by: Koha-Suomi Oy --- t/db_dependent/Acquisition/CancelReceipt.t | 14 +++++++++++-- t/db_dependent/Acquisition/GetBasketAsCSV.t | 20 +++++++++++++++---- .../Acquisition/GetBasketGroupAsCSV.t | 20 +++++++++++++++---- .../Acquisition/GetBasketsInfosByBookseller.t | 14 +++++++++++-- .../Acquisition/GetOrdersByBiblionumber.t | 14 +++++++++++-- t/db_dependent/Acquisition/Invoices.t | 14 +++++++++++-- t/db_dependent/Acquisition/NewOrder.t | 14 +++++++++++-- t/db_dependent/Acquisition/OrderUsers.t | 14 +++++++++++-- t/db_dependent/Acquisition/TransferOrder.t | 14 +++++++++++-- .../Acquisition/close_reopen_basket.t | 14 +++++++++++-- t/db_dependent/Koha/Acquisition/Funds.t | 19 ++++++++++++++---- t/db_dependent/Letters.t | 20 +++++++++++++++---- 12 files changed, 159 insertions(+), 32 deletions(-) diff --git a/t/db_dependent/Acquisition/CancelReceipt.t b/t/db_dependent/Acquisition/CancelReceipt.t index 5b5b9c03d4..6e25ed8edb 100755 --- a/t/db_dependent/Acquisition/CancelReceipt.t +++ b/t/db_dependent/Acquisition/CancelReceipt.t @@ -54,10 +54,20 @@ my $basketno1 = C4::Acquisition::NewBasket( $bookseller->id ); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + my $budgetid = C4::Budgets::AddBudget( { - budget_code => "budget_code_test_transferorder", - budget_name => "budget_name_test_transferorder", + budget_code => "budget_code_test_transferorder", + budget_name => "budget_name_test_transferorder", + budget_period_id => $budget_period_id, } ); diff --git a/t/db_dependent/Acquisition/GetBasketAsCSV.t b/t/db_dependent/Acquisition/GetBasketAsCSV.t index 047e51bc61..37b01e79e6 100755 --- a/t/db_dependent/Acquisition/GetBasketAsCSV.t +++ b/t/db_dependent/Acquisition/GetBasketAsCSV.t @@ -28,10 +28,22 @@ my $vendor = Koha::Acquisition::Bookseller->new({ deliverytime => 5, })->store; -my $budget_id = C4::Budgets::AddBudget({ - budget_code => 'my_budget_code', - budget_name => 'My budget name', -}); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + +my $budget_id = C4::Budgets::AddBudget( + { + budget_code => 'my_budget_code', + budget_name => 'My budget name', + budget_period_id => $budget_period_id, + } +); my $budget = C4::Budgets::GetBudget( $budget_id ); my $csv_profile = Koha::CsvProfile->new({ diff --git a/t/db_dependent/Acquisition/GetBasketGroupAsCSV.t b/t/db_dependent/Acquisition/GetBasketGroupAsCSV.t index 4ad3aa068f..ce9a90a26b 100755 --- a/t/db_dependent/Acquisition/GetBasketGroupAsCSV.t +++ b/t/db_dependent/Acquisition/GetBasketGroupAsCSV.t @@ -28,10 +28,22 @@ my $vendor = Koha::Acquisition::Bookseller->new({ deliverytime => 5, })->store; -my $budget_id = C4::Budgets::AddBudget({ - budget_code => 'my_budget_code', - budget_name => 'My budget name', -}); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + +my $budget_id = C4::Budgets::AddBudget( + { + budget_code => 'my_budget_code', + budget_name => 'My budget name', + budget_period_id => $budget_period_id, + } +); my $budget = C4::Budgets::GetBudget( $budget_id ); my $basketno = C4::Acquisition::NewBasket($vendor->id, 1); diff --git a/t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t b/t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t index 458a2c7590..b978cd76ce 100755 --- a/t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t +++ b/t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t @@ -28,10 +28,20 @@ my $supplierid = $supplier->id; my $basketno; ok($basketno = NewBasket($supplierid, 1), 'NewBasket( $supplierid , 1 ) returns $basketno'); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + my $budgetid = C4::Budgets::AddBudget( { - budget_code => 'budget_code_test_1', - budget_name => 'budget_name_test_1', + budget_code => 'budget_code_test_1', + budget_name => 'budget_name_test_1', + budget_period_id => $budget_period_id, } ); my $budget = C4::Budgets::GetBudget( $budgetid ); diff --git a/t/db_dependent/Acquisition/GetOrdersByBiblionumber.t b/t/db_dependent/Acquisition/GetOrdersByBiblionumber.t index 9b52802108..b16c307d27 100755 --- a/t/db_dependent/Acquisition/GetOrdersByBiblionumber.t +++ b/t/db_dependent/Acquisition/GetOrdersByBiblionumber.t @@ -28,10 +28,20 @@ my $basketno = C4::Acquisition::NewBasket( $bookseller->id ); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + my $budgetid = C4::Budgets::AddBudget( { - budget_code => "budget_code_test", - budget_name => "budget_name_test", + budget_code => "budget_code_test", + budget_name => "budget_name_test", + budget_period_id => $budget_period_id, } ); diff --git a/t/db_dependent/Acquisition/Invoices.t b/t/db_dependent/Acquisition/Invoices.t index 0327a8490b..dc5b3d2023 100755 --- a/t/db_dependent/Acquisition/Invoices.t +++ b/t/db_dependent/Acquisition/Invoices.t @@ -34,10 +34,20 @@ my $booksellerinfo = Koha::Acquisition::Booksellers->find( $booksellerid ); my $basketno = NewBasket($booksellerid, 1); my $basket = GetBasket($basketno); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + my $budgetid = C4::Budgets::AddBudget( { - budget_code => "budget_code_test", - budget_name => "budget_name_test", + budget_code => "budget_code_test", + budget_name => "budget_name_test", + budget_period_id => $budget_period_id, } ); my $budget = C4::Budgets::GetBudget( $budgetid ); diff --git a/t/db_dependent/Acquisition/NewOrder.t b/t/db_dependent/Acquisition/NewOrder.t index 6c7e6820fe..d853cb1f91 100755 --- a/t/db_dependent/Acquisition/NewOrder.t +++ b/t/db_dependent/Acquisition/NewOrder.t @@ -34,10 +34,20 @@ my $basketno = C4::Acquisition::NewBasket( $bookseller->id ); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + my $budgetid = C4::Budgets::AddBudget( { - budget_code => "budget_code_test", - budget_name => "budget_name_test", + budget_code => "budget_code_test", + budget_name => "budget_name_test", + budget_period_id => $budget_period_id, } ); diff --git a/t/db_dependent/Acquisition/OrderUsers.t b/t/db_dependent/Acquisition/OrderUsers.t index 3ad3bcd041..540be8460d 100755 --- a/t/db_dependent/Acquisition/OrderUsers.t +++ b/t/db_dependent/Acquisition/OrderUsers.t @@ -33,10 +33,20 @@ my $bookseller = Koha::Acquisition::Bookseller->new( my $basketno = NewBasket( $bookseller->id, 1 ); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + my $budgetid = C4::Budgets::AddBudget( { - budget_code => "budget_code_test", - budget_name => "budget_name_test", + budget_code => "budget_code_test", + budget_name => "budget_name_test", + budget_period_id => $budget_period_id, } ); my $budget = C4::Budgets::GetBudget($budgetid); diff --git a/t/db_dependent/Acquisition/TransferOrder.t b/t/db_dependent/Acquisition/TransferOrder.t index fc38127049..1cf443dd6d 100755 --- a/t/db_dependent/Acquisition/TransferOrder.t +++ b/t/db_dependent/Acquisition/TransferOrder.t @@ -47,10 +47,20 @@ my $basketno2 = C4::Acquisition::NewBasket( $bookseller2->id ); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + my $budgetid = C4::Budgets::AddBudget( { - budget_code => "budget_code_test_transferorder", - budget_name => "budget_name_test_transferorder", + budget_code => "budget_code_test_transferorder", + budget_name => "budget_name_test_transferorder", + budget_period_id => $budget_period_id, } ); diff --git a/t/db_dependent/Acquisition/close_reopen_basket.t b/t/db_dependent/Acquisition/close_reopen_basket.t index 16ca5979f0..47aa681fac 100755 --- a/t/db_dependent/Acquisition/close_reopen_basket.t +++ b/t/db_dependent/Acquisition/close_reopen_basket.t @@ -34,10 +34,20 @@ my $basketno = C4::Acquisition::NewBasket( $bookseller->id ); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + my $budgetid = C4::Budgets::AddBudget( { - budget_code => "budget_code_test_close_reopen", - budget_name => "budget_name_test_close_reopen", + budget_code => "budget_code_test_close_reopen", + budget_name => "budget_name_test_close_reopen", + budget_period_id => $budget_period_id, } ); diff --git a/t/db_dependent/Koha/Acquisition/Funds.t b/t/db_dependent/Koha/Acquisition/Funds.t index 4232571746..fc87ef7727 100755 --- a/t/db_dependent/Koha/Acquisition/Funds.t +++ b/t/db_dependent/Koha/Acquisition/Funds.t @@ -31,10 +31,21 @@ $schema->storage->txn_begin; my $builder = t::lib::TestBuilder->new; my $nb_of_funds = Koha::Acquisition::Funds->search->count; -my $new_fund = Koha::Acquisition::Fund->new({ - budget_code => 'my_budget_code_for_test', - budget_name => 'my_budget_name_for_test', -})->store; +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); +my $new_fund = Koha::Acquisition::Fund->new( + { + budget_code => 'my_budget_code_for_test', + budget_name => 'my_budget_name_for_test', + budget_period_id => $budget_period_id, + } +)->store; like( $new_fund->budget_id, qr|^\d+$|, 'Adding a new fund should have set the budget_id'); is( Koha::Acquisition::Funds->search->count, $nb_of_funds + 1, 'The fund should have been added' ); diff --git a/t/db_dependent/Letters.t b/t/db_dependent/Letters.t index eff6e3fd40..18c39a24d1 100755 --- a/t/db_dependent/Letters.t +++ b/t/db_dependent/Letters.t @@ -464,10 +464,22 @@ Koha::Acquisition::Bookseller::Contact->new( { name => 'John Smith', phone => ' Koha::Acquisition::Bookseller::Contact->new( { name => 'Leo Tolstoy', phone => '0123456x2', claimissues => 1, booksellerid => $booksellerid } )->store; my $basketno = NewBasket($booksellerid, 1, 'The basket name'); -my $budgetid = C4::Budgets::AddBudget({ - budget_code => "budget_code_test_letters", - budget_name => "budget_name_test_letters", -}); +my $budget_period_id = C4::Budgets::AddBudgetPeriod( + { + budget_period_startdate => '2024-01-01', + budget_period_enddate => '2049-01-01', + budget_period_active => 1, + budget_period_description => "TEST PERIOD" + } +); + +my $budgetid = C4::Budgets::AddBudget( + { + budget_code => "budget_code_test_letters", + budget_name => "budget_name_test_letters", + budget_period_id => $budget_period_id, + } +); my $bib = MARC::Record->new(); if (C4::Context->preference('marcflavour') eq 'UNIMARC') { -- 2.34.1