Upgraded schema and made fixes

This commit is contained in:
Finn 2018-03-05 16:18:17 +00:00
parent 786cd1618a
commit 79324ff5f7
12 changed files with 3703 additions and 2 deletions

View file

@ -187,7 +187,8 @@ sub post_upload {
my $file = defined $upload ? $c->store_file_from_upload( $upload ) : undef;
my $category = $validation->param('category');
my $essential = $validation->param('essential');
my $recurring_period = $validation->('recurring');
my $recurring_period = $validation->param('recurring');
Dwarn $recurring_period;
my $distance = $c->get_distance_from_coords( $user->entity->type_object, $organisation );
my $new_transaction = $organisation->entity->create_related(

View file

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

View file

@ -81,6 +81,11 @@ __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');

View file

@ -0,0 +1,18 @@
--
-- Created by SQL::Translator::Producer::PostgreSQL
-- Created on Mon Mar 5 16:01:01 2018
--
;
--
-- 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")
);
;

View file

@ -0,0 +1,526 @@
--
-- Created by SQL::Translator::Producer::PostgreSQL
-- Created on Mon Mar 5 16:01:01 2018
--
;
--
-- 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: category
--
CREATE TABLE "category" (
"id" serial NOT NULL,
"name" character varying(255) NOT NULL,
PRIMARY KEY ("id"),
CONSTRAINT "category_name" UNIQUE ("name")
);
;
--
-- Table: entities
--
CREATE TABLE "entities" (
"id" serial NOT NULL,
"type" character varying(255) NOT NULL,
PRIMARY KEY ("id")
);
;
--
-- Table: gb_postcodes
--
CREATE TABLE "gb_postcodes" (
"outcode" character(4) NOT NULL,
"incode" character(3) DEFAULT '' NOT NULL,
"latitude" numeric(7,5),
"longitude" numeric(7,5),
PRIMARY KEY ("outcode", "incode")
);
;
--
-- Table: global_medal_group
--
CREATE TABLE "global_medal_group" (
"id" serial NOT NULL,
"group_name" character varying(255) NOT NULL,
PRIMARY KEY ("id"),
CONSTRAINT "global_medal_group_group_name" UNIQUE ("group_name")
);
;
--
-- Table: import_sets
--
CREATE TABLE "import_sets" (
"id" serial NOT NULL,
"date" timestamp 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: org_medal_group
--
CREATE TABLE "org_medal_group" (
"id" serial NOT NULL,
"group_name" character varying(255) NOT NULL,
PRIMARY KEY ("id"),
CONSTRAINT "org_medal_group_group_name" UNIQUE ("group_name")
);
;
--
-- 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,
"latitude" numeric(5,2),
"longitude" numeric(5,2),
PRIMARY KEY ("id")
);
CREATE INDEX "customers_idx_entity_id" on "customers" ("entity_id");
;
--
-- Table: entity_association
--
CREATE TABLE "entity_association" (
"id" serial NOT NULL,
"entity_id" integer NOT NULL,
"lis" boolean,
"esta" boolean,
PRIMARY KEY ("id")
);
CREATE INDEX "entity_association_idx_entity_id" on "entity_association" ("entity_id");
;
--
-- Table: global_medals
--
CREATE TABLE "global_medals" (
"id" serial NOT NULL,
"group_id" character varying(255) NOT NULL,
"threshold" integer NOT NULL,
"points" integer NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "global_medals_idx_group_id" on "global_medals" ("group_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: org_medals
--
CREATE TABLE "org_medals" (
"id" serial NOT NULL,
"group_id" character varying(255) NOT NULL,
"threshold" integer NOT NULL,
"points" integer NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "org_medals_idx_group_id" on "org_medals" ("group_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,
"is_local" boolean,
"is_fair" boolean,
"submitted_by_id" integer,
"latitude" numeric(8,5),
"longitude" numeric(8,5),
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,
"essential" boolean DEFAULT false NOT NULL,
"distance" numeric(15),
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,
"actioned" boolean DEFAULT false NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "feedback_idx_user_id" on "feedback" ("user_id");
;
--
-- Table: global_user_medal_progress
--
CREATE TABLE "global_user_medal_progress" (
"id" serial NOT NULL,
"entity_id" character varying(255) NOT NULL,
"group_id" character varying(255) NOT NULL,
"total" integer NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "global_user_medal_progress_idx_entity_id" on "global_user_medal_progress" ("entity_id");
CREATE INDEX "global_user_medal_progress_idx_group_id" on "global_user_medal_progress" ("group_id");
;
--
-- Table: global_user_medals
--
CREATE TABLE "global_user_medals" (
"id" serial NOT NULL,
"entity_id" character varying(255) NOT NULL,
"group_id" character varying(255) NOT NULL,
"points" integer NOT NULL,
"awarded_at" timestamp NOT NULL,
"threshold" integer NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "global_user_medals_idx_entity_id" on "global_user_medals" ("entity_id");
CREATE INDEX "global_user_medals_idx_group_id" on "global_user_medals" ("group_id");
;
--
-- Table: import_lookups
--
CREATE TABLE "import_lookups" (
"id" serial NOT NULL,
"set_id" integer NOT NULL,
"name" character varying(255) NOT NULL,
"entity_id" integer NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "import_lookups_idx_entity_id" on "import_lookups" ("entity_id");
CREATE INDEX "import_lookups_idx_set_id" on "import_lookups" ("set_id");
;
--
-- Table: org_user_medal_progress
--
CREATE TABLE "org_user_medal_progress" (
"id" serial NOT NULL,
"entity_id" character varying(255) NOT NULL,
"group_id" character varying(255) NOT NULL,
"total" integer NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "org_user_medal_progress_idx_entity_id" on "org_user_medal_progress" ("entity_id");
CREATE INDEX "org_user_medal_progress_idx_group_id" on "org_user_medal_progress" ("group_id");
;
--
-- Table: org_user_medals
--
CREATE TABLE "org_user_medals" (
"id" serial NOT NULL,
"entity_id" character varying(255) NOT NULL,
"group_id" character varying(255) NOT NULL,
"points" integer NOT NULL,
"awarded_at" timestamp NOT NULL,
"threshold" integer NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "org_user_medals_idx_entity_id" on "org_user_medals" ("entity_id");
CREATE INDEX "org_user_medals_idx_group_id" on "org_user_medals" ("group_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: transaction_recurring
--
CREATE TABLE "transaction_recurring" (
"id" serial NOT NULL,
"transaction_id" integer NOT NULL,
"recurring_period" character varying(255) NOT NULL,
CONSTRAINT "transaction_recurring_transaction_id" UNIQUE ("transaction_id")
);
CREATE INDEX "transaction_recurring_idx_transaction_id" on "transaction_recurring" ("transaction_id");
;
--
-- Table: import_values
--
CREATE TABLE "import_values" (
"id" serial NOT NULL,
"set_id" integer NOT NULL,
"user_name" character varying(255) NOT NULL,
"purchase_date" timestamp NOT NULL,
"purchase_value" character varying(255) NOT NULL,
"org_name" character varying(255) NOT NULL,
"transaction_id" integer,
"ignore_value" boolean DEFAULT false NOT NULL,
PRIMARY KEY ("id")
);
CREATE INDEX "import_values_idx_set_id" on "import_values" ("set_id");
CREATE INDEX "import_values_idx_transaction_id" on "import_values" ("transaction_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");
;
--
-- Table: transaction_category
--
CREATE TABLE "transaction_category" (
"category_id" integer NOT NULL,
"transaction_id" integer NOT NULL,
CONSTRAINT "transaction_category_transaction_id" UNIQUE ("transaction_id")
);
CREATE INDEX "transaction_category_idx_category_id" on "transaction_category" ("category_id");
CREATE INDEX "transaction_category_idx_transaction_id" on "transaction_category" ("transaction_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 "entity_association" ADD CONSTRAINT "entity_association_fk_entity_id" FOREIGN KEY ("entity_id")
REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
;
ALTER TABLE "global_medals" ADD CONSTRAINT "global_medals_fk_group_id" FOREIGN KEY ("group_id")
REFERENCES "global_medal_group" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
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 "org_medals" ADD CONSTRAINT "org_medals_fk_group_id" FOREIGN KEY ("group_id")
REFERENCES "org_medal_group" ("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 "global_user_medal_progress" ADD CONSTRAINT "global_user_medal_progress_fk_entity_id" FOREIGN KEY ("entity_id")
REFERENCES "entities" ("id") DEFERRABLE;
;
ALTER TABLE "global_user_medal_progress" ADD CONSTRAINT "global_user_medal_progress_fk_group_id" FOREIGN KEY ("group_id")
REFERENCES "global_medal_group" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "global_user_medals" ADD CONSTRAINT "global_user_medals_fk_entity_id" FOREIGN KEY ("entity_id")
REFERENCES "entities" ("id") DEFERRABLE;
;
ALTER TABLE "global_user_medals" ADD CONSTRAINT "global_user_medals_fk_group_id" FOREIGN KEY ("group_id")
REFERENCES "global_medal_group" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "import_lookups" ADD CONSTRAINT "import_lookups_fk_entity_id" FOREIGN KEY ("entity_id")
REFERENCES "entities" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION DEFERRABLE;
;
ALTER TABLE "import_lookups" ADD CONSTRAINT "import_lookups_fk_set_id" FOREIGN KEY ("set_id")
REFERENCES "import_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "org_user_medal_progress" ADD CONSTRAINT "org_user_medal_progress_fk_entity_id" FOREIGN KEY ("entity_id")
REFERENCES "entities" ("id") DEFERRABLE;
;
ALTER TABLE "org_user_medal_progress" ADD CONSTRAINT "org_user_medal_progress_fk_group_id" FOREIGN KEY ("group_id")
REFERENCES "org_medal_group" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "org_user_medals" ADD CONSTRAINT "org_user_medals_fk_entity_id" FOREIGN KEY ("entity_id")
REFERENCES "entities" ("id") DEFERRABLE;
;
ALTER TABLE "org_user_medals" ADD CONSTRAINT "org_user_medals_fk_group_id" FOREIGN KEY ("group_id")
REFERENCES "org_medal_group" ("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 "transaction_recurring" ADD CONSTRAINT "transaction_recurring_fk_transaction_id" FOREIGN KEY ("transaction_id")
REFERENCES "transactions" ("id") ON DELETE CASCADE DEFERRABLE;
;
ALTER TABLE "import_values" ADD CONSTRAINT "import_values_fk_set_id" FOREIGN KEY ("set_id")
REFERENCES "import_sets" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION;
;
ALTER TABLE "import_values" ADD CONSTRAINT "import_values_fk_transaction_id" FOREIGN KEY ("transaction_id")
REFERENCES "transactions" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION DEFERRABLE;
;
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;
;
ALTER TABLE "transaction_category" ADD CONSTRAINT "transaction_category_fk_category_id" FOREIGN KEY ("category_id")
REFERENCES "category" ("id") ON DELETE CASCADE DEFERRABLE;
;
ALTER TABLE "transaction_category" ADD CONSTRAINT "transaction_category_fk_transaction_id" FOREIGN KEY ("transaction_id")
REFERENCES "transactions" ("id") ON DELETE CASCADE DEFERRABLE;
;

View file

@ -0,0 +1,22 @@
-- Convert schema 'share/ddl/_source/deploy/24/001-auto.yml' to 'share/ddl/_source/deploy/25/001-auto.yml':;
;
BEGIN;
;
CREATE TABLE "transaction_recurring" (
"id" serial NOT NULL,
"transaction_id" integer NOT NULL,
"recurring_period" character varying(255) NOT NULL,
CONSTRAINT "transaction_recurring_transaction_id" UNIQUE ("transaction_id")
);
CREATE INDEX "transaction_recurring_idx_transaction_id" on "transaction_recurring" ("transaction_id");
;
ALTER TABLE "transaction_recurring" ADD CONSTRAINT "transaction_recurring_fk_transaction_id" FOREIGN KEY ("transaction_id")
REFERENCES "transactions" ("id") ON DELETE CASCADE DEFERRABLE;
;
COMMIT;

View file

@ -0,0 +1,18 @@
--
-- Created by SQL::Translator::Producer::SQLite
-- Created on Mon Mar 5 16:01:01 2018
--
;
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;

View file

@ -0,0 +1,356 @@
--
-- Created by SQL::Translator::Producer::SQLite
-- Created on Mon Mar 5 16:01:01 2018
--
;
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: category
--
CREATE TABLE category (
id INTEGER PRIMARY KEY NOT NULL,
name varchar(255) NOT NULL
);
CREATE UNIQUE INDEX category_name ON category (name);
--
-- Table: entities
--
CREATE TABLE entities (
id INTEGER PRIMARY KEY NOT NULL,
type varchar(255) NOT NULL
);
--
-- Table: gb_postcodes
--
CREATE TABLE gb_postcodes (
outcode char(4) NOT NULL,
incode char(3) NOT NULL DEFAULT '',
latitude decimal(7,5),
longitude decimal(7,5),
PRIMARY KEY (outcode, incode)
);
--
-- Table: global_medal_group
--
CREATE TABLE global_medal_group (
id INTEGER PRIMARY KEY NOT NULL,
group_name varchar(255) NOT NULL
);
CREATE UNIQUE INDEX global_medal_group_group_name ON global_medal_group (group_name);
--
-- Table: import_sets
--
CREATE TABLE import_sets (
id INTEGER PRIMARY KEY NOT NULL,
date datetime 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: org_medal_group
--
CREATE TABLE org_medal_group (
id INTEGER PRIMARY KEY NOT NULL,
group_name varchar(255) NOT NULL
);
CREATE UNIQUE INDEX org_medal_group_group_name ON org_medal_group (group_name);
--
-- 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,
latitude decimal(5,2),
longitude decimal(5,2),
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
);
CREATE INDEX customers_idx_entity_id ON customers (entity_id);
--
-- Table: entity_association
--
CREATE TABLE entity_association (
id INTEGER PRIMARY KEY NOT NULL,
entity_id integer NOT NULL,
lis boolean,
esta boolean,
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
);
CREATE INDEX entity_association_idx_entity_id ON entity_association (entity_id);
--
-- Table: global_medals
--
CREATE TABLE global_medals (
id INTEGER PRIMARY KEY NOT NULL,
group_id varchar(255) NOT NULL,
threshold integer NOT NULL,
points integer NOT NULL,
FOREIGN KEY (group_id) REFERENCES global_medal_group(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX global_medals_idx_group_id ON global_medals (group_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: org_medals
--
CREATE TABLE org_medals (
id INTEGER PRIMARY KEY NOT NULL,
group_id varchar(255) NOT NULL,
threshold integer NOT NULL,
points integer NOT NULL,
FOREIGN KEY (group_id) REFERENCES org_medal_group(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX org_medals_idx_group_id ON org_medals (group_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,
is_local boolean,
is_fair boolean,
submitted_by_id integer,
latitude decimal(8,5),
longitude decimal(8,5),
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,
essential boolean NOT NULL DEFAULT false,
distance numeric(15),
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,
actioned boolean NOT NULL DEFAULT false,
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: global_user_medal_progress
--
CREATE TABLE global_user_medal_progress (
id INTEGER PRIMARY KEY NOT NULL,
entity_id varchar(255) NOT NULL,
group_id varchar(255) NOT NULL,
total integer NOT NULL,
FOREIGN KEY (entity_id) REFERENCES entities(id),
FOREIGN KEY (group_id) REFERENCES global_medal_group(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX global_user_medal_progress_idx_entity_id ON global_user_medal_progress (entity_id);
CREATE INDEX global_user_medal_progress_idx_group_id ON global_user_medal_progress (group_id);
--
-- Table: global_user_medals
--
CREATE TABLE global_user_medals (
id INTEGER PRIMARY KEY NOT NULL,
entity_id varchar(255) NOT NULL,
group_id varchar(255) NOT NULL,
points integer NOT NULL,
awarded_at datetime NOT NULL,
threshold integer NOT NULL,
FOREIGN KEY (entity_id) REFERENCES entities(id),
FOREIGN KEY (group_id) REFERENCES global_medal_group(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX global_user_medals_idx_entity_id ON global_user_medals (entity_id);
CREATE INDEX global_user_medals_idx_group_id ON global_user_medals (group_id);
--
-- Table: import_lookups
--
CREATE TABLE import_lookups (
id INTEGER PRIMARY KEY NOT NULL,
set_id integer NOT NULL,
name varchar(255) NOT NULL,
entity_id integer NOT NULL,
FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
FOREIGN KEY (set_id) REFERENCES import_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX import_lookups_idx_entity_id ON import_lookups (entity_id);
CREATE INDEX import_lookups_idx_set_id ON import_lookups (set_id);
--
-- Table: org_user_medal_progress
--
CREATE TABLE org_user_medal_progress (
id INTEGER PRIMARY KEY NOT NULL,
entity_id varchar(255) NOT NULL,
group_id varchar(255) NOT NULL,
total integer NOT NULL,
FOREIGN KEY (entity_id) REFERENCES entities(id),
FOREIGN KEY (group_id) REFERENCES org_medal_group(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX org_user_medal_progress_idx_entity_id ON org_user_medal_progress (entity_id);
CREATE INDEX org_user_medal_progress_idx_group_id ON org_user_medal_progress (group_id);
--
-- Table: org_user_medals
--
CREATE TABLE org_user_medals (
id INTEGER PRIMARY KEY NOT NULL,
entity_id varchar(255) NOT NULL,
group_id varchar(255) NOT NULL,
points integer NOT NULL,
awarded_at datetime NOT NULL,
threshold integer NOT NULL,
FOREIGN KEY (entity_id) REFERENCES entities(id),
FOREIGN KEY (group_id) REFERENCES org_medal_group(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX org_user_medals_idx_entity_id ON org_user_medals (entity_id);
CREATE INDEX org_user_medals_idx_group_id ON org_user_medals (group_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: transaction_recurring
--
CREATE TABLE transaction_recurring (
id integer NOT NULL,
transaction_id integer NOT NULL,
recurring_period varchar(255) NOT NULL,
FOREIGN KEY (transaction_id) REFERENCES transactions(id) ON DELETE CASCADE
);
CREATE INDEX transaction_recurring_idx_transaction_id ON transaction_recurring (transaction_id);
CREATE UNIQUE INDEX transaction_recurring_transaction_id ON transaction_recurring (transaction_id);
--
-- Table: import_values
--
CREATE TABLE import_values (
id INTEGER PRIMARY KEY NOT NULL,
set_id integer NOT NULL,
user_name varchar(255) NOT NULL,
purchase_date datetime NOT NULL,
purchase_value varchar(255) NOT NULL,
org_name varchar(255) NOT NULL,
transaction_id integer,
ignore_value boolean NOT NULL DEFAULT false,
FOREIGN KEY (set_id) REFERENCES import_sets(id) ON DELETE NO ACTION ON UPDATE NO ACTION,
FOREIGN KEY (transaction_id) REFERENCES transactions(id) ON DELETE NO ACTION ON UPDATE NO ACTION
);
CREATE INDEX import_values_idx_set_id ON import_values (set_id);
CREATE INDEX import_values_idx_transaction_id ON import_values (transaction_id);
--
-- 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);
--
-- Table: transaction_category
--
CREATE TABLE transaction_category (
category_id integer NOT NULL,
transaction_id integer NOT NULL,
FOREIGN KEY (category_id) REFERENCES category(id) ON DELETE CASCADE,
FOREIGN KEY (transaction_id) REFERENCES transactions(id) ON DELETE CASCADE
);
CREATE INDEX transaction_category_idx_category_id ON transaction_category (category_id);
CREATE INDEX transaction_category_idx_transaction_id ON transaction_category (transaction_id);
CREATE UNIQUE INDEX transaction_category_transaction_id ON transaction_category (transaction_id);
COMMIT;

View file

@ -0,0 +1,23 @@
-- Convert schema 'share/ddl/_source/deploy/24/001-auto.yml' to 'share/ddl/_source/deploy/25/001-auto.yml':;
;
BEGIN;
;
CREATE TABLE transaction_recurring (
id integer NOT NULL,
transaction_id integer NOT NULL,
recurring_period varchar(255) NOT NULL,
FOREIGN KEY (transaction_id) REFERENCES transactions(id) ON DELETE CASCADE
);
;
CREATE INDEX transaction_recurring_idx_transaction_id ON transaction_recurring (transaction_id);
;
CREATE UNIQUE INDEX transaction_recurring_transaction_id ON transaction_recurring (transaction_id);
;
COMMIT;

View 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

File diff suppressed because it is too large Load diff

View file

@ -41,6 +41,10 @@
<option value="1"<%= $transaction->essential ? ' selected' : '' %>>Essential</option>
</select>
</div>
<div class="form-group">
<label for="submitted_at">Recurring Period</label>
<input id="recurring" type="text" class="form-control" placeholder="Not Recurring" name="recurring" value="<%= defined $transaction->recurring ? $transaction->recurring->recurring_period : 'Not Recurring' %>" disabled>
</div>
<div class="form-group">
<label for="text">Category</label>
<input id="category" type="text" class="form-control" placeholder="Uncategorised" name="category" value="<%= defined $transaction->category ? $transaction->category->category->name : 'Uncategorised' %>" disabled>