Attachment #173859 for bug #38011

View | Details | Raw Unified | Return to bug 38011
Collapse All | Expand All

Lines 74-82 Returns the list of subscriptions for the vendor Link Here

(-)a/Koha/Acquisition/Bookseller.pm (-3 / +2 lines)
74		74
75	sub subscriptions {	75	sub subscriptions {
76	my ($self) = @_;	76	my ($self) = @_;
77		77	my $booksellers_rs = $self->_result->subscriptions;
78	# FIXME FK missing at DB level	78	return Koha::Subscriptions->_new_from_dbic($booksellers_rs);
79	return Koha::Subscriptions->search( { aqbooksellerid => $self->id } );
80	}	79	}
81		80
82	=head3 aliases	81	=head3 aliases




  },
);

=head2 subscriptions

Type: has_many

Related object: L<Koha::Schema::Result::Subscription>

=cut

__PACKAGE__->has_many(
  "subscriptions",
  "Koha::Schema::Result::Subscription",
  { "foreign.aqbooksellerid" => "self.id" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 vendor_edi_accounts

Type: has_many

);


# Created by DBIx::Class::Schema::Loader v0.07051 @ 2024-09-11 09:24:20
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BAp8LQbC16KTLoV2ZDtRsQ

__PACKAGE__->add_columns(
    '+active' => { is_boolean => 1 },




=head2 aqbooksellerid

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 1

foreign key for aqbooksellers.id to link to the vendor

  "startdate",
  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
  "aqbooksellerid",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
  "cost",
  { data_type => "integer", default_value => 0, is_nullable => 1 },
  "aqbudgetid",


=head1 RELATIONS

=head2 aqbooksellerid

Type: belongs_to

Related object: L<Koha::Schema::Result::Aqbookseller>

=cut

__PACKAGE__->belongs_to(
  "aqbooksellerid",
  "Koha::Schema::Result::Aqbookseller",
  { id => "aqbooksellerid" },
  {
    is_deferrable => 1,
    join_type     => "LEFT",
    on_delete     => "SET NULL",
    on_update     => "CASCADE",
  },
);

=head2 aqorders

Type: has_many

);


# Created by DBIx::Class::Schema::Loader v0.07051 @ 2024-09-11 09:24:20
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mi3Uxt+shIeD869VpcRV4A

__PACKAGE__->has_many(
  "additional_field_values",

Lines 119-124 properties: Link Here

(-)a/api/v1/swagger/definitions/vendor.yaml (+3 lines)
119	description: List of aliases	119	description: List of aliases
120	items:	120	items:
121	$ref: "vendor_alias.yaml"	121	$ref: "vendor_alias.yaml"
		122	subscriptions:
		123	type: array
		124	description: List of subscriptions
122	additionalProperties: false	125	additionalProperties: false
123	required:	126	required:
124	- name	127	- name

Lines 35-40 Link Here

(-)a/api/v1/swagger/paths/acquisitions_vendors.yaml (+1 lines)
35	type: string	35	type: string
36	enum:	36	enum:
37	- aliases	37	- aliases
		38	- subscriptions
38	collectionFormat: csv	39	collectionFormat: csv
39	responses:	40	responses:
40	"200":	41	"200":




use Modern::Perl;
use Koha::Installer::Output qw(say_warning say_failure say_success say_info);

return {
    bug_number  => "38011",
    description => "Add missing foreign key to subscription table",
    up          => sub {
        my ($args) = @_;
        my ( $dbh, $out ) = @$args{qw(dbh out)};

        unless ( foreign_key_exists( 'subscription', 'subscription_ibfk_4' ) ) {

            $dbh->do(
                q{
                ALTER TABLE subscription MODIFY COLUMN aqbooksellerid int(11) DEFAULT NULL COMMENT 'foreign key for aqbooksellers.id to link to the vendor'
            }
            );

            $dbh->do(
                q|
                ALTER TABLE subscription
                ADD CONSTRAINT  subscription_ibfk_4
                    FOREIGN KEY (aqbooksellerid)
                    REFERENCES aqbooksellers (id) ON DELETE SET NULL ON UPDATE CASCADE
            |
            );
            say_success( $out, "Updated foreign key 'subscription_ibfk_4'" );
        } else {
            say_warning( $out, "Foreign key 'subscription_ibfk_4' already exists" );
        }
    },
};




  `subscriptionid` int(11) NOT NULL AUTO_INCREMENT COMMENT 'unique key for this subscription',
  `librarian` varchar(100) DEFAULT '' COMMENT 'the librarian''s username from borrowers.userid',
  `startdate` date DEFAULT NULL COMMENT 'start date for this subscription',
  `aqbooksellerid` int(11) DEFAULT NULL COMMENT 'foreign key for aqbooksellers.id to link to the vendor',
  `cost` int(11) DEFAULT 0,
  `aqbudgetid` int(11) DEFAULT 0,
  `weeklength` int(11) DEFAULT 0 COMMENT 'subscription length in weeks (will not be filled in if monthlength or numberlength is set)',

  KEY `subscription_ibfk_1` (`periodicity`),
  KEY `subscription_ibfk_2` (`numberpattern`),
  KEY `subscription_ibfk_3` (`biblionumber`),
  KEY `subscription_ibfk_4` (`aqbooksellerid`),
  CONSTRAINT `subscription_ibfk_1` FOREIGN KEY (`periodicity`) REFERENCES `subscription_frequencies` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
  CONSTRAINT `subscription_ibfk_2` FOREIGN KEY (`numberpattern`) REFERENCES `subscription_numberpatterns` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
  CONSTRAINT `subscription_ibfk_3` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `subscription_ibfk_4` FOREIGN KEY (`aqbooksellerid`) REFERENCES `aqbooksellers` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;

- 

Return to bug 38011

Lines 494-499 __PACKAGE__->belongs_to( Link Here

(-)a/Koha/Schema/Result/Aqbookseller.pm (-2 / +17 lines)
494	},	494	},
495	);	495	);
496		496
		497	=head2 subscriptions
		498
		499	Type: has_many
		500
		501	Related object: L<Koha::Schema::Result::Subscription>
		502
		503	=cut
		504
		505	__PACKAGE__->has_many(
		506	"subscriptions",
		507	"Koha::Schema::Result::Subscription",
		508	{ "foreign.aqbooksellerid" => "self.id" },
		509	{ cascade_copy => 0, cascade_delete => 0 },
		510	);
		511
