Merge pull request #25 from Pear-Trading/finn/DateSubmission
Datetime Submission and validation
This commit is contained in:
Finn
GitHub
commit
4a5e7328f5
26 changed files with 3857 additions and 52 deletions
|
|
@ -35,6 +35,7 @@ sub startup {
|
|||
|
||||
$self->plugin('Pear::LocalLoop::Plugin::BootstrapPagination', { bootstrap4 => 1 } );
|
||||
$self->plugin('Pear::LocalLoop::Plugin::Validators');
|
||||
$self->plugin('Pear::LocalLoop::Plugin::Datetime');
|
||||
|
||||
$self->plugin('Authentication' => {
|
||||
'load_user' => sub {
|
||||
|
|
|
|||
|
|
@ -19,6 +19,10 @@ The value of the transaction
|
|||
|
||||
Is a value of 1, 2, or 3 - depending on the type of transaction.
|
||||
|
||||
=item * purchase_time
|
||||
|
||||
Is a DateTime value submitted for when the receipt is from.
|
||||
|
||||
=item * organisation_id
|
||||
|
||||
An ID of a valid organisation. used when transaction_type is 1 or 2.
|
||||
|
|
@ -54,6 +58,9 @@ has error_messages => sub {
|
|||
number => { message => 'transaction_value does not look like a number', status => 400 },
|
||||
gt_num => { message => 'transaction_value cannot be equal to or less than zero', status => 400 },
|
||||
},
|
||||
purchase_time => {
|
||||
required => { message => 'purchase_time is missing', status => 400 },
|
||||
},
|
||||
file => {
|
||||
required => { message => 'No file uploaded', status => 400 },
|
||||
upload => { message => 'file key does not contain a file', status => 400 },
|
||||
|
|
@ -92,6 +99,9 @@ sub post_upload {
|
|||
$validation->required('transaction_value')->number->gt_num(0);
|
||||
$validation->required('transaction_type')->in( 1, 2, 3 );
|
||||
|
||||
#Check a proper purchase time was submitted
|
||||
$validation->required('purchase_time')->is_full_iso_datetime;
|
||||
|
||||
# First pass of required items
|
||||
return $c->api_validation_error if $validation->has_error;
|
||||
|
||||
|
|
@ -138,6 +148,7 @@ sub post_upload {
|
|||
|
||||
my $transaction_value = $validation->param('transaction_value');
|
||||
my $upload = $validation->param('file');
|
||||
my $purchase_time = $c->parse_iso_datetime($validation->param('purchase_time'));
|
||||
my $file = $c->store_file_from_upload( $upload );
|
||||
|
||||
$organisation->create_related(
|
||||
|
|
@ -146,6 +157,7 @@ sub post_upload {
|
|||
buyer => $user,
|
||||
value => $transaction_value,
|
||||
proof_image => $file,
|
||||
purchase_time => $c->format_db_datetime($purchase_time),
|
||||
}
|
||||
);
|
||||
|
||||
|
|
|
|||
41
lib/Pear/LocalLoop/Plugin/Datetime.pm
Normal file
41
lib/Pear/LocalLoop/Plugin/Datetime.pm
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
package Pear::LocalLoop::Plugin::Datetime;
|
||||
use Mojo::Base 'Mojolicious::Plugin';
|
||||
|
||||
use DateTime::Format::Strptime;
|
||||
|
||||
sub register {
|
||||
my ( $plugin, $app, $conf ) = @_;
|
||||
|
||||
$app->helper( iso_datetime_parser => sub {
|
||||
return DateTime::Format::Strptime->new( pattern => '%Y-%m-%dT%H:%M:%S.%3N%z' );
|
||||
});
|
||||
|
||||
$app->helper( parse_iso_datetime => sub {
|
||||
my ( $c, $date_string ) = @_;
|
||||
return $c->iso_datetime_parser->parse_datetime(
|
||||
$date_string,
|
||||
);
|
||||
});
|
||||
|
||||
$app->helper( format_iso_datetime => sub {
|
||||
my ( $c, $datetime_obj ) = @_;
|
||||
return $c->iso_datetime_parser->parse_datetime(
|
||||
$datetime_obj,
|
||||
);
|
||||
});
|
||||
|
||||
$app->helper( db_datetime_parser => sub {
|
||||
return shift->schema->storage->datetime_parser;
|
||||
});
|
||||
|
||||
$app->helper( format_db_datetime => sub {
|
||||
my ( $c, $datetime_obj ) = @_;
|
||||
$datetime_obj->set_time_zone('UTC');
|
||||
return $c->db_datetime_parser->format_datetime(
|
||||
$datetime_obj,
|
||||
);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
@ -58,6 +58,12 @@ sub register {
|
|||
$value = $app->datetime_formatter->parse_datetime( $value );
|
||||
return defined $value ? undef : 1;
|
||||
});
|
||||
|
||||
$app->validator->add_check( is_full_iso_datetime => sub {
|
||||
my ( $validation, $name, $value ) = @_;
|
||||
$value = $app->parse_iso_datetime( $value );
|
||||
return defined $value ? undef : 1;
|
||||
});
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use warnings;
|
|||
|
||||
use base 'DBIx::Class::Schema';
|
||||
|
||||
our $VERSION = 2;
|
||||
our $VERSION = 4;
|
||||
|
||||
__PACKAGE__->load_namespaces;
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,12 @@ __PACKAGE__->add_columns(
|
|||
is_nullable => 0,
|
||||
set_on_create => 1,
|
||||
},
|
||||
"purchase_time" => {
|
||||
data_type => "datetime",
|
||||
timezone => "UTC",
|
||||
is_nullable => 0,
|
||||
set_on_create => 1,
|
||||
},
|
||||
);
|
||||
|
||||
__PACKAGE__->set_primary_key("id");
|
||||
|
|
|
|||
|
|
@ -42,6 +42,12 @@ __PACKAGE__->add_columns(
|
|||
is_nullable => 0,
|
||||
set_on_create => 1,
|
||||
},
|
||||
"purchase_time" => {
|
||||
data_type => "datetime",
|
||||
timezone => "UTC",
|
||||
is_nullable => 0,
|
||||
set_on_create => 1,
|
||||
},
|
||||
);
|
||||
|
||||
__PACKAGE__->set_primary_key("id");
|
||||
|
|
|
|||
18
share/ddl/PostgreSQL/deploy/3/001-auto-__VERSION.sql
Normal file
18
share/ddl/PostgreSQL/deploy/3/001-auto-__VERSION.sql
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::PostgreSQL
|
||||
-- Created on Mon Aug 14 12:22:58 2017
|
||||
--
|
||||
;
|
||||
--
|
||||
-- Table: dbix_class_deploymenthandler_versions
|
||||
--
|
||||
CREATE TABLE "dbix_class_deploymenthandler_versions" (
|
||||
"id" serial NOT NULL,
|
||||
"version" character varying(50) NOT NULL,
|
||||
"ddl" text,
|
||||
"upgrade_sql" text,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "dbix_class_deploymenthandler_versions_version" UNIQUE ("version")
|
||||
);
|
||||
|
||||
;
|
||||
248
share/ddl/PostgreSQL/deploy/3/001-auto.sql
Normal file
248
share/ddl/PostgreSQL/deploy/3/001-auto.sql
Normal file
|
|
@ -0,0 +1,248 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::PostgreSQL
|
||||
-- Created on Mon Aug 14 12:22:58 2017
|
||||
--
|
||||
;
|
||||
--
|
||||
-- Table: account_tokens
|
||||
--
|
||||
CREATE TABLE "account_tokens" (
|
||||
"id" serial NOT NULL,
|
||||
"name" text NOT NULL,
|
||||
"used" integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "account_tokens_name" UNIQUE ("name")
|
||||
);
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: customers
|
||||
--
|
||||
CREATE TABLE "customers" (
|
||||
"id" serial NOT NULL,
|
||||
"display_name" character varying(255) NOT NULL,
|
||||
"full_name" character varying(255) NOT NULL,
|
||||
"year_of_birth" integer NOT NULL,
|
||||
"postcode" character varying(16) NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: leaderboards
|
||||
--
|
||||
CREATE TABLE "leaderboards" (
|
||||
"id" serial NOT NULL,
|
||||
"name" character varying(255) NOT NULL,
|
||||
"type" character varying(255) NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "leaderboards_type" UNIQUE ("type")
|
||||
);
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: organisations
|
||||
--
|
||||
CREATE TABLE "organisations" (
|
||||
"id" serial NOT NULL,
|
||||
"name" character varying(255) NOT NULL,
|
||||
"street_name" text,
|
||||
"town" character varying(255) NOT NULL,
|
||||
"postcode" character varying(16),
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: leaderboard_sets
|
||||
--
|
||||
CREATE TABLE "leaderboard_sets" (
|
||||
"id" serial NOT NULL,
|
||||
"leaderboard_id" integer NOT NULL,
|
||||
"date" timestamp NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "leaderboard_sets_idx_leaderboard_id" on "leaderboard_sets" ("leaderboard_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: users
|
||||
--
|
||||
CREATE TABLE "users" (
|
||||
"id" serial NOT NULL,
|
||||
"customer_id" integer,
|
||||
"organisation_id" integer,
|
||||
"email" text NOT NULL,
|
||||
"join_date" timestamp NOT NULL,
|
||||
"password" character varying(100) NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "users_customer_id" UNIQUE ("customer_id"),
|
||||
CONSTRAINT "users_email" UNIQUE ("email"),
|
||||
CONSTRAINT "users_organisation_id" UNIQUE ("organisation_id")
|
||||
);
|
||||
CREATE INDEX "users_idx_customer_id" on "users" ("customer_id");
|
||||
CREATE INDEX "users_idx_organisation_id" on "users" ("organisation_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: administrators
|
||||
--
|
||||
CREATE TABLE "administrators" (
|
||||
"user_id" integer NOT NULL,
|
||||
PRIMARY KEY ("user_id")
|
||||
);
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: feedback
|
||||
--
|
||||
CREATE TABLE "feedback" (
|
||||
"id" serial NOT NULL,
|
||||
"user_id" integer NOT NULL,
|
||||
"submitted_at" timestamp NOT NULL,
|
||||
"feedbacktext" text NOT NULL,
|
||||
"app_name" character varying(255) NOT NULL,
|
||||
"package_name" character varying(255) NOT NULL,
|
||||
"version_code" character varying(255) NOT NULL,
|
||||
"version_number" character varying(255) NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "feedback_idx_user_id" on "feedback" ("user_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: pending_organisations
|
||||
--
|
||||
CREATE TABLE "pending_organisations" (
|
||||
"id" serial NOT NULL,
|
||||
"name" character varying(255) NOT NULL,
|
||||
"street_name" text,
|
||||
"town" character varying(255) NOT NULL,
|
||||
"postcode" character varying(16),
|
||||
"submitted_by_id" integer NOT NULL,
|
||||
"submitted_at" timestamp NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "pending_organisations_idx_submitted_by_id" on "pending_organisations" ("submitted_by_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: session_tokens
|
||||
--
|
||||
CREATE TABLE "session_tokens" (
|
||||
"id" serial NOT NULL,
|
||||
"token" character varying(255) NOT NULL,
|
||||
"user_id" integer NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "session_tokens_token" UNIQUE ("token")
|
||||
);
|
||||
CREATE INDEX "session_tokens_idx_user_id" on "session_tokens" ("user_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: transactions
|
||||
--
|
||||
CREATE TABLE "transactions" (
|
||||
"id" serial NOT NULL,
|
||||
"buyer_id" integer NOT NULL,
|
||||
"seller_id" integer NOT NULL,
|
||||
"value" numeric(16,2) NOT NULL,
|
||||
"proof_image" text NOT NULL,
|
||||
"submitted_at" timestamp NOT NULL,
|
||||
"purchase_time" timestamp NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "transactions_idx_buyer_id" on "transactions" ("buyer_id");
|
||||
CREATE INDEX "transactions_idx_seller_id" on "transactions" ("seller_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: pending_transactions
|
||||
--
|
||||
CREATE TABLE "pending_transactions" (
|
||||
"id" serial NOT NULL,
|
||||
"buyer_id" integer NOT NULL,
|
||||
"seller_id" integer NOT NULL,
|
||||
"value" numeric(16,2) NOT NULL,
|
||||
"proof_image" text NOT NULL,
|
||||
"submitted_at" timestamp NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "pending_transactions_idx_buyer_id" on "pending_transactions" ("buyer_id");
|
||||
CREATE INDEX "pending_transactions_idx_seller_id" on "pending_transactions" ("seller_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: leaderboard_values
|
||||
--
|
||||
CREATE TABLE "leaderboard_values" (
|
||||
"id" serial NOT NULL,
|
||||
"user_id" integer NOT NULL,
|
||||
"set_id" integer NOT NULL,
|
||||
"position" integer NOT NULL,
|
||||
"value" numeric(16,2) NOT NULL,
|
||||
"trend" integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "leaderboard_values_user_id_set_id" UNIQUE ("user_id", "set_id")
|
||||
);
|
||||
CREATE INDEX "leaderboard_values_idx_set_id" on "leaderboard_values" ("set_id");
|
||||
CREATE INDEX "leaderboard_values_idx_user_id" on "leaderboard_values" ("user_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Foreign Key Definitions
|
||||
--
|
||||
|
||||
;
|
||||
ALTER TABLE "leaderboard_sets" ADD CONSTRAINT "leaderboard_sets_fk_leaderboard_id" FOREIGN KEY ("leaderboard_id")
|
||||
REFERENCES "leaderboards" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "users" ADD CONSTRAINT "users_fk_customer_id" FOREIGN KEY ("customer_id")
|
||||
REFERENCES "customers" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "users" ADD CONSTRAINT "users_fk_organisation_id" FOREIGN KEY ("organisation_id")
|
||||
REFERENCES "organisations" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "administrators" ADD CONSTRAINT "administrators_fk_user_id" FOREIGN KEY ("user_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "feedback" ADD CONSTRAINT "feedback_fk_user_id" FOREIGN KEY ("user_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "pending_organisations" ADD CONSTRAINT "pending_organisations_fk_submitted_by_id" FOREIGN KEY ("submitted_by_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "session_tokens" ADD CONSTRAINT "session_tokens_fk_user_id" FOREIGN KEY ("user_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_buyer_id" FOREIGN KEY ("buyer_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_seller_id" FOREIGN KEY ("seller_id")
|
||||
REFERENCES "organisations" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "pending_transactions" ADD CONSTRAINT "pending_transactions_fk_buyer_id" FOREIGN KEY ("buyer_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "pending_transactions" ADD CONSTRAINT "pending_transactions_fk_seller_id" FOREIGN KEY ("seller_id")
|
||||
REFERENCES "pending_organisations" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_set_id" FOREIGN KEY ("set_id")
|
||||
REFERENCES "leaderboard_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_user_id" FOREIGN KEY ("user_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
18
share/ddl/PostgreSQL/deploy/4/001-auto-__VERSION.sql
Normal file
18
share/ddl/PostgreSQL/deploy/4/001-auto-__VERSION.sql
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::PostgreSQL
|
||||
-- Created on Mon Aug 14 14:33:22 2017
|
||||
--
|
||||
;
|
||||
--
|
||||
-- Table: dbix_class_deploymenthandler_versions
|
||||
--
|
||||
CREATE TABLE "dbix_class_deploymenthandler_versions" (
|
||||
"id" serial NOT NULL,
|
||||
"version" character varying(50) NOT NULL,
|
||||
"ddl" text,
|
||||
"upgrade_sql" text,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "dbix_class_deploymenthandler_versions_version" UNIQUE ("version")
|
||||
);
|
||||
|
||||
;
|
||||
249
share/ddl/PostgreSQL/deploy/4/001-auto.sql
Normal file
249
share/ddl/PostgreSQL/deploy/4/001-auto.sql
Normal file
|
|
@ -0,0 +1,249 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::PostgreSQL
|
||||
-- Created on Mon Aug 14 14:33:22 2017
|
||||
--
|
||||
;
|
||||
--
|
||||
-- Table: account_tokens
|
||||
--
|
||||
CREATE TABLE "account_tokens" (
|
||||
"id" serial NOT NULL,
|
||||
"name" text NOT NULL,
|
||||
"used" integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "account_tokens_name" UNIQUE ("name")
|
||||
);
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: customers
|
||||
--
|
||||
CREATE TABLE "customers" (
|
||||
"id" serial NOT NULL,
|
||||
"display_name" character varying(255) NOT NULL,
|
||||
"full_name" character varying(255) NOT NULL,
|
||||
"year_of_birth" integer NOT NULL,
|
||||
"postcode" character varying(16) NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: leaderboards
|
||||
--
|
||||
CREATE TABLE "leaderboards" (
|
||||
"id" serial NOT NULL,
|
||||
"name" character varying(255) NOT NULL,
|
||||
"type" character varying(255) NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "leaderboards_type" UNIQUE ("type")
|
||||
);
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: organisations
|
||||
--
|
||||
CREATE TABLE "organisations" (
|
||||
"id" serial NOT NULL,
|
||||
"name" character varying(255) NOT NULL,
|
||||
"street_name" text,
|
||||
"town" character varying(255) NOT NULL,
|
||||
"postcode" character varying(16),
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: leaderboard_sets
|
||||
--
|
||||
CREATE TABLE "leaderboard_sets" (
|
||||
"id" serial NOT NULL,
|
||||
"leaderboard_id" integer NOT NULL,
|
||||
"date" timestamp NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "leaderboard_sets_idx_leaderboard_id" on "leaderboard_sets" ("leaderboard_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: users
|
||||
--
|
||||
CREATE TABLE "users" (
|
||||
"id" serial NOT NULL,
|
||||
"customer_id" integer,
|
||||
"organisation_id" integer,
|
||||
"email" text NOT NULL,
|
||||
"join_date" timestamp NOT NULL,
|
||||
"password" character varying(100) NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "users_customer_id" UNIQUE ("customer_id"),
|
||||
CONSTRAINT "users_email" UNIQUE ("email"),
|
||||
CONSTRAINT "users_organisation_id" UNIQUE ("organisation_id")
|
||||
);
|
||||
CREATE INDEX "users_idx_customer_id" on "users" ("customer_id");
|
||||
CREATE INDEX "users_idx_organisation_id" on "users" ("organisation_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: administrators
|
||||
--
|
||||
CREATE TABLE "administrators" (
|
||||
"user_id" integer NOT NULL,
|
||||
PRIMARY KEY ("user_id")
|
||||
);
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: feedback
|
||||
--
|
||||
CREATE TABLE "feedback" (
|
||||
"id" serial NOT NULL,
|
||||
"user_id" integer NOT NULL,
|
||||
"submitted_at" timestamp NOT NULL,
|
||||
"feedbacktext" text NOT NULL,
|
||||
"app_name" character varying(255) NOT NULL,
|
||||
"package_name" character varying(255) NOT NULL,
|
||||
"version_code" character varying(255) NOT NULL,
|
||||
"version_number" character varying(255) NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "feedback_idx_user_id" on "feedback" ("user_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: pending_organisations
|
||||
--
|
||||
CREATE TABLE "pending_organisations" (
|
||||
"id" serial NOT NULL,
|
||||
"name" character varying(255) NOT NULL,
|
||||
"street_name" text,
|
||||
"town" character varying(255) NOT NULL,
|
||||
"postcode" character varying(16),
|
||||
"submitted_by_id" integer NOT NULL,
|
||||
"submitted_at" timestamp NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "pending_organisations_idx_submitted_by_id" on "pending_organisations" ("submitted_by_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: session_tokens
|
||||
--
|
||||
CREATE TABLE "session_tokens" (
|
||||
"id" serial NOT NULL,
|
||||
"token" character varying(255) NOT NULL,
|
||||
"user_id" integer NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "session_tokens_token" UNIQUE ("token")
|
||||
);
|
||||
CREATE INDEX "session_tokens_idx_user_id" on "session_tokens" ("user_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: transactions
|
||||
--
|
||||
CREATE TABLE "transactions" (
|
||||
"id" serial NOT NULL,
|
||||
"buyer_id" integer NOT NULL,
|
||||
"seller_id" integer NOT NULL,
|
||||
"value" numeric(16,2) NOT NULL,
|
||||
"proof_image" text NOT NULL,
|
||||
"submitted_at" timestamp NOT NULL,
|
||||
"purchase_time" timestamp NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "transactions_idx_buyer_id" on "transactions" ("buyer_id");
|
||||
CREATE INDEX "transactions_idx_seller_id" on "transactions" ("seller_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: pending_transactions
|
||||
--
|
||||
CREATE TABLE "pending_transactions" (
|
||||
"id" serial NOT NULL,
|
||||
"buyer_id" integer NOT NULL,
|
||||
"seller_id" integer NOT NULL,
|
||||
"value" numeric(16,2) NOT NULL,
|
||||
"proof_image" text NOT NULL,
|
||||
"submitted_at" timestamp NOT NULL,
|
||||
"purchase_time" timestamp NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "pending_transactions_idx_buyer_id" on "pending_transactions" ("buyer_id");
|
||||
CREATE INDEX "pending_transactions_idx_seller_id" on "pending_transactions" ("seller_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: leaderboard_values
|
||||
--
|
||||
CREATE TABLE "leaderboard_values" (
|
||||
"id" serial NOT NULL,
|
||||
"user_id" integer NOT NULL,
|
||||
"set_id" integer NOT NULL,
|
||||
"position" integer NOT NULL,
|
||||
"value" numeric(16,2) NOT NULL,
|
||||
"trend" integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "leaderboard_values_user_id_set_id" UNIQUE ("user_id", "set_id")
|
||||
);
|
||||
CREATE INDEX "leaderboard_values_idx_set_id" on "leaderboard_values" ("set_id");
|
||||
CREATE INDEX "leaderboard_values_idx_user_id" on "leaderboard_values" ("user_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Foreign Key Definitions
|
||||
--
|
||||
|
||||
;
|
||||
ALTER TABLE "leaderboard_sets" ADD CONSTRAINT "leaderboard_sets_fk_leaderboard_id" FOREIGN KEY ("leaderboard_id")
|
||||
REFERENCES "leaderboards" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "users" ADD CONSTRAINT "users_fk_customer_id" FOREIGN KEY ("customer_id")
|
||||
REFERENCES "customers" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "users" ADD CONSTRAINT "users_fk_organisation_id" FOREIGN KEY ("organisation_id")
|
||||
REFERENCES "organisations" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "administrators" ADD CONSTRAINT "administrators_fk_user_id" FOREIGN KEY ("user_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "feedback" ADD CONSTRAINT "feedback_fk_user_id" FOREIGN KEY ("user_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "pending_organisations" ADD CONSTRAINT "pending_organisations_fk_submitted_by_id" FOREIGN KEY ("submitted_by_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "session_tokens" ADD CONSTRAINT "session_tokens_fk_user_id" FOREIGN KEY ("user_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_buyer_id" FOREIGN KEY ("buyer_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_seller_id" FOREIGN KEY ("seller_id")
|
||||
REFERENCES "organisations" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "pending_transactions" ADD CONSTRAINT "pending_transactions_fk_buyer_id" FOREIGN KEY ("buyer_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "pending_transactions" ADD CONSTRAINT "pending_transactions_fk_seller_id" FOREIGN KEY ("seller_id")
|
||||
REFERENCES "pending_organisations" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_set_id" FOREIGN KEY ("set_id")
|
||||
REFERENCES "leaderboard_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_user_id" FOREIGN KEY ("user_id")
|
||||
REFERENCES "users" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
15
share/ddl/PostgreSQL/upgrade/2-3/001-auto.sql
Normal file
15
share/ddl/PostgreSQL/upgrade/2-3/001-auto.sql
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
-- Convert schema 'share/ddl/_source/deploy/2/001-auto.yml' to 'share/ddl/_source/deploy/3/001-auto.yml':;
|
||||
|
||||
;
|
||||
BEGIN;
|
||||
|
||||
;
|
||||
ALTER TABLE transactions ADD COLUMN purchase_time timestamp;
|
||||
|
||||
UPDATE transactions SET purchase_time = submitted_at;
|
||||
|
||||
ALTER TABLE transactions ALTER COLUMN purchase_time SET NOT NULL;
|
||||
|
||||
;
|
||||
|
||||
COMMIT;
|
||||
15
share/ddl/PostgreSQL/upgrade/3-4/001-auto.sql
Normal file
15
share/ddl/PostgreSQL/upgrade/3-4/001-auto.sql
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
-- Convert schema 'share/ddl/_source/deploy/3/001-auto.yml' to 'share/ddl/_source/deploy/4/001-auto.yml':;
|
||||
|
||||
;
|
||||
BEGIN;
|
||||
|
||||
;
|
||||
ALTER TABLE pending_transactions ADD COLUMN purchase_time timestamp;
|
||||
|
||||
UPDATE transactions SET purchase_time = submitted_at;
|
||||
|
||||
ALTER TABLE pending_transactions ALTER COLUMN purchase_time SET NOT NULL;
|
||||
|
||||
;
|
||||
|
||||
COMMIT;
|
||||
18
share/ddl/SQLite/deploy/3/001-auto-__VERSION.sql
Normal file
18
share/ddl/SQLite/deploy/3/001-auto-__VERSION.sql
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::SQLite
|
||||
-- Created on Mon Aug 14 12:22:58 2017
|
||||
--
|
||||
|
||||
;
|
||||
BEGIN TRANSACTION;
|
||||
--
|
||||
-- Table: dbix_class_deploymenthandler_versions
|
||||
--
|
||||
CREATE TABLE dbix_class_deploymenthandler_versions (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
version varchar(50) NOT NULL,
|
||||
ddl text,
|
||||
upgrade_sql text
|
||||
);
|
||||
CREATE UNIQUE INDEX dbix_class_deploymenthandler_versions_version ON dbix_class_deploymenthandler_versions (version);
|
||||
COMMIT;
|
||||
168
share/ddl/SQLite/deploy/3/001-auto.sql
Normal file
168
share/ddl/SQLite/deploy/3/001-auto.sql
Normal file
|
|
@ -0,0 +1,168 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::SQLite
|
||||
-- Created on Mon Aug 14 12:22:58 2017
|
||||
--
|
||||
|
||||
;
|
||||
BEGIN TRANSACTION;
|
||||
--
|
||||
-- Table: account_tokens
|
||||
--
|
||||
CREATE TABLE account_tokens (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
name text NOT NULL,
|
||||
used integer NOT NULL DEFAULT 0
|
||||
);
|
||||
CREATE UNIQUE INDEX account_tokens_name ON account_tokens (name);
|
||||
--
|
||||
-- Table: customers
|
||||
--
|
||||
CREATE TABLE customers (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
display_name varchar(255) NOT NULL,
|
||||
full_name varchar(255) NOT NULL,
|
||||
year_of_birth integer NOT NULL,
|
||||
postcode varchar(16) NOT NULL
|
||||
);
|
||||
--
|
||||
-- Table: leaderboards
|
||||
--
|
||||
CREATE TABLE leaderboards (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
name varchar(255) NOT NULL,
|
||||
type varchar(255) NOT NULL
|
||||
);
|
||||
CREATE UNIQUE INDEX leaderboards_type ON leaderboards (type);
|
||||
--
|
||||
-- Table: organisations
|
||||
--
|
||||
CREATE TABLE organisations (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
name varchar(255) NOT NULL,
|
||||
street_name text,
|
||||
town varchar(255) NOT NULL,
|
||||
postcode varchar(16)
|
||||
);
|
||||
--
|
||||
-- Table: leaderboard_sets
|
||||
--
|
||||
CREATE TABLE leaderboard_sets (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
leaderboard_id integer NOT NULL,
|
||||
date datetime NOT NULL,
|
||||
FOREIGN KEY (leaderboard_id) REFERENCES leaderboards(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX leaderboard_sets_idx_leaderboard_id ON leaderboard_sets (leaderboard_id);
|
||||
--
|
||||
-- Table: users
|
||||
--
|
||||
CREATE TABLE users (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
customer_id integer,
|
||||
organisation_id integer,
|
||||
email text NOT NULL,
|
||||
join_date datetime NOT NULL,
|
||||
password varchar(100) NOT NULL,
|
||||
FOREIGN KEY (customer_id) REFERENCES customers(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (organisation_id) REFERENCES organisations(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX users_idx_customer_id ON users (customer_id);
|
||||
CREATE INDEX users_idx_organisation_id ON users (organisation_id);
|
||||
CREATE UNIQUE INDEX users_customer_id ON users (customer_id);
|
||||
CREATE UNIQUE INDEX users_email ON users (email);
|
||||
CREATE UNIQUE INDEX users_organisation_id ON users (organisation_id);
|
||||
--
|
||||
-- Table: administrators
|
||||
--
|
||||
CREATE TABLE administrators (
|
||||
user_id INTEGER PRIMARY KEY NOT NULL,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
--
|
||||
-- Table: feedback
|
||||
--
|
||||
CREATE TABLE feedback (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
user_id integer NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
feedbacktext text NOT NULL,
|
||||
app_name varchar(255) NOT NULL,
|
||||
package_name varchar(255) NOT NULL,
|
||||
version_code varchar(255) NOT NULL,
|
||||
version_number varchar(255) NOT NULL,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX feedback_idx_user_id ON feedback (user_id);
|
||||
--
|
||||
-- Table: pending_organisations
|
||||
--
|
||||
CREATE TABLE pending_organisations (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
name varchar(255) NOT NULL,
|
||||
street_name text,
|
||||
town varchar(255) NOT NULL,
|
||||
postcode varchar(16),
|
||||
submitted_by_id integer NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
FOREIGN KEY (submitted_by_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX pending_organisations_idx_submitted_by_id ON pending_organisations (submitted_by_id);
|
||||
--
|
||||
-- Table: session_tokens
|
||||
--
|
||||
CREATE TABLE session_tokens (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
token varchar(255) NOT NULL,
|
||||
user_id integer NOT NULL,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX session_tokens_idx_user_id ON session_tokens (user_id);
|
||||
CREATE UNIQUE INDEX session_tokens_token ON session_tokens (token);
|
||||
--
|
||||
-- Table: transactions
|
||||
--
|
||||
CREATE TABLE transactions (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
buyer_id integer NOT NULL,
|
||||
seller_id integer NOT NULL,
|
||||
value decimal(16,2) NOT NULL,
|
||||
proof_image text NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
purchase_time datetime NOT NULL,
|
||||
FOREIGN KEY (buyer_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (seller_id) REFERENCES organisations(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX transactions_idx_buyer_id ON transactions (buyer_id);
|
||||
CREATE INDEX transactions_idx_seller_id ON transactions (seller_id);
|
||||
--
|
||||
-- Table: pending_transactions
|
||||
--
|
||||
CREATE TABLE pending_transactions (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
buyer_id integer NOT NULL,
|
||||
seller_id integer NOT NULL,
|
||||
value decimal(16,2) NOT NULL,
|
||||
proof_image text NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
FOREIGN KEY (buyer_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (seller_id) REFERENCES pending_organisations(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX pending_transactions_idx_buyer_id ON pending_transactions (buyer_id);
|
||||
CREATE INDEX pending_transactions_idx_seller_id ON pending_transactions (seller_id);
|
||||
--
|
||||
-- Table: leaderboard_values
|
||||
--
|
||||
CREATE TABLE leaderboard_values (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
user_id integer NOT NULL,
|
||||
set_id integer NOT NULL,
|
||||
position integer NOT NULL,
|
||||
value decimal(16,2) NOT NULL,
|
||||
trend integer NOT NULL DEFAULT 0,
|
||||
FOREIGN KEY (set_id) REFERENCES leaderboard_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX leaderboard_values_idx_set_id ON leaderboard_values (set_id);
|
||||
CREATE INDEX leaderboard_values_idx_user_id ON leaderboard_values (user_id);
|
||||
CREATE UNIQUE INDEX leaderboard_values_user_id_set_id ON leaderboard_values (user_id, set_id);
|
||||
COMMIT;
|
||||
18
share/ddl/SQLite/deploy/4/001-auto-__VERSION.sql
Normal file
18
share/ddl/SQLite/deploy/4/001-auto-__VERSION.sql
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::SQLite
|
||||
-- Created on Mon Aug 14 14:33:22 2017
|
||||
--
|
||||
|
||||
;
|
||||
BEGIN TRANSACTION;
|
||||
--
|
||||
-- Table: dbix_class_deploymenthandler_versions
|
||||
--
|
||||
CREATE TABLE dbix_class_deploymenthandler_versions (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
version varchar(50) NOT NULL,
|
||||
ddl text,
|
||||
upgrade_sql text
|
||||
);
|
||||
CREATE UNIQUE INDEX dbix_class_deploymenthandler_versions_version ON dbix_class_deploymenthandler_versions (version);
|
||||
COMMIT;
|
||||
169
share/ddl/SQLite/deploy/4/001-auto.sql
Normal file
169
share/ddl/SQLite/deploy/4/001-auto.sql
Normal file
|
|
@ -0,0 +1,169 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::SQLite
|
||||
-- Created on Mon Aug 14 14:33:22 2017
|
||||
--
|
||||
|
||||
;
|
||||
BEGIN TRANSACTION;
|
||||
--
|
||||
-- Table: account_tokens
|
||||
--
|
||||
CREATE TABLE account_tokens (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
name text NOT NULL,
|
||||
used integer NOT NULL DEFAULT 0
|
||||
);
|
||||
CREATE UNIQUE INDEX account_tokens_name ON account_tokens (name);
|
||||
--
|
||||
-- Table: customers
|
||||
--
|
||||
CREATE TABLE customers (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
display_name varchar(255) NOT NULL,
|
||||
full_name varchar(255) NOT NULL,
|
||||
year_of_birth integer NOT NULL,
|
||||
postcode varchar(16) NOT NULL
|
||||
);
|
||||
--
|
||||
-- Table: leaderboards
|
||||
--
|
||||
CREATE TABLE leaderboards (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
name varchar(255) NOT NULL,
|
||||
type varchar(255) NOT NULL
|
||||
);
|
||||
CREATE UNIQUE INDEX leaderboards_type ON leaderboards (type);
|
||||
--
|
||||
-- Table: organisations
|
||||
--
|
||||
CREATE TABLE organisations (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
name varchar(255) NOT NULL,
|
||||
street_name text,
|
||||
town varchar(255) NOT NULL,
|
||||
postcode varchar(16)
|
||||
);
|
||||
--
|
||||
-- Table: leaderboard_sets
|
||||
--
|
||||
CREATE TABLE leaderboard_sets (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
leaderboard_id integer NOT NULL,
|
||||
date datetime NOT NULL,
|
||||
FOREIGN KEY (leaderboard_id) REFERENCES leaderboards(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX leaderboard_sets_idx_leaderboard_id ON leaderboard_sets (leaderboard_id);
|
||||
--
|
||||
-- Table: users
|
||||
--
|
||||
CREATE TABLE users (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
customer_id integer,
|
||||
organisation_id integer,
|
||||
email text NOT NULL,
|
||||
join_date datetime NOT NULL,
|
||||
password varchar(100) NOT NULL,
|
||||
FOREIGN KEY (customer_id) REFERENCES customers(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (organisation_id) REFERENCES organisations(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX users_idx_customer_id ON users (customer_id);
|
||||
CREATE INDEX users_idx_organisation_id ON users (organisation_id);
|
||||
CREATE UNIQUE INDEX users_customer_id ON users (customer_id);
|
||||
CREATE UNIQUE INDEX users_email ON users (email);
|
||||
CREATE UNIQUE INDEX users_organisation_id ON users (organisation_id);
|
||||
--
|
||||
-- Table: administrators
|
||||
--
|
||||
CREATE TABLE administrators (
|
||||
user_id INTEGER PRIMARY KEY NOT NULL,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
--
|
||||
-- Table: feedback
|
||||
--
|
||||
CREATE TABLE feedback (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
user_id integer NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
feedbacktext text NOT NULL,
|
||||
app_name varchar(255) NOT NULL,
|
||||
package_name varchar(255) NOT NULL,
|
||||
version_code varchar(255) NOT NULL,
|
||||
version_number varchar(255) NOT NULL,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX feedback_idx_user_id ON feedback (user_id);
|
||||
--
|
||||
-- Table: pending_organisations
|
||||
--
|
||||
CREATE TABLE pending_organisations (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
name varchar(255) NOT NULL,
|
||||
street_name text,
|
||||
town varchar(255) NOT NULL,
|
||||
postcode varchar(16),
|
||||
submitted_by_id integer NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
FOREIGN KEY (submitted_by_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX pending_organisations_idx_submitted_by_id ON pending_organisations (submitted_by_id);
|
||||
--
|
||||
-- Table: session_tokens
|
||||
--
|
||||
CREATE TABLE session_tokens (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
token varchar(255) NOT NULL,
|
||||
user_id integer NOT NULL,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX session_tokens_idx_user_id ON session_tokens (user_id);
|
||||
CREATE UNIQUE INDEX session_tokens_token ON session_tokens (token);
|
||||
--
|
||||
-- Table: transactions
|
||||
--
|
||||
CREATE TABLE transactions (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
buyer_id integer NOT NULL,
|
||||
seller_id integer NOT NULL,
|
||||
value decimal(16,2) NOT NULL,
|
||||
proof_image text NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
purchase_time datetime NOT NULL,
|
||||
FOREIGN KEY (buyer_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (seller_id) REFERENCES organisations(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX transactions_idx_buyer_id ON transactions (buyer_id);
|
||||
CREATE INDEX transactions_idx_seller_id ON transactions (seller_id);
|
||||
--
|
||||
-- Table: pending_transactions
|
||||
--
|
||||
CREATE TABLE pending_transactions (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
buyer_id integer NOT NULL,
|
||||
seller_id integer NOT NULL,
|
||||
value decimal(16,2) NOT NULL,
|
||||
proof_image text NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
purchase_time datetime NOT NULL,
|
||||
FOREIGN KEY (buyer_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (seller_id) REFERENCES pending_organisations(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX pending_transactions_idx_buyer_id ON pending_transactions (buyer_id);
|
||||
CREATE INDEX pending_transactions_idx_seller_id ON pending_transactions (seller_id);
|
||||
--
|
||||
-- Table: leaderboard_values
|
||||
--
|
||||
CREATE TABLE leaderboard_values (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
user_id integer NOT NULL,
|
||||
set_id integer NOT NULL,
|
||||
position integer NOT NULL,
|
||||
value decimal(16,2) NOT NULL,
|
||||
trend integer NOT NULL DEFAULT 0,
|
||||
FOREIGN KEY (set_id) REFERENCES leaderboard_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX leaderboard_values_idx_set_id ON leaderboard_values (set_id);
|
||||
CREATE INDEX leaderboard_values_idx_user_id ON leaderboard_values (user_id);
|
||||
CREATE UNIQUE INDEX leaderboard_values_user_id_set_id ON leaderboard_values (user_id, set_id);
|
||||
COMMIT;
|
||||
44
share/ddl/SQLite/upgrade/2-3/001-auto.sql
Normal file
44
share/ddl/SQLite/upgrade/2-3/001-auto.sql
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
-- Convert schema 'share/ddl/_source/deploy/2/001-auto.yml' to 'share/ddl/_source/deploy/3/001-auto.yml':;
|
||||
|
||||
;
|
||||
BEGIN;
|
||||
|
||||
CREATE TABLE transactions_old AS SELECT * FROM transactions;
|
||||
|
||||
DROP TABLE transactions;
|
||||
|
||||
CREATE TABLE transactions (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
buyer_id integer NOT NULL,
|
||||
seller_id integer NOT NULL,
|
||||
value decimal(16,2) NOT NULL,
|
||||
proof_image text NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
purchase_time datetime NOT NULL,
|
||||
FOREIGN KEY (buyer_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (seller_id) REFERENCES organisations(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX transactions_idx_buyer_id ON transactions (buyer_id);
|
||||
CREATE INDEX transactions_idx_seller_id ON transactions (seller_id);
|
||||
|
||||
INSERT INTO transactions (
|
||||
id,
|
||||
buyer_id,
|
||||
seller_id,
|
||||
value,
|
||||
proof_image,
|
||||
submitted_at,
|
||||
purchase_time
|
||||
) SELECT
|
||||
id,
|
||||
buyer_id,
|
||||
seller_id,
|
||||
value,
|
||||
proof_image,
|
||||
submitted_at,
|
||||
submitted_at
|
||||
FROM transactions_old;
|
||||
|
||||
DROP TABLE transactions_old;
|
||||
|
||||
COMMIT;
|
||||
43
share/ddl/SQLite/upgrade/3-4/001-auto.sql
Normal file
43
share/ddl/SQLite/upgrade/3-4/001-auto.sql
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
-- Convert schema 'share/ddl/_source/deploy/3/001-auto.yml' to 'share/ddl/_source/deploy/4/001-auto.yml':;
|
||||
|
||||
;
|
||||
BEGIN;
|
||||
|
||||
CREATE TABLE pending_transactions_old AS SELECT * FROM pending_transactions;
|
||||
|
||||
DROP TABLE pending_transactions;
|
||||
|
||||
CREATE TABLE pending_transactions (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
buyer_id integer NOT NULL,
|
||||
seller_id integer NOT NULL,
|
||||
value decimal(16,2) NOT NULL,
|
||||
proof_image text NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
purchase_time datetime NOT NULL,
|
||||
FOREIGN KEY (buyer_id) REFERENCES users(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (seller_id) REFERENCES organisations(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX pending_transactions_idx_buyer_id ON pending_transactions (buyer_id);
|
||||
CREATE INDEX pending_transactions_idx_seller_id ON pending_transactions (seller_id);
|
||||
|
||||
INSERT INTO pending_transactions (
|
||||
id,
|
||||
buyer_id,
|
||||
seller_id,
|
||||
value,
|
||||
proof_image,
|
||||
submitted_at,
|
||||
purchase_time
|
||||
) SELECT
|
||||
id,
|
||||
buyer_id,
|
||||
seller_id,
|
||||
value,
|
||||
proof_image,
|
||||
submitted_at,
|
||||
submitted_at
|
||||
FROM pending_transactions_old;
|
||||
|
||||
DROP TABLE pending_transactions_old;
|
||||
COMMIT;
|
||||
91
share/ddl/_source/deploy/3/001-auto-__VERSION.yml
Normal file
91
share/ddl/_source/deploy/3/001-auto-__VERSION.yml
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
---
|
||||
schema:
|
||||
procedures: {}
|
||||
tables:
|
||||
dbix_class_deploymenthandler_versions:
|
||||
constraints:
|
||||
- deferrable: 1
|
||||
expression: ''
|
||||
fields:
|
||||
- id
|
||||
match_type: ''
|
||||
name: ''
|
||||
on_delete: ''
|
||||
on_update: ''
|
||||
options: []
|
||||
reference_fields: []
|
||||
reference_table: ''
|
||||
type: PRIMARY KEY
|
||||
- deferrable: 1
|
||||
expression: ''
|
||||
fields:
|
||||
- version
|
||||
match_type: ''
|
||||
name: dbix_class_deploymenthandler_versions_version
|
||||
on_delete: ''
|
||||
on_update: ''
|
||||
options: []
|
||||
reference_fields: []
|
||||
reference_table: ''
|
||||
type: UNIQUE
|
||||
fields:
|
||||
ddl:
|
||||
data_type: text
|
||||
default_value: ~
|
||||
is_nullable: 1
|
||||
is_primary_key: 0
|
||||
is_unique: 0
|
||||
name: ddl
|
||||
order: 3
|
||||
size:
|
||||
- 0
|
||||
id:
|
||||
data_type: int
|
||||
default_value: ~
|
||||
is_auto_increment: 1
|
||||
is_nullable: 0
|
||||
is_primary_key: 1
|
||||
is_unique: 0
|
||||
name: id
|
||||
order: 1
|
||||
size:
|
||||
- 0
|
||||
upgrade_sql:
|
||||
data_type: text
|
||||
default_value: ~
|
||||
is_nullable: 1
|
||||
is_primary_key: 0
|
||||
is_unique: 0
|
||||
name: upgrade_sql
|
||||
order: 4
|
||||
size:
|
||||
- 0
|
||||
version:
|
||||
data_type: varchar
|
||||
default_value: ~
|
||||
is_nullable: 0
|
||||
is_primary_key: 0
|
||||
is_unique: 1
|
||||
name: version
|
||||
order: 2
|
||||
size:
|
||||
- 50
|
||||
indices: []
|
||||
name: dbix_class_deploymenthandler_versions
|
||||
options: []
|
||||
order: 1
|
||||
triggers: {}
|
||||
views: {}
|
||||
translator:
|
||||
add_drop_table: 0
|
||||
filename: ~
|
||||
no_comments: 0
|
||||
parser_args:
|
||||
sources:
|
||||
- __VERSION
|
||||
parser_type: SQL::Translator::Parser::DBIx::Class
|
||||
producer_args: {}
|
||||
producer_type: SQL::Translator::Producer::YAML
|
||||
show_warnings: 0
|
||||
trace: 0
|
||||
version: 0.11021
|
||||
1237
share/ddl/_source/deploy/3/001-auto.yml
Normal file
1237
share/ddl/_source/deploy/3/001-auto.yml
Normal file
File diff suppressed because it is too large
Load diff
91
share/ddl/_source/deploy/4/001-auto-__VERSION.yml
Normal file
91
share/ddl/_source/deploy/4/001-auto-__VERSION.yml
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
---
|
||||
schema:
|
||||
procedures: {}
|
||||
tables:
|
||||
dbix_class_deploymenthandler_versions:
|
||||
constraints:
|
||||
- deferrable: 1
|
||||
expression: ''
|
||||
fields:
|
||||
- id
|
||||
match_type: ''
|
||||
name: ''
|
||||
on_delete: ''
|
||||
on_update: ''
|
||||
options: []
|
||||
reference_fields: []
|
||||
reference_table: ''
|
||||
type: PRIMARY KEY
|
||||
- deferrable: 1
|
||||
expression: ''
|
||||
fields:
|
||||
- version
|
||||
match_type: ''
|
||||
name: dbix_class_deploymenthandler_versions_version
|
||||
on_delete: ''
|
||||
on_update: ''
|
||||
options: []
|
||||
reference_fields: []
|
||||
reference_table: ''
|
||||
type: UNIQUE
|
||||
fields:
|
||||
ddl:
|
||||
data_type: text
|
||||
default_value: ~
|
||||
is_nullable: 1
|
||||
is_primary_key: 0
|
||||
is_unique: 0
|
||||
name: ddl
|
||||
order: 3
|
||||
size:
|
||||
- 0
|
||||
id:
|
||||
data_type: int
|
||||
default_value: ~
|
||||
is_auto_increment: 1
|
||||
is_nullable: 0
|
||||
is_primary_key: 1
|
||||
is_unique: 0
|
||||
name: id
|
||||
order: 1
|
||||
size:
|
||||
- 0
|
||||
upgrade_sql:
|
||||
data_type: text
|
||||
default_value: ~
|
||||
is_nullable: 1
|
||||
is_primary_key: 0
|
||||
is_unique: 0
|
||||
name: upgrade_sql
|
||||
order: 4
|
||||
size:
|
||||
- 0
|
||||
version:
|
||||
data_type: varchar
|
||||
default_value: ~
|
||||
is_nullable: 0
|
||||
is_primary_key: 0
|
||||
is_unique: 1
|
||||
name: version
|
||||
order: 2
|
||||
size:
|
||||
- 50
|
||||
indices: []
|
||||
name: dbix_class_deploymenthandler_versions
|
||||
options: []
|
||||
order: 1
|
||||
triggers: {}
|
||||
views: {}
|
||||
translator:
|
||||
add_drop_table: 0
|
||||
filename: ~
|
||||
no_comments: 0
|
||||
parser_args:
|
||||
sources:
|
||||
- __VERSION
|
||||
parser_type: SQL::Translator::Parser::DBIx::Class
|
||||
producer_args: {}
|
||||
producer_type: SQL::Translator::Producer::YAML
|
||||
show_warnings: 0
|
||||
trace: 0
|
||||
version: 0.11021
|
||||
1247
share/ddl/_source/deploy/4/001-auto.yml
Normal file
1247
share/ddl/_source/deploy/4/001-auto.yml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -106,6 +106,7 @@ my $json = {
|
|||
street_name => "2 James St",
|
||||
town => "Lancaster",
|
||||
postcode => "LA1 1UP",
|
||||
purchase_time => "2017-08-14T11:29:07.965+01:00",
|
||||
session_key => $session_key,
|
||||
};
|
||||
my $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
|
||||
|
|
@ -133,6 +134,7 @@ $json = {
|
|||
street_name => "The Crescent",
|
||||
town => "Morecambe",
|
||||
postcode => "LA4 5BZ",
|
||||
purchase_time => "2017-08-14T11:29:07.965+01:00",
|
||||
session_key => $session_key,
|
||||
};
|
||||
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
|
||||
|
|
@ -148,6 +150,7 @@ $json = {
|
|||
street_name => "63-65 Church Street",
|
||||
town => "Lancaster",
|
||||
postcode => "LA1 1ET",
|
||||
purchase_time => "2017-08-14T11:29:07.965+01:00",
|
||||
session_key => $session_key,
|
||||
};
|
||||
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
|
||||
|
|
|
|||
|
|
@ -16,6 +16,9 @@ $schema->resultset('AccountToken')->populate([
|
|||
map { [ $_ ] } @account_tokens,
|
||||
]);
|
||||
|
||||
#Add a test purchase_time to use for receipt uploading.
|
||||
my $test_purchase_time = "2017-08-14T11:29:07.965+01:00";
|
||||
|
||||
#Add one company that we've apparently authenticated but does not have an account.
|
||||
my $org_id_shinra = 1;
|
||||
|
||||
|
|
@ -110,6 +113,7 @@ $t->post_ok('/api/upload' => form => $upload )
|
|||
print "test 6 - transaction_value missing\n";
|
||||
my $json = {
|
||||
transaction_type => 1,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => $org_id_shinra,
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -123,6 +127,7 @@ print "test 7 - transaction_value non-numbers\n";
|
|||
$json = {
|
||||
transaction_value => 'Abc',
|
||||
transaction_type => 1,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => $org_id_shinra,
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -136,6 +141,7 @@ print "test 8 - transaction_value equal to zero\n";
|
|||
$json = {
|
||||
transaction_value => 0,
|
||||
transaction_type => 1,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => $org_id_shinra,
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -149,6 +155,7 @@ print "test 9 - transaction_value less than zero\n";
|
|||
$json = {
|
||||
transaction_value => -1,
|
||||
transaction_type => 1,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => $org_id_shinra,
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -161,6 +168,7 @@ $t->post_ok('/api/upload' => form => $upload )
|
|||
print "test 10 - transaction_type missing\n";
|
||||
$json = {
|
||||
transaction_value => 10,
|
||||
purchase_time => $test_purchase_time,
|
||||
session_key => $session_key,
|
||||
};
|
||||
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
|
||||
|
|
@ -173,6 +181,7 @@ print "test 11 - transaction_type invalid.\n";
|
|||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 4,
|
||||
purchase_time => $test_purchase_time,
|
||||
session_key => $session_key,
|
||||
# organisation_id => $org_id_shinra
|
||||
};
|
||||
|
|
@ -186,6 +195,7 @@ print "test 12 - file not uploaded.\n";
|
|||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 1,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => 1,
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -199,6 +209,7 @@ print "test 13 - organisation_id missing (type 1: already validated)\n";
|
|||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 1,
|
||||
purchase_time => $test_purchase_time,
|
||||
session_key => $session_key,
|
||||
# organisation_id => $org_id_shinra
|
||||
};
|
||||
|
|
@ -212,6 +223,7 @@ print "test 14 - organisation_id for non-existent id. (type 1: already validated
|
|||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 1,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => ($org_id_shinra + 100),
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -226,6 +238,7 @@ is $schema->resultset('Transaction')->count, 0, "no transactions";
|
|||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 1,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => $org_id_shinra,
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -242,6 +255,7 @@ print "test 16 - organsation missing (type 3: new organisation)\n";
|
|||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 3,
|
||||
purchase_time => $test_purchase_time,
|
||||
street_name => "Slums, Sector 7",
|
||||
town => "Midgar",
|
||||
postcode => "E1 0AA",
|
||||
|
|
@ -260,6 +274,7 @@ is $schema->resultset('PendingTransaction')->count, 0, "No pending transactions"
|
|||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 3,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_name => '7th Heaven',
|
||||
street_name => "Slums, Sector 7",
|
||||
town => "Midgar",
|
||||
|
|
@ -280,6 +295,7 @@ print "test 18 - organisation_id missing (type 2: existing organisation)\n";
|
|||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 2,
|
||||
purchase_time => $test_purchase_time,
|
||||
session_key => $session_key,
|
||||
};
|
||||
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
|
||||
|
|
@ -292,6 +308,7 @@ print "test 19 - organisation_id not a number (type 2: existing organisation)\n"
|
|||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 2,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => "Abc",
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -305,6 +322,7 @@ print "test 20 - id does not exist (type 2: existing organisation)\n";
|
|||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 2,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => 1000, #Id that does not exist
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -314,7 +332,21 @@ $t->post_ok('/api/upload' => form => $upload )
|
|||
->json_is('/success', Mojo::JSON->false)
|
||||
->content_like(qr/organisation_id does not exist in the database/i);
|
||||
|
||||
print "test 21 - Logout Rufus (type 2: existing organisation)\n";
|
||||
print "test 21 - purchase_time is missing\n";
|
||||
is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions";
|
||||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 2,
|
||||
organisation_id => $org_id_shinra,
|
||||
session_key => $session_key,
|
||||
};
|
||||
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
|
||||
$t->post_ok('/api/upload' => form => $upload )
|
||||
->status_is(400)
|
||||
->json_is('/success', Mojo::JSON->false)
|
||||
->content_like(qr/purchase_time is missing/i);
|
||||
|
||||
print "test 22 - Logout Rufus (type 2: existing organisation)\n";
|
||||
$t->post_ok('/api/logout', json => { session_key => $session_key } )
|
||||
->status_is(200)
|
||||
->json_is('/success', Mojo::JSON->true);
|
||||
|
|
@ -325,7 +357,7 @@ $t->post_ok('/api/logout', json => { session_key => $session_key } )
|
|||
|
||||
#Login as Hojo (customer)
|
||||
|
||||
print "test 22 - Login Hojo (cookies, customer)\n";
|
||||
print "test 23 - Login Hojo (cookies, customer)\n";
|
||||
$testJson = {
|
||||
'email' => $emailHojo,
|
||||
'password' => $passwordHojo,
|
||||
|
|
@ -335,13 +367,14 @@ $t->post_ok('/api/login' => json => $testJson)
|
|||
->json_is('/success', Mojo::JSON->true);
|
||||
$session_key = $t->tx->res->json('/session_key');
|
||||
|
||||
print "test 23 - add valid transaction but for with account (type 2: existing organisation)\n";
|
||||
print "test 24 - add valid transaction but for with account (type 2: existing organisation)\n";
|
||||
my $org_result = $schema->resultset('PendingOrganisation')->find({ name => '7th Heaven' });
|
||||
my $unvalidatedOrganisationId = $org_result->id;
|
||||
is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions";
|
||||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 2,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => $unvalidatedOrganisationId,
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -352,7 +385,7 @@ $t->post_ok('/api/upload' => form => $upload )
|
|||
->content_like(qr/organisation_id does not exist in the database/i);
|
||||
is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions";
|
||||
|
||||
print "test 24 - Logout Hojo\n";
|
||||
print "test 25 - Logout Hojo\n";
|
||||
$t->post_ok('/api/logout', json => { session_key => $session_key } )
|
||||
->status_is(200)
|
||||
->json_is('/success', Mojo::JSON->true);
|
||||
|
|
@ -363,7 +396,7 @@ $t->post_ok('/api/logout', json => { session_key => $session_key } )
|
|||
|
||||
#Login as Rufus (customer)
|
||||
|
||||
print "test 25 - Login Rufus (cookies, customer)\n";
|
||||
print "test 26 - Login Rufus (cookies, customer)\n";
|
||||
$testJson = {
|
||||
'email' => $emailRufus,
|
||||
'password' => $passwordRufus,
|
||||
|
|
@ -373,11 +406,12 @@ $t->post_ok('/api/login' => json => $testJson)
|
|||
->json_is('/success', Mojo::JSON->true);
|
||||
$session_key = $t->tx->res->json('/session_key');
|
||||
|
||||
print "test 26 - add valid transaction (type 2: existing organisation)\n";
|
||||
print "test 27 - add valid transaction (type 2: existing organisation)\n";
|
||||
is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions";
|
||||
$json = {
|
||||
transaction_value => 10,
|
||||
transaction_type => 2,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => $unvalidatedOrganisationId,
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -389,7 +423,7 @@ $t->post_ok('/api/upload' => form => $upload )
|
|||
is $schema->resultset('PendingTransaction')->count, 2, "2 pending transactions";
|
||||
|
||||
|
||||
print "test 27 - Logout Rufus\n";
|
||||
print "test 28 - Logout Rufus\n";
|
||||
$t->post_ok('/api/logout' => json => { session_key => $session_key } )
|
||||
->status_is(200)
|
||||
->json_is('/success', Mojo::JSON->true);
|
||||
|
|
@ -400,7 +434,7 @@ $t->post_ok('/api/logout' => json => { session_key => $session_key } )
|
|||
|
||||
#Login as Choco Billy (organisation)
|
||||
|
||||
print "test 28 - Login Choco Billy (cookies, organisation)\n";
|
||||
print "test 29 - Login Choco Billy (cookies, organisation)\n";
|
||||
$testJson = {
|
||||
'email' => $emailBilly,
|
||||
'password' => $passwordBilly,
|
||||
|
|
@ -410,11 +444,12 @@ $t->post_ok('/api/login' => json => $testJson)
|
|||
->json_is('/success', Mojo::JSON->true);
|
||||
$session_key = $t->tx->res->json('/session_key');
|
||||
|
||||
print "test 29 - organisation buy from another organisation\n";
|
||||
print "test 30 - organisation buy from another organisation\n";
|
||||
is $schema->resultset('Transaction')->count, 1, "1 transaction";
|
||||
$json = {
|
||||
transaction_value => 100000,
|
||||
transaction_type => 1,
|
||||
purchase_time => $test_purchase_time,
|
||||
organisation_id => $org_id_shinra,
|
||||
session_key => $session_key,
|
||||
};
|
||||
|
|
@ -426,4 +461,3 @@ $t->post_ok('/api/upload' => form => $upload )
|
|||
is $schema->resultset('Transaction')->count, 2, "2 transaction";
|
||||
|
||||
done_testing();
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ use warnings;
|
|||
use Mojolicious::Lite;
|
||||
use Test::More;
|
||||
|
||||
plugin 'Pear::LocalLoop::Plugin::Datetime';
|
||||
plugin 'Pear::LocalLoop::Plugin::Validators';
|
||||
|
||||
my $validator = app->validator;
|
||||
|
|
@ -16,6 +17,8 @@ my $valid_postcode = 'WC1H 9EB';
|
|||
my $invalid_postcode = 'AB1 2CD';
|
||||
my $not_a_postcode = 'a';
|
||||
my $not_a_whole_postcode = 'LA1';
|
||||
my $valid_purchase_time = '2017-08-14T11:29:07.965+01:00';
|
||||
my $invalid_purchase_time = '2017081411:29:07';
|
||||
|
||||
$validation->input({
|
||||
valid_email => $valid_email,
|
||||
|
|
@ -24,6 +27,8 @@ $validation->input({
|
|||
invalid_postcode => $invalid_postcode,
|
||||
not_a_postcode => $not_a_postcode,
|
||||
not_a_whole_postcode => $not_a_whole_postcode,
|
||||
valid_purchase_time => $valid_purchase_time,
|
||||
invalid_purchase_time => $invalid_purchase_time,
|
||||
});
|
||||
|
||||
$validation->required('valid_email')->email;
|
||||
|
|
@ -32,8 +37,10 @@ $validation->required('valid_postcode')->postcode;
|
|||
$validation->required('invalid_postcode')->postcode;
|
||||
$validation->required('not_a_postcode')->postcode;
|
||||
$validation->required('not_a_whole_postcode')->postcode;
|
||||
$validation->required('valid_purchase_time')->is_full_iso_datetime;
|
||||
$validation->required('invalid_purchase_time')->is_full_iso_datetime;
|
||||
|
||||
ok $validation->has_error, 'Have Errors';
|
||||
is_deeply $validation->failed, [ qw/ invalid_email invalid_postcode not_a_postcode not_a_whole_postcode / ], 'Correct Errors';
|
||||
is_deeply $validation->failed, [ qw/ invalid_email invalid_postcode invalid_purchase_time not_a_postcode not_a_whole_postcode / ], 'Correct Errors';
|
||||
|
||||
done_testing;
|
||||
|
|
|
|||
Reference in a new issue