Lines 2-8
Link Here
|
2 |
|
2 |
|
3 |
use Modern::Perl; |
3 |
use Modern::Perl; |
4 |
|
4 |
|
5 |
use Test::More tests => 86; |
5 |
use Test::More tests => 99; |
6 |
use Test::MockModule; |
6 |
use Test::MockModule; |
7 |
use Test::Warn; |
7 |
use Test::Warn; |
8 |
|
8 |
|
Lines 13-21
use Koha::DateUtils;
Link Here
|
13 |
use DateTime::Duration; |
13 |
use DateTime::Duration; |
14 |
use t::lib::Mocks; |
14 |
use t::lib::Mocks; |
15 |
use C4::Acquisition; |
15 |
use C4::Acquisition; |
|
|
16 |
use C4::Contract qw( GetContract ); |
17 |
use C4::Items qw ( GetItem ); |
16 |
use C4::Serials; |
18 |
use C4::Serials; |
17 |
use C4::Budgets; |
19 |
use C4::Budgets; |
18 |
use C4::Biblio; |
20 |
use C4::Biblio; |
|
|
21 |
use t::lib::TestBuilder; |
19 |
|
22 |
|
20 |
use Koha::Acquisition::Booksellers; |
23 |
use Koha::Acquisition::Booksellers; |
21 |
use Koha::Acquisition::Order; |
24 |
use Koha::Acquisition::Order; |
Lines 40-45
$schema->storage->txn_begin();
Link Here
|
40 |
$dbh->{RaiseError} = 1; |
43 |
$dbh->{RaiseError} = 1; |
41 |
my $builder = t::lib::TestBuilder->new; |
44 |
my $builder = t::lib::TestBuilder->new; |
42 |
|
45 |
|
|
|
46 |
our $builder = t::lib::TestBuilder->new; |
47 |
|
43 |
#Start tests |
48 |
#Start tests |
44 |
$dbh->do(q|DELETE FROM aqorders|); |
49 |
$dbh->do(q|DELETE FROM aqorders|); |
45 |
$dbh->do(q|DELETE FROM aqbasket|); |
50 |
$dbh->do(q|DELETE FROM aqbasket|); |
Lines 756-761
is( $first_contact->phone,
Link Here
|
756 |
is( $contacts->count, |
761 |
is( $contacts->count, |
757 |
1, 'Only one contact after modification' ); |
762 |
1, 'Only one contact after modification' ); |
758 |
|
763 |
|
|
|
764 |
my $bookseller1 = create('Aqbookseller'); |
765 |
my $booksellerid1 = $bookseller1->{id}; |
766 |
my $bookseller2 = create('Aqbookseller'); |
767 |
my $booksellerid2 = $bookseller2->{id}; |
768 |
|
769 |
my $bg1 = create( 'Aqbasketgroup', $booksellerid1 ); |
770 |
my $bg2 = create( 'Aqbasketgroup', $booksellerid1 ); |
771 |
my $bg3 = create( 'Aqbasketgroup', $booksellerid2 ); |
772 |
|
773 |
my $basket1 = create( 'Aqbasket', $booksellerid1 ); |
774 |
my $basket2 = create( 'Aqbasket', $booksellerid1 ); |
775 |
|
776 |
my $contract = create( 'Aqcontract', $booksellerid1 ); |
777 |
|
778 |
my $contact = create( 'Aqcontact', $booksellerid1 ); |
779 |
|
780 |
my $invoice = create( 'Aqinvoice', $booksellerid1 ); |
781 |
|
782 |
my $deleteditem = create( 'Deleteditem', $booksellerid1 ); |
783 |
|
784 |
my $item1 = create( 'Item', $booksellerid1 ); |
785 |
|
786 |
my $subscription = create( 'Subscription', $booksellerid1 ); |
787 |
|
788 |
$bookseller = Koha::Acquisition::Booksellers->find( $booksellerid1 ); |
789 |
|
790 |
my $result = eval { $bookseller->merge_with(345876876) }; |
791 |
ok( |
792 |
$@ =~ /^Unknown target bookseller number: 345876876/, |
793 |
'Merge to unknown bookseller return an error' |
794 |
); |
795 |
|
796 |
$result = $bookseller->merge_with($booksellerid2); |
797 |
my $expected_result = { |
798 |
Aqbasketgroup => [ $bg1->{id}, $bg2->{id} ], |
799 |
Aqbasket => [ $basket1->{basketno}, $basket2->{basketno} ], |
800 |
Aqcontract => [ $contract->{contractnumber} ], |
801 |
Aqcontact => [ $contact->{id} ], |
802 |
Aqinvoice => [ $invoice->{invoiceid} ], |
803 |
Deleteditem => [ $deleteditem->{itemnumber} ], |
804 |
Item => [ $item1->{itemnumber} ], |
805 |
Subscription => [ $subscription->{subscriptionid} ] |
806 |
}; |
807 |
|
808 |
is_deeply( $result, $expected_result, 'Result should be as expected' ); |
809 |
|
810 |
is( GetBasketgroup( $bg1->{id} )->{'booksellerid'}, |
811 |
$booksellerid2, 'Basket group 1 has bookseller 2' ); |
812 |
|
813 |
is( GetBasketgroup( $bg2->{id} )->{'booksellerid'}, |
814 |
$booksellerid2, 'Basket group 2 has bookseller 2' ); |
815 |
|
816 |
is( GetBasketgroup( $bg3->{id} )->{'booksellerid'}, |
817 |
$booksellerid2, 'Basket group 3 keep bookseller 2' ); |
818 |
|
819 |
is( GetBasket( $basket1->{basketno} )->{'booksellerid'}, |
820 |
$booksellerid2, 'Basket 1 has bookseller 2' ); |
821 |
|
822 |
is( GetBasket( $basket2->{basketno} )->{'booksellerid'}, |
823 |
$booksellerid2, 'Basket 2 has bookseller 2' ); |
824 |
|
825 |
is( |
826 |
GetContract( { contractnumber => $contract->{contractnumber} } ) |
827 |
->{'booksellerid'}, |
828 |
$booksellerid2, |
829 |
'Basket 1 has bookseller 2' |
830 |
); |
831 |
|
832 |
is( Koha::Acquisition::Bookseller::Contacts->find( $contact->{id} )->booksellerid, |
833 |
$booksellerid2, 'Contact 1 has booksellerid 2' ); |
834 |
|
835 |
is( GetInvoice( $invoice->{invoiceid} )->{'booksellerid'}, |
836 |
$booksellerid2, 'Invoice has bookseller 2' ); |
837 |
|
838 |
my $item = Koha::Database->new()->schema->resultset('Deleteditem') |
839 |
->find( { itemnumber => $deleteditem->{itemnumber} } ); |
840 |
is( $item->get_column('booksellerid'), |
841 |
$booksellerid2, 'Deleted item has bookseller 2' ); |
842 |
|
843 |
is( GetItem( $item1->{itemnumber} )->{'booksellerid'}, |
844 |
$booksellerid2, 'Item has bookseller 2' ); |
845 |
|
846 |
is( GetSubscription( $subscription->{subscriptionid} )->{'aqbooksellerid'}, |
847 |
$booksellerid2, 'Subscription has bookseller 2' ); |
848 |
|
759 |
#End transaction |
849 |
#End transaction |
760 |
$schema->storage->txn_rollback(); |
850 |
$schema->storage->txn_rollback(); |
761 |
|
851 |
|
Lines 779-781
sub field_filter {
Link Here
|
779 |
} |
869 |
} |
780 |
return $struct; |
870 |
return $struct; |
781 |
} |
871 |
} |
782 |
- |
872 |
|
|
|
873 |
sub create { |
874 |
my ( $source, $booksellerid ) = @_; |
875 |
|
876 |
my $build = { source => $source }; |
877 |
my $foreign_key = |
878 |
$source eq 'Subscription' ? 'aqbooksellerid' : 'booksellerid'; |
879 |
$build->{value} = { $foreign_key => $booksellerid } if $booksellerid; |
880 |
|
881 |
my $entity = $builder->build($build); |
882 |
|
883 |
return $entity; |
884 |
} |