497	=head2 vendor_edi_accounts	512	=head2 vendor_edi_accounts
498		513
499	Type: has_many	514	Type: has_many
Lines 510-517 __PACKAGE__->has_many( Link Here
510	);	525	);
511		526
512		527
513	# Created by DBIx::Class::Schema::Loader v0.07049 @ 2023-06-30 09:54:35	528	# Created by DBIx::Class::Schema::Loader v0.07051 @ 2024-09-11 09:24:20
514	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xjeOqpcdN3Kb1wmLGDjzLg	529	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BAp8LQbC16KTLoV2ZDtRsQ
515		530
516	__PACKAGE__->add_columns(	531	__PACKAGE__->add_columns(
517	'+active' => { is_boolean => 1 },	532	'+active' => { is_boolean => 1 },

Lines 59-65 start date for this subscription Link Here

(-)a/Koha/Schema/Result/Subscription.pm (-4 / +24 lines)
59	=head2 aqbooksellerid	59	=head2 aqbooksellerid
60		60
61	data_type: 'integer'	61	data_type: 'integer'
62	default_value: 0	62	is_foreign_key: 1
63	is_nullable: 1	63	is_nullable: 1
64		64
65	foreign key for aqbooksellers.id to link to the vendor	65	foreign key for aqbooksellers.id to link to the vendor
Lines 353-359 __PACKAGE__->add_columns( Link Here
353	"startdate",	353	"startdate",
354	{ data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },	354	{ data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
355	"aqbooksellerid",	355	"aqbooksellerid",
356	{ data_type => "integer", default_value => 0, is_nullable => 1 },	356	{ data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
357	"cost",	357	"cost",
358	{ data_type => "integer", default_value => 0, is_nullable => 1 },	358	{ data_type => "integer", default_value => 0, is_nullable => 1 },
359	"aqbudgetid",	359	"aqbudgetid",
Lines 450-455 __PACKAGE__->set_primary_key("subscriptionid"); Link Here
450		450
451	=head1 RELATIONS	451	=head1 RELATIONS
452		452
		453	=head2 aqbooksellerid
		454
		455	Type: belongs_to
		456
		457	Related object: L<Koha::Schema::Result::Aqbookseller>
		458
		459	=cut
		460
		461	__PACKAGE__->belongs_to(
		462	"aqbooksellerid",
		463	"Koha::Schema::Result::Aqbookseller",
		464	{ id => "aqbooksellerid" },
		465	{
		466	is_deferrable => 1,
		467	join_type => "LEFT",
		468	on_delete => "SET NULL",
		469	on_update => "CASCADE",
		470	},
		471	);
		472
453	=head2 aqorders	473	=head2 aqorders
454		474
455	Type: has_many	475	Type: has_many
Lines 566-573 __PACKAGE__->has_many( Link Here
566	);	586	);
567		587
568		588
569	# Created by DBIx::Class::Schema::Loader v0.07049 @ 2023-07-14 11:46:15	589	# Created by DBIx::Class::Schema::Loader v0.07051 @ 2024-09-11 09:24:20
570	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LICIiWzag365cUAq5OYD2A	590	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mi3Uxt+shIeD869VpcRV4A
571		591
572	__PACKAGE__->has_many(	592	__PACKAGE__->has_many(
573	"additional_field_values",	593	"additional_field_values",

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_38011-add_fk_to_subscriptions.pl (+32 lines)
	1	use Modern::Perl;
	2	use Koha::Installer::Output qw(say_warning say_failure say_success say_info);
	3
	4	return {
	5	bug_number => "38011",
	6	description => "Add missing foreign key to subscription table",
	7	up => sub {
	8	my ($args) = @_;
	9	my ( $dbh, $out ) = @$args{qw(dbh out)};
	10
	11	unless ( foreign_key_exists( 'subscription', 'subscription_ibfk_4' ) ) {
	12
	13	$dbh->do(
	14	q{
	15	ALTER TABLE subscription MODIFY COLUMN aqbooksellerid int(11) DEFAULT NULL COMMENT 'foreign key for aqbooksellers.id to link to the vendor'
	16	}
	17	);
	18
	19	$dbh->do(
	20	q\|
	21	ALTER TABLE subscription
	22	ADD CONSTRAINT subscription_ibfk_4
	23	FOREIGN KEY (aqbooksellerid)
	24	REFERENCES aqbooksellers (id) ON DELETE SET NULL ON UPDATE CASCADE
	25	\|
	26	);
	27	say_success( $out, "Updated foreign key 'subscription_ibfk_4'" );
	28	} else {
	29	say_warning( $out, "Foreign key 'subscription_ibfk_4' already exists" );
	30	}
	31	},
	32	};

Lines 6059-6065 CREATE TABLE `subscription` ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (-3 / +4 lines)
6059	`subscriptionid` int(11) NOT NULL AUTO_INCREMENT COMMENT 'unique key for this subscription',	6059	`subscriptionid` int(11) NOT NULL AUTO_INCREMENT COMMENT 'unique key for this subscription',
6060	`librarian` varchar(100) DEFAULT '' COMMENT 'the librarian''s username from borrowers.userid',	6060	`librarian` varchar(100) DEFAULT '' COMMENT 'the librarian''s username from borrowers.userid',
6061	`startdate` date DEFAULT NULL COMMENT 'start date for this subscription',	6061	`startdate` date DEFAULT NULL COMMENT 'start date for this subscription',
6062	`aqbooksellerid` int(11) DEFAULT 0 COMMENT 'foreign key for aqbooksellers.id to link to the vendor',	6062	`aqbooksellerid` int(11) DEFAULT NULL COMMENT 'foreign key for aqbooksellers.id to link to the vendor',
6063	`cost` int(11) DEFAULT 0,	6063	`cost` int(11) DEFAULT 0,
6064	`aqbudgetid` int(11) DEFAULT 0,	6064	`aqbudgetid` int(11) DEFAULT 0,
6065	`weeklength` int(11) DEFAULT 0 COMMENT 'subscription length in weeks (will not be filled in if monthlength or numberlength is set)',	6065	`weeklength` int(11) DEFAULT 0 COMMENT 'subscription length in weeks (will not be filled in if monthlength or numberlength is set)',
Lines 6104-6112 CREATE TABLE `subscription` ( Link Here
6104	KEY `subscription_ibfk_1` (`periodicity`),	6104	KEY `subscription_ibfk_1` (`periodicity`),
6105	KEY `subscription_ibfk_2` (`numberpattern`),	6105	KEY `subscription_ibfk_2` (`numberpattern`),
6106	KEY `subscription_ibfk_3` (`biblionumber`),	6106	KEY `subscription_ibfk_3` (`biblionumber`),
		6107	KEY `subscription_ibfk_4` (`aqbooksellerid`),
6107	CONSTRAINT `subscription_ibfk_1` FOREIGN KEY (`periodicity`) REFERENCES `subscription_frequencies` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,	6108	CONSTRAINT `subscription_ibfk_1` FOREIGN KEY (`periodicity`) REFERENCES `subscription_frequencies` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
6108	CONSTRAINT `subscription_ibfk_2` FOREIGN KEY (`numberpattern`) REFERENCES `subscription_numberpatterns` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,	6109	CONSTRAINT `subscription_ibfk_2` FOREIGN KEY (`numberpattern`) REFERENCES `subscription_numberpatterns` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
6109	CONSTRAINT `subscription_ibfk_3` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE	6110	CONSTRAINT `subscription_ibfk_3` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
		6111	CONSTRAINT `subscription_ibfk_4` FOREIGN KEY (`aqbooksellerid`) REFERENCES `aqbooksellers` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
6110	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;	6112	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
6111	/!40101 SET character_set_client = @saved_cs_client /;	6113	/!40101 SET character_set_client = @saved_cs_client /;
6112		6114
6113	-