Tests fixed and API improved and DB upgraded
This commit is contained in:
Finn
parent
8e2cecfcf5
commit
5f241bbd46
12 changed files with 1861 additions and 7 deletions
|
|
@ -98,7 +98,7 @@ sub post_payroll_read {
|
|||
|
||||
return $c->render( json => {
|
||||
success => Mojo::JSON->true,
|
||||
transactions => \@payroll_list,
|
||||
payrolls => \@payroll_list,
|
||||
page_no => $payrolls->pager->total_entries,
|
||||
});
|
||||
}
|
||||
|
|
@ -127,6 +127,11 @@ sub post_payroll_add {
|
|||
$validation->required('payroll_total_pension');
|
||||
$validation->required('payroll_other_benefit');
|
||||
|
||||
return $c->api_validation_error if $validation->has_error;
|
||||
|
||||
my $entry_period = $c->parse_iso_month($validation->param('entry_period'));
|
||||
my $employee_amount = $validation->param('employee_amount');
|
||||
my $local_employee_amount = $validation->param('local_employee_amount');
|
||||
my $gross_payroll = $validation->param('gross_payroll');
|
||||
my $payroll_income_tax = $validation->param('payroll_income_tax');
|
||||
my $payroll_employee_ni = $validation->param('payroll_employee_ni');
|
||||
|
|
@ -134,13 +139,11 @@ sub post_payroll_add {
|
|||
my $payroll_total_pension = $validation->param('payroll_total_pension');
|
||||
my $payroll_other_benefit = $validation->param('payroll_other_benefit');
|
||||
|
||||
return $c->api_validation_error if $validation->has_error;
|
||||
|
||||
$c->schema->txn_do( sub {
|
||||
$user->entity->organisation->payroll->create({
|
||||
entry_period => $validation->param('entry_period'),
|
||||
employee_amount => $validation->param('employee_amount'),
|
||||
local_employee_amount => $validation->param('local_employee_amount'),
|
||||
entry_period => $entry_period,
|
||||
employee_amount => $employee_amount,
|
||||
local_employee_amount => $local_employee_amount,
|
||||
gross_payroll => $gross_payroll * 100000,
|
||||
payroll_income_tax => $payroll_income_tax * 100000,
|
||||
payroll_employee_ni => $payroll_employee_ni * 100000,
|
||||
|
|
|
|||
|
|
@ -14,6 +14,10 @@ sub register {
|
|||
return DateTime::Format::Strptime->new( pattern => '%Y-%m-%d' );
|
||||
});
|
||||
|
||||
$app->helper( iso_month_parser => sub {
|
||||
return DateTime::Format::Strptime->new( pattern => '%Y-%m' );
|
||||
});
|
||||
|
||||
$app->helper( parse_iso_date => sub {
|
||||
my ( $c, $date_string ) = @_;
|
||||
return $c->iso_date_parser->parse_datetime(
|
||||
|
|
@ -28,6 +32,20 @@ sub register {
|
|||
);
|
||||
});
|
||||
|
||||
$app->helper( parse_iso_month => sub {
|
||||
my ( $c, $date_string ) = @_;
|
||||
return $c->iso_month_parser->parse_datetime(
|
||||
$date_string,
|
||||
);
|
||||
});
|
||||
|
||||
$app->helper( format_iso_month => sub {
|
||||
my ( $c, $datetime_obj ) = @_;
|
||||
return $c->iso_month_parser->format_datetime(
|
||||
$datetime_obj,
|
||||
);
|
||||
});
|
||||
|
||||
$app->helper( parse_iso_datetime => sub {
|
||||
my ( $c, $date_string ) = @_;
|
||||
return $c->iso_datetime_parser->parse_datetime(
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use warnings;
|
|||
|
||||
use base 'DBIx::Class::Schema';
|
||||
|
||||
our $VERSION = 7;
|
||||
our $VERSION = 8;
|
||||
|
||||
__PACKAGE__->load_namespaces;
|
||||
|
||||
|
|
|
|||
18
share/ddl/PostgreSQL/deploy/8/001-auto-__VERSION.sql
Normal file
18
share/ddl/PostgreSQL/deploy/8/001-auto-__VERSION.sql
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::PostgreSQL
|
||||
-- Created on Tue Sep 19 16:52:01 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")
|
||||
);
|
||||
|
||||
;
|
||||
235
share/ddl/PostgreSQL/deploy/8/001-auto.sql
Normal file
235
share/ddl/PostgreSQL/deploy/8/001-auto.sql
Normal file
|
|
@ -0,0 +1,235 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::PostgreSQL
|
||||
-- Created on Tue Sep 19 16:52:01 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: entities
|
||||
--
|
||||
CREATE TABLE "entities" (
|
||||
"id" serial NOT NULL,
|
||||
"type" character varying(255) 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: customers
|
||||
--
|
||||
CREATE TABLE "customers" (
|
||||
"id" serial NOT NULL,
|
||||
"entity_id" integer 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")
|
||||
);
|
||||
CREATE INDEX "customers_idx_entity_id" on "customers" ("entity_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: organisations
|
||||
--
|
||||
CREATE TABLE "organisations" (
|
||||
"id" serial NOT NULL,
|
||||
"entity_id" integer NOT NULL,
|
||||
"name" character varying(255) NOT NULL,
|
||||
"street_name" text,
|
||||
"town" character varying(255) NOT NULL,
|
||||
"postcode" character varying(16),
|
||||
"country" character varying(255),
|
||||
"sector" character varying(1),
|
||||
"pending" boolean DEFAULT false NOT NULL,
|
||||
"submitted_by_id" integer,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "organisations_idx_entity_id" on "organisations" ("entity_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Table: transactions
|
||||
--
|
||||
CREATE TABLE "transactions" (
|
||||
"id" serial NOT NULL,
|
||||
"buyer_id" integer NOT NULL,
|
||||
"seller_id" integer NOT NULL,
|
||||
"value" numeric(100,0) NOT NULL,
|
||||
"proof_image" text,
|
||||
"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: users
|
||||
--
|
||||
CREATE TABLE "users" (
|
||||
"id" serial NOT NULL,
|
||||
"entity_id" integer NOT NULL,
|
||||
"email" text NOT NULL,
|
||||
"join_date" timestamp NOT NULL,
|
||||
"password" character varying(100) NOT NULL,
|
||||
"is_admin" boolean DEFAULT false NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "users_email" UNIQUE ("email")
|
||||
);
|
||||
CREATE INDEX "users_idx_entity_id" on "users" ("entity_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: organisation_payroll
|
||||
--
|
||||
CREATE TABLE "organisation_payroll" (
|
||||
"id" serial NOT NULL,
|
||||
"org_id" integer NOT NULL,
|
||||
"submitted_at" timestamp NOT NULL,
|
||||
"entry_period" timestamp NOT NULL,
|
||||
"employee_amount" integer NOT NULL,
|
||||
"local_employee_amount" integer NOT NULL,
|
||||
"gross_payroll" numeric(100,0) NOT NULL,
|
||||
"payroll_income_tax" numeric(100,0) NOT NULL,
|
||||
"payroll_employee_ni" numeric(100,0) NOT NULL,
|
||||
"payroll_employer_ni" numeric(100,0) NOT NULL,
|
||||
"payroll_total_pension" numeric(100,0) NOT NULL,
|
||||
"payroll_other_benefit" numeric(100,0) NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "organisation_payroll_idx_org_id" on "organisation_payroll" ("org_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: leaderboard_values
|
||||
--
|
||||
CREATE TABLE "leaderboard_values" (
|
||||
"id" serial NOT NULL,
|
||||
"entity_id" integer NOT NULL,
|
||||
"set_id" integer NOT NULL,
|
||||
"position" integer NOT NULL,
|
||||
"value" numeric(100,0) NOT NULL,
|
||||
"trend" integer DEFAULT 0 NOT NULL,
|
||||
PRIMARY KEY ("id"),
|
||||
CONSTRAINT "leaderboard_values_entity_id_set_id" UNIQUE ("entity_id", "set_id")
|
||||
);
|
||||
CREATE INDEX "leaderboard_values_idx_entity_id" on "leaderboard_values" ("entity_id");
|
||||
CREATE INDEX "leaderboard_values_idx_set_id" on "leaderboard_values" ("set_id");
|
||||
|
||||
;
|
||||
--
|
||||
-- Foreign Key Definitions
|
||||
--
|
||||
|
||||
;
|
||||
ALTER TABLE "customers" ADD CONSTRAINT "customers_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
|
||||
|
||||
;
|
||||
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 "organisations" ADD CONSTRAINT "organisations_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
|
||||
|
||||
;
|
||||
ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_buyer_id" FOREIGN KEY ("buyer_id")
|
||||
REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "transactions" ADD CONSTRAINT "transactions_fk_seller_id" FOREIGN KEY ("seller_id")
|
||||
REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
|
||||
|
||||
;
|
||||
ALTER TABLE "users" ADD CONSTRAINT "users_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
|
||||
|
||||
;
|
||||
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 "organisation_payroll" ADD CONSTRAINT "organisation_payroll_fk_org_id" FOREIGN KEY ("org_id")
|
||||
REFERENCES "organisations" ("id") DEFERRABLE;
|
||||
|
||||
;
|
||||
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 "leaderboard_values" ADD CONSTRAINT "leaderboard_values_fk_entity_id" FOREIGN KEY ("entity_id")
|
||||
REFERENCES "entities" ("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;
|
||||
|
||||
;
|
||||
31
share/ddl/PostgreSQL/upgrade/7-8/001-auto.sql
Normal file
31
share/ddl/PostgreSQL/upgrade/7-8/001-auto.sql
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
-- Convert schema 'share/ddl/_source/deploy/7/001-auto.yml' to 'share/ddl/_source/deploy/8/001-auto.yml':;
|
||||
|
||||
;
|
||||
BEGIN;
|
||||
|
||||
;
|
||||
CREATE TABLE "organisation_payroll" (
|
||||
"id" serial NOT NULL,
|
||||
"org_id" integer NOT NULL,
|
||||
"submitted_at" timestamp NOT NULL,
|
||||
"entry_period" timestamp NOT NULL,
|
||||
"employee_amount" integer NOT NULL,
|
||||
"local_employee_amount" integer NOT NULL,
|
||||
"gross_payroll" numeric(100,0) NOT NULL,
|
||||
"payroll_income_tax" numeric(100,0) NOT NULL,
|
||||
"payroll_employee_ni" numeric(100,0) NOT NULL,
|
||||
"payroll_employer_ni" numeric(100,0) NOT NULL,
|
||||
"payroll_total_pension" numeric(100,0) NOT NULL,
|
||||
"payroll_other_benefit" numeric(100,0) NOT NULL,
|
||||
PRIMARY KEY ("id")
|
||||
);
|
||||
CREATE INDEX "organisation_payroll_idx_org_id" on "organisation_payroll" ("org_id");
|
||||
|
||||
;
|
||||
ALTER TABLE "organisation_payroll" ADD CONSTRAINT "organisation_payroll_fk_org_id" FOREIGN KEY ("org_id")
|
||||
REFERENCES "organisations" ("id") DEFERRABLE;
|
||||
|
||||
;
|
||||
|
||||
COMMIT;
|
||||
|
||||
18
share/ddl/SQLite/deploy/8/001-auto-__VERSION.sql
Normal file
18
share/ddl/SQLite/deploy/8/001-auto-__VERSION.sql
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::SQLite
|
||||
-- Created on Tue Sep 19 16:52:01 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;
|
||||
164
share/ddl/SQLite/deploy/8/001-auto.sql
Normal file
164
share/ddl/SQLite/deploy/8/001-auto.sql
Normal file
|
|
@ -0,0 +1,164 @@
|
|||
--
|
||||
-- Created by SQL::Translator::Producer::SQLite
|
||||
-- Created on Tue Sep 19 16:52:01 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: entities
|
||||
--
|
||||
CREATE TABLE entities (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
type varchar(255) 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: customers
|
||||
--
|
||||
CREATE TABLE customers (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
entity_id integer 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,
|
||||
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
|
||||
);
|
||||
CREATE INDEX customers_idx_entity_id ON customers (entity_id);
|
||||
--
|
||||
-- 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: organisations
|
||||
--
|
||||
CREATE TABLE organisations (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
entity_id integer NOT NULL,
|
||||
name varchar(255) NOT NULL,
|
||||
street_name text,
|
||||
town varchar(255) NOT NULL,
|
||||
postcode varchar(16),
|
||||
country varchar(255),
|
||||
sector varchar(1),
|
||||
pending boolean NOT NULL DEFAULT false,
|
||||
submitted_by_id integer,
|
||||
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
|
||||
);
|
||||
CREATE INDEX organisations_idx_entity_id ON organisations (entity_id);
|
||||
--
|
||||
-- Table: transactions
|
||||
--
|
||||
CREATE TABLE transactions (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
buyer_id integer NOT NULL,
|
||||
seller_id integer NOT NULL,
|
||||
value numeric(100,0) NOT NULL,
|
||||
proof_image text,
|
||||
submitted_at datetime NOT NULL,
|
||||
purchase_time datetime NOT NULL,
|
||||
FOREIGN KEY (buyer_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (seller_id) REFERENCES entities(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: users
|
||||
--
|
||||
CREATE TABLE users (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
entity_id integer NOT NULL,
|
||||
email text NOT NULL,
|
||||
join_date datetime NOT NULL,
|
||||
password varchar(100) NOT NULL,
|
||||
is_admin boolean NOT NULL DEFAULT false,
|
||||
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
|
||||
);
|
||||
CREATE INDEX users_idx_entity_id ON users (entity_id);
|
||||
CREATE UNIQUE INDEX users_email ON users (email);
|
||||
--
|
||||
-- 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: organisation_payroll
|
||||
--
|
||||
CREATE TABLE organisation_payroll (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
org_id integer NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
entry_period datetime NOT NULL,
|
||||
employee_amount integer NOT NULL,
|
||||
local_employee_amount integer NOT NULL,
|
||||
gross_payroll numeric(100,0) NOT NULL,
|
||||
payroll_income_tax numeric(100,0) NOT NULL,
|
||||
payroll_employee_ni numeric(100,0) NOT NULL,
|
||||
payroll_employer_ni numeric(100,0) NOT NULL,
|
||||
payroll_total_pension numeric(100,0) NOT NULL,
|
||||
payroll_other_benefit numeric(100,0) NOT NULL,
|
||||
FOREIGN KEY (org_id) REFERENCES organisations(id)
|
||||
);
|
||||
CREATE INDEX organisation_payroll_idx_org_id ON organisation_payroll (org_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: leaderboard_values
|
||||
--
|
||||
CREATE TABLE leaderboard_values (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
entity_id integer NOT NULL,
|
||||
set_id integer NOT NULL,
|
||||
position integer NOT NULL,
|
||||
value numeric(100,0) NOT NULL,
|
||||
trend integer NOT NULL DEFAULT 0,
|
||||
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
|
||||
FOREIGN KEY (set_id) REFERENCES leaderboard_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION
|
||||
);
|
||||
CREATE INDEX leaderboard_values_idx_entity_id ON leaderboard_values (entity_id);
|
||||
CREATE INDEX leaderboard_values_idx_set_id ON leaderboard_values (set_id);
|
||||
CREATE UNIQUE INDEX leaderboard_values_entity_id_set_id ON leaderboard_values (entity_id, set_id);
|
||||
COMMIT;
|
||||
29
share/ddl/SQLite/upgrade/7-8/001-auto.sql
Normal file
29
share/ddl/SQLite/upgrade/7-8/001-auto.sql
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
-- Convert schema 'share/ddl/_source/deploy/7/001-auto.yml' to 'share/ddl/_source/deploy/8/001-auto.yml':;
|
||||
|
||||
;
|
||||
BEGIN;
|
||||
|
||||
;
|
||||
CREATE TABLE organisation_payroll (
|
||||
id INTEGER PRIMARY KEY NOT NULL,
|
||||
org_id integer NOT NULL,
|
||||
submitted_at datetime NOT NULL,
|
||||
entry_period datetime NOT NULL,
|
||||
employee_amount integer NOT NULL,
|
||||
local_employee_amount integer NOT NULL,
|
||||
gross_payroll numeric(100,0) NOT NULL,
|
||||
payroll_income_tax numeric(100,0) NOT NULL,
|
||||
payroll_employee_ni numeric(100,0) NOT NULL,
|
||||
payroll_employer_ni numeric(100,0) NOT NULL,
|
||||
payroll_total_pension numeric(100,0) NOT NULL,
|
||||
payroll_other_benefit numeric(100,0) NOT NULL,
|
||||
FOREIGN KEY (org_id) REFERENCES organisations(id)
|
||||
);
|
||||
|
||||
;
|
||||
CREATE INDEX organisation_payroll_idx_org_id ON organisation_payroll (org_id);
|
||||
|
||||
;
|
||||
|
||||
COMMIT;
|
||||
|
||||
91
share/ddl/_source/deploy/8/001-auto-__VERSION.yml
Normal file
91
share/ddl/_source/deploy/8/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
|
||||
1229
share/ddl/_source/deploy/8/001-auto.yml
Normal file
1229
share/ddl/_source/deploy/8/001-auto.yml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -208,6 +208,24 @@ $t->post_ok('/api/v1/organisation/payroll/add' => json => {
|
|||
->status_is(200)->or($framework->dump_error)
|
||||
->json_is('/success', Mojo::JSON->true);
|
||||
|
||||
## Payroll Data List read
|
||||
|
||||
$t->post_ok('/api/v1/organisation/payroll' => json => {
|
||||
session_key => $session_key,
|
||||
})
|
||||
->status_is(200)->or($framework->dump_error)
|
||||
->json_is('/success', Mojo::JSON->true)
|
||||
->json_has('/payrolls')
|
||||
->json_has('/payrolls/0/entry_period')
|
||||
->json_has('/payrolls/0/employee_amount')
|
||||
->json_has('/payrolls/0/local_employee_amount')
|
||||
->json_has('/payrolls/0/gross_payroll')
|
||||
->json_has('/payrolls/0/payroll_income_tax')
|
||||
->json_has('/payrolls/0/payroll_employee_ni')
|
||||
->json_has('/payrolls/0/payroll_employer_ni')
|
||||
->json_has('/payrolls/0/payroll_total_pension')
|
||||
->json_has('/payrolls/0/payroll_other_benefit');
|
||||
|
||||
## Supplier Form submission
|
||||
|
||||
#TODO make the test!
|
||||
|
|
|
|||
Reference in a new issue