Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed logic of storing recurring transactions

Browse source
This commit is contained in:
Finn 2018-03-07 15:34:41 +00:00
parent 38dc29f4a1
commit 98cd134d84
21 changed files with 7702 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/Pear/LocalLoop/Controller/Api/Upload.pm
View file

@ -222,8 +222,13 @@ sub post_upload {
if ( defined $recurring_period ) {
$c->schema->resultset('TransactionRecurring')->create({
buyer => $user->entity,
seller => $organisation->entity,
value => $transaction_value * 100000,
start_time => $c->format_db_datetime($purchase_time),
essential => ( defined $essential ? $essential : 0 ),
category_id => ( defined $category ? $category : undef ),
recurring_period => $recurring_period,
transaction_id => $new_transaction->id,
});
}

2
lib/Pear/LocalLoop/Schema.pm
View file

@ -6,7 +6,7 @@ use warnings;
use base 'DBIx::Class::Schema';
our $VERSION = 27;
our $VERSION = 29;
__PACKAGE__->load_namespaces;

5
lib/Pear/LocalLoop/Schema/Result/Transaction.pm
View file

@ -81,11 +81,6 @@ __PACKAGE__->might_have(
"Pear::LocalLoop::Schema::Result::TransactionCategory" => "transaction_id",
);
__PACKAGE__->might_have(
"recurring",
"Pear::LocalLoop::Schema::Result::TransactionRecurring" => "transaction_id",
);
sub sqlt_deploy_hook {
my ( $source_instance, $sqlt_table ) = @_;
my $pending_field = $sqlt_table->get_field('essential');

56
lib/Pear/LocalLoop/Schema/Result/TransactionRecurring.pm
View file

@ -13,9 +13,41 @@ __PACKAGE__->add_columns(
is_auto_increment => 1,
is_nullable => 0,
},
"transaction_id" => {
data_type => 'integer',
"buyer_id" => {
data_type => "integer",
is_foreign_key => 1,
is_nullable => 0,
},
"seller_id" => {
data_type => "integer",
is_foreign_key => 1,
is_nullable => 0,
},
"value" => {
data_type => "numeric",
size => [ 100, 0 ],
is_nullable => 0,
},
"start_time" => {
data_type => "datetime",
timezone => "UTC",
is_nullable => 0,
set_on_create => 1,
},
"last_updated" => {
data_type => "datetime",
timezone => "UTC",
is_nullable => 0,
set_on_create => 1,
},
"essential" => {
data_type => "boolean",
default_value => \"false",
is_nullable => 0,
},
"category_id" => {
data_type => "integer",
is_nullable => 1,
is_foreign_key => 1,
},
"recurring_period" => {
@ -27,12 +59,24 @@ __PACKAGE__->add_columns(
__PACKAGE__->set_primary_key("id");
__PACKAGE__->add_unique_constraint(["transaction_id"]);
__PACKAGE__->belongs_to(
"buyer",
"Pear::LocalLoop::Schema::Result::Entity",
{ id => "buyer_id" },
{ is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" },
);
__PACKAGE__->belongs_to(
"transaction",
"Pear::LocalLoop::Schema::Result::Transaction",
"transaction_id",
"seller",
"Pear::LocalLoop::Schema::Result::Entity",
{ id => "seller_id" },
{ is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" },
);
__PACKAGE__->belongs_to(
"category",
"Pear::LocalLoop::Schema::Result::Category",
"category_id",
{ cascade_delete => 0 },
);