Fixed errors and tests and updated DB

lib/Pear/LocalLoop/Schema.pm

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

lib/Pear/LocalLoop/Schema/Result/PendingTransaction.pm

@@ -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");

share/ddl/PostgreSQL/deploy/4/001-auto-__VERSION.sql

@@ -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")
+);
+
+;

share/ddl/PostgreSQL/deploy/4/001-auto.sql

@@ -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;
+
+;

share/ddl/PostgreSQL/upgrade/3-4/001-auto.sql

@@ -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;

share/ddl/SQLite/deploy/4/001-auto-__VERSION.sql

@@ -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;

share/ddl/SQLite/deploy/4/001-auto.sql

@@ -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;

share/ddl/SQLite/upgrade/3-4/001-auto.sql

@@ -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;

share/ddl/_source/deploy/4/001-auto-__VERSION.yml

@@ -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

t/api/upload.t

@@ -333,10 +333,10 @@ $t->post_ok('/api/upload' => form => $upload )
   ->content_like(qr/organisation_id does not exist in the database/i);
 
 print "test 21 - purchase_time is missing\n";
-is $schema->resultset('Transaction')->count, 0, "no transactions";
+is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions";
 $json = {
   transaction_value => 10,
-  transaction_type => 1,
+  transaction_type => 2,
   organisation_id => $org_id_shinra,
   session_key => $session_key,
 };