diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2338ff3eb4bd39da49449f1fd919b931145d41af..5a960f5c30d4bea49f64bcfd0594ae90308e9925 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: docker:20.10.9 variables: DOCKER_TLS_CERTDIR: "/certs" - IMAGE_VER: 0.5.0 + IMAGE_VER: 0.5.1 services: - docker:20.10.9-dind diff --git a/lib/CF2022.pm b/lib/CF2022.pm index 9f0924b939756604fecb1ac1c666d7f64cedba92..2beb42b78c0b460e96fbccc3312503fda5de59fd 100644 --- a/lib/CF2022.pm +++ b/lib/CF2022.pm @@ -24,19 +24,21 @@ sub startup { # $self->helper( redis => sub { return $redis; } ); # migrace schematu - my $pg = Mojo::Pg->new - ->dsn($cfg->{db_dsn}) - ->username($cfg->{db_username}) - ->password($cfg->{db_password}) - ; - if ($cfg->{test}) { - $pg->search_path(['test']); - $pg->db->query('drop schema if exists test cascade'); - $pg->db->query('create schema test'); + if (! $cfg->{skip_migration}) { + my $pg = Mojo::Pg->new + ->dsn($cfg->{db_dsn}) + ->username($cfg->{db_username}) + ->password($cfg->{db_password}) + ; + if ($cfg->{test}) { + $pg->search_path(['test']); + $pg->db->query('drop schema if exists test cascade'); + $pg->db->query('create schema test'); + } + $pg->migrations->from_dir($self->home . '/sql'); + $pg->migrations->migrate(); + $self->helper( pg => sub { return $pg; } ); } - $pg->migrations->from_dir($self->home . '/sql'); - $pg->migrations->migrate(); - $self->helper( pg => sub { return $pg; } ); # DB Schema my $schema = CF2022::Schema->connect({ diff --git a/lib/CF2022/Controller/Orders.pm b/lib/CF2022/Controller/Orders.pm index fa3e67752c821ff2c465ca589cbb026c53052021..e87defda599679b90110b7ed5c1ed08bb651ec0f 100644 --- a/lib/CF2022/Controller/Orders.pm +++ b/lib/CF2022/Controller/Orders.pm @@ -45,9 +45,9 @@ sub create ($c ) { ); @products = grep { $_->{id} !~ MAIN_PRODUCTS } @products; - push @products, { + @products = ({ id => $c->config->{'pretix_product_' . $group->{role}} - }; + }, @products); if ( $group->{role} eq 'member' ) { $args->{email} = $claims->{preferred_username} diff --git a/lib/CF2022/Helpers/Auth.pm b/lib/CF2022/Helpers/Auth.pm index 7537e8798bb723e41b2f590cf2fa8db5da082883..da31c9f9361be0bf030232e2d178f54ed8ad4cb6 100644 --- a/lib/CF2022/Helpers/Auth.pm +++ b/lib/CF2022/Helpers/Auth.pm @@ -80,12 +80,14 @@ sub register ( $class, $self, $conf) { GROUP: foreach my $group ( sort @{ $claims->{groups} } ) { if ( $group =~ REGIONS ) { + my $role = ( $2 eq 'f') ? 'member':'regp'; + my $region = $c->oauth_groups->{ $group }; $region =~ s/^KS\s+//i; return { region => $region, - role => ( $2 eq 'f') ? 'member':'regp', + role => $role, }; } }