diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81ad2e12d667fb18c82cf3f855a63004cce5016f..ce5f551559234698467096ae7722e9d580369a5e 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.6.2 + IMAGE_VER: 0.7.0 services: - docker:20.10.9-dind diff --git a/lib/CF2022/Controller/Orders.pm b/lib/CF2022/Controller/Orders.pm index 6ea3a8331da0b38a4159c11f6639bf82fcfeaeb8..4d1778e7f084ca339eda44410b7c8ffc06a077da 100644 --- a/lib/CF2022/Controller/Orders.pm +++ b/lib/CF2022/Controller/Orders.pm @@ -148,7 +148,7 @@ sub create ($c ) { email => $order->{email}, api => $url, request => $order, - response => $rc->json, + order_id => $rc->json->{code}, }); $c->render( diff --git a/lib/CF2022/Schema/Result/Order.pm b/lib/CF2022/Schema/Result/Order.pm index 7297438c7c9aa4791247c42f658ff0cf9a9808cd..688d2086d3c925efc843d7d330627a6f4f099193 100644 --- a/lib/CF2022/Schema/Result/Order.pm +++ b/lib/CF2022/Schema/Result/Order.pm @@ -14,12 +14,13 @@ __PACKAGE__->add_columns( qw( id created + deleted ip sso_uuid + order_id email api request - response ), ); @@ -34,13 +35,4 @@ __PACKAGE__->inflate_column('request', { }, }); -__PACKAGE__->inflate_column('response', { - inflate => sub { - return from_json(shift); - }, - deflate => sub { - return to_json(shift); - }, -}); - 1; diff --git a/sql/1/up.sql b/sql/1/up.sql index 77abbe0c043c3688b3707fb5c3fd0a3a64137824..ce09935eae106568353a91879371d0f768e23dcc 100644 --- a/sql/1/up.sql +++ b/sql/1/up.sql @@ -3,11 +3,12 @@ create sequence "uid_seq" start 100000; create table "orders" ( "id" integer not null default nextval('uid_seq'), "created" timestamp(0) not null default now(), + "deleted" timestamp(0), "ip" inet not null, "sso_uuid" varchar(36), + "order_id" varchar(16), "email" text not null, "api" text not null, "request" text, - "response" text, primary key("id") );