Merge pull request #36 from Pear-Trading/finn/sector

Sector endpoint added
This commit is contained in:
Finn 2017-08-25 16:03:03 +01:00 committed by GitHub
commit 5fb0b7c483
27 changed files with 1870 additions and 1 deletions

View file

@ -28,6 +28,7 @@ sub add_org_submit {
$validation->required('name'); $validation->required('name');
$validation->optional('street_name'); $validation->optional('street_name');
$validation->required('town'); $validation->required('town');
$validation->optional('sector');
$validation->optional('postcode')->postcode; $validation->optional('postcode')->postcode;
if ( $validation->has_error ) { if ( $validation->has_error ) {
@ -43,6 +44,7 @@ sub add_org_submit {
name => $validation->param('name'), name => $validation->param('name'),
street_name => $validation->param('street_name'), street_name => $validation->param('street_name'),
town => $validation->param('town'), town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'), postcode => $validation->param('postcode'),
}); });
} finally { } finally {
@ -78,6 +80,7 @@ sub valid_edit {
$validation->required('name'); $validation->required('name');
$validation->required('street_name'); $validation->required('street_name');
$validation->required('town'); $validation->required('town');
$validation->optional('sector');
$validation->required('postcode')->postcode; $validation->required('postcode')->postcode;
if ( $validation->has_error ) { if ( $validation->has_error ) {
@ -94,6 +97,7 @@ sub valid_edit {
name => $validation->param('name'), name => $validation->param('name'),
street_name => $validation->param('street_name'), street_name => $validation->param('street_name'),
town => $validation->param('town'), town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'), postcode => $validation->param('postcode'),
}); });
} ); } );

View file

@ -68,6 +68,7 @@ sub edit {
$validation->required('name'); $validation->required('name');
$validation->required('street_name'); $validation->required('street_name');
$validation->required('town'); $validation->required('town');
$validation->optional('sector');
} }
if ( $validation->has_error ) { if ( $validation->has_error ) {
@ -107,6 +108,7 @@ sub edit {
name => $validation->param('name'), name => $validation->param('name'),
street_name => $validation->param('street_name'), street_name => $validation->param('street_name'),
town => $validation->param('town'), town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'), postcode => $validation->param('postcode'),
}); });
$user->update({ $user->update({

View file

@ -75,6 +75,7 @@ sub post_register{
$validation->required('name'); $validation->required('name');
$validation->required('street_name'); $validation->required('street_name');
$validation->required('town'); $validation->required('town');
$validation->required('sector');
} }
return $c->api_validation_error if $validation->has_error; return $c->api_validation_error if $validation->has_error;
@ -112,6 +113,7 @@ sub post_register{
name => $validation->param('name'), name => $validation->param('name'),
street_name => $validation->param('street_name'), street_name => $validation->param('street_name'),
town => $validation->param('town'), town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'), postcode => $validation->param('postcode'),
}); });
$c->schema->resultset('User')->create({ $c->schema->resultset('User')->create({

View file

@ -128,6 +128,7 @@ sub post_account_update {
$validation->required('name'); $validation->required('name');
$validation->required('street_name'); $validation->required('street_name');
$validation->required('town'); $validation->required('town');
$validation->required('sector');
} }
return $c->api_validation_error if $validation->has_error; return $c->api_validation_error if $validation->has_error;
@ -154,6 +155,7 @@ sub post_account_update {
name => $validation->param('name'), name => $validation->param('name'),
street_name => $validation->param('street_name'), street_name => $validation->param('street_name'),
town => $validation->param('town'), town => $validation->param('town'),
sector => $validation->param('sector'),
postcode => $validation->param('postcode'), postcode => $validation->param('postcode'),
}); });
$user->update({ $user->update({

View file

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

View file

@ -34,6 +34,11 @@ __PACKAGE__->add_columns(
size => 16, size => 16,
is_nullable => 1, is_nullable => 1,
}, },
sector => {
data_type => "varchar",
size => 1,
is_nullable => 1,
},
); );
__PACKAGE__->set_primary_key('id'); __PACKAGE__->set_primary_key('id');

View file

@ -0,0 +1,18 @@
--
-- Created by SQL::Translator::Producer::PostgreSQL
-- Created on Fri Aug 25 15:32:15 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")
);
;

View file

@ -0,0 +1,250 @@
--
-- Created by SQL::Translator::Producer::PostgreSQL
-- Created on Fri Aug 25 15:32:15 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),
"sector" character varying(1),
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;
;

View file

@ -0,0 +1,12 @@
-- Convert schema 'share/ddl/_source/deploy/4/001-auto.yml' to 'share/ddl/_source/deploy/5/001-auto.yml':;
;
BEGIN;
;
ALTER TABLE organisations ADD COLUMN sector character varying(1);
;
COMMIT;

View file

@ -0,0 +1,18 @@
--
-- Created by SQL::Translator::Producer::SQLite
-- Created on Fri Aug 25 15:32:15 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;

View file

@ -0,0 +1,170 @@
--
-- Created by SQL::Translator::Producer::SQLite
-- Created on Fri Aug 25 15:32:15 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),
sector varchar(1)
);
--
-- 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;

View file

@ -0,0 +1,12 @@
-- Convert schema 'share/ddl/_source/deploy/4/001-auto.yml' to 'share/ddl/_source/deploy/5/001-auto.yml':;
;
BEGIN;
;
ALTER TABLE organisations ADD COLUMN sector varchar(1);
;
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

@ -21,6 +21,7 @@ $schema->resultset('Organisation')->create({
name => 'Shinra Electric Power Company', name => 'Shinra Electric Power Company',
street_name => 'Sector 0, Midgar, Eastern Continent', street_name => 'Sector 0, Midgar, Eastern Continent',
town => 'Gaia', town => 'Gaia',
sector => 'A',
postcode => 'WC1E 6AD', postcode => 'WC1E 6AD',
}); });
@ -53,6 +54,7 @@ $t->post_ok('/admin/organisations/valid/1/edit', form => {
name => 'Shinra Electric Power Company', name => 'Shinra Electric Power Company',
street_name => 'Sector 0, Midgar, Eastern Continent', street_name => 'Sector 0, Midgar, Eastern Continent',
town => 'Gaia', town => 'Gaia',
sector => 'A',
postcode => 'WC1E 6AD', postcode => 'WC1E 6AD',
})->status_is(200)->content_like(qr/Updated Organisation/); })->status_is(200)->content_like(qr/Updated Organisation/);
@ -60,6 +62,7 @@ $t->post_ok('/admin/organisations/valid/1/edit', form => {
$t->post_ok('/admin/organisations/valid/1/edit', form => { $t->post_ok('/admin/organisations/valid/1/edit', form => {
name => 'Shinra Electric Power Company', name => 'Shinra Electric Power Company',
street_name => 'Sector 0, Midgar, Eastern Continent', street_name => 'Sector 0, Midgar, Eastern Continent',
sector => 'A',
postcode => 'WC1E 6AD', postcode => 'WC1E 6AD',
})->content_like(qr/The validation has failed/); })->content_like(qr/The validation has failed/);
@ -83,6 +86,7 @@ $t->post_ok('/admin/organisations/add/submit', form => {
name => 'Wall Market', name => 'Wall Market',
street_name => 'Slums, Sector 6', street_name => 'Slums, Sector 6',
town => 'Midgar', town => 'Midgar',
sector => 'A',
postcode => 'TN35 5AQ', postcode => 'TN35 5AQ',
})->status_is(200)->content_like(qr/Added Organisation/); })->status_is(200)->content_like(qr/Added Organisation/);

View file

@ -32,6 +32,7 @@ my $org = {
name => '7th Heaven', name => '7th Heaven',
street_name => 'Slums, Sector 7', street_name => 'Slums, Sector 7',
town => 'Midgar', town => 'Midgar',
sector => 'A',
postcode => 'WC1E 6AD', postcode => 'WC1E 6AD',
password => 'abc123', password => 'abc123',
}; };
@ -65,6 +66,7 @@ $t->post_ok('/admin/users/2/edit', form => {
full_name => 'Test User1', full_name => 'Test User1',
display_name => 'Test User1', display_name => 'Test User1',
town => 'Midgar', town => 'Midgar',
sector => 'A',
postcode => 'WC1E 6AD', postcode => 'WC1E 6AD',
})->status_is(200)->content_like(qr/Updated User/); })->status_is(200)->content_like(qr/Updated User/);
@ -75,6 +77,7 @@ $t->post_ok('/admin/users/2/edit', form => {
full_name => 'Test User1', full_name => 'Test User1',
display_name => 'Test User1', display_name => 'Test User1',
town => 'Midgar', town => 'Midgar',
sector => 'A',
})->content_like(qr/The validation has failed/); })->content_like(qr/The validation has failed/);
#Failed validation on customer user from no display name #Failed validation on customer user from no display name
@ -84,6 +87,7 @@ $t->post_ok('/admin/users/2/edit', form => {
full_name => 'Test User1', full_name => 'Test User1',
town => 'Midgar', town => 'Midgar',
postcode => 'WC1E 6AD', postcode => 'WC1E 6AD',
sector => 'A',
})->content_like(qr/The validation has failed/); })->content_like(qr/The validation has failed/);
#Valid organisation user update #Valid organisation user update
@ -93,6 +97,7 @@ $t->post_ok('/admin/users/3/edit', form => {
name => '7th Heaven', name => '7th Heaven',
street_name => 'Slums, Sector 7', street_name => 'Slums, Sector 7',
town => 'Midgar', town => 'Midgar',
sector => 'A',
postcode => 'WC1E 6AD', postcode => 'WC1E 6AD',
})->status_is(200)->content_like(qr/Updated User/); })->status_is(200)->content_like(qr/Updated User/);
@ -103,6 +108,7 @@ $t->post_ok('/admin/users/3/edit', form => {
name => '7th Heaven', name => '7th Heaven',
street_name => 'Slums, Sector 7', street_name => 'Slums, Sector 7',
town => 'Midgar', town => 'Midgar',
sector => 'A',
})->content_like(qr/The validation has failed/); })->content_like(qr/The validation has failed/);
#Failed validation on organisation user from no street name #Failed validation on organisation user from no street name
@ -111,6 +117,7 @@ $t->post_ok('/admin/users/3/edit', form => {
new_password => 'abc123', new_password => 'abc123',
name => '7th Heaven', name => '7th Heaven',
town => 'Midgar', town => 'Midgar',
sector => 'A',
postcode => 'WC1E 6AD', postcode => 'WC1E 6AD',
})->content_like(qr/The validation has failed/); })->content_like(qr/The validation has failed/);

View file

@ -342,6 +342,7 @@ $testJson = {
'email' => 'org@org.com', 'email' => 'org@org.com',
'postcode' => 'LA1 1AA', 'postcode' => 'LA1 1AA',
'password' => 'Meh', 'password' => 'Meh',
'sector' => 'A',
}; };
$t->post_ok('/api/register' => json => $testJson) $t->post_ok('/api/register' => json => $testJson)
->status_is(400) ->status_is(400)
@ -360,6 +361,7 @@ $testJson = {
'password' => 'Meh', 'password' => 'Meh',
'street_name' => 'mary lane testing....', 'street_name' => 'mary lane testing....',
'town' => 'Lancaster', 'town' => 'Lancaster',
'sector' => 'A',
}; };
$t->post_ok('/api/register' => json => $testJson) $t->post_ok('/api/register' => json => $testJson)
->status_is(200) ->status_is(200)

View file

@ -55,6 +55,7 @@ $testJson = {
'password' => $passwordBilly, 'password' => $passwordBilly,
'street_name' => 'Market St', 'street_name' => 'Market St',
'town' => 'Lancaster', 'town' => 'Lancaster',
'sector' => 'A',
}; };
$t->post_ok('/api/register' => json => $testJson) $t->post_ok('/api/register' => json => $testJson)
->status_is(200) ->status_is(200)

View file

@ -28,6 +28,7 @@ my $org = {
town => 'Lancaster', town => 'Lancaster',
postcode => 'LA1 1AA', postcode => 'LA1 1AA',
password => 'abc123', password => 'abc123',
sector => 'A',
}; };
$schema->resultset('AccountToken')->create({ name => $user->{token} }); $schema->resultset('AccountToken')->create({ name => $user->{token} });

View file

@ -56,6 +56,7 @@ my $org = {
name => 'Test Org', name => 'Test Org',
street_name => 'Test Street', street_name => 'Test Street',
town => 'Lancaster', town => 'Lancaster',
sector => 'A',
postcode => 'LA1 1AA', postcode => 'LA1 1AA',
password => 'abc123', password => 'abc123',
}; };

View file

@ -81,6 +81,7 @@ $testJson = {
'password' => $passwordBilly, 'password' => $passwordBilly,
'street_name' => 'Chocobo Farm, Eastern Continent', 'street_name' => 'Chocobo Farm, Eastern Continent',
'town' => 'Gaia', 'town' => 'Gaia',
'sector' => 'A',
}; };
$t->post_ok('/api/register' => json => $testJson) $t->post_ok('/api/register' => json => $testJson)
->status_is(200) ->status_is(200)

View file

@ -58,6 +58,7 @@ my $org = {
town => 'Lancaster', town => 'Lancaster',
postcode => 'LA1 1AA', postcode => 'LA1 1AA',
password => 'abc123', password => 'abc123',
sector => 'A',
}; };
$schema->resultset('AccountToken')->create({ name => $_->{token} }) $schema->resultset('AccountToken')->create({ name => $_->{token} })

View file

@ -58,6 +58,7 @@ my $org = {
town => 'Lancaster', town => 'Lancaster',
postcode => 'LA1 1AA', postcode => 'LA1 1AA',
password => 'abc123', password => 'abc123',
sector => 'A',
}; };
$schema->resultset('AccountToken')->create({ name => $_->{token} }) $schema->resultset('AccountToken')->create({ name => $_->{token} })

View file

@ -58,6 +58,7 @@ my $org = {
town => 'Lancaster', town => 'Lancaster',
postcode => 'LA1 1AA', postcode => 'LA1 1AA',
password => 'abc123', password => 'abc123',
sector => 'A',
}; };
$schema->resultset('AccountToken')->create({ name => $_->{token} }) $schema->resultset('AccountToken')->create({ name => $_->{token} })

View file

@ -21,6 +21,7 @@
<li class="list-group-item"><input id="name" type="text" class="form-control" placeholder="Organisation Name" name="name"></li> <li class="list-group-item"><input id="name" type="text" class="form-control" placeholder="Organisation Name" name="name"></li>
<li class="list-group-item"><input id="street_name" type="text" class="form-control" placeholder="Street Name" name="street_name"></li> <li class="list-group-item"><input id="street_name" type="text" class="form-control" placeholder="Street Name" name="street_name"></li>
<li class="list-group-item"><input id="town" type="text" class="form-control" placeholder="Town" name="town"></li> <li class="list-group-item"><input id="town" type="text" class="form-control" placeholder="Town" name="town"></li>
<li class="list-group-item"><input id="sector" type="text" class="form-control" placeholder="Sector Area Code" name="sector"></li>
<li class="list-group-item"><input id="postcode" type="text" class="form-control" placeholder="Postcode" name="postcode"></li> <li class="list-group-item"><input id="postcode" type="text" class="form-control" placeholder="Postcode" name="postcode"></li>
<li class="list-group-item"><button class="btn btn-success" type="submit">Add Organisation</button></li> <li class="list-group-item"><button class="btn btn-success" type="submit">Add Organisation</button></li>
</form> </form>

View file

@ -20,6 +20,7 @@
<li class="list-group-item"><input id="name" type="text" class="form-control" placeholder="Organisation Name" name="name" value="<%= $valid_org->name %>"></li> <li class="list-group-item"><input id="name" type="text" class="form-control" placeholder="Organisation Name" name="name" value="<%= $valid_org->name %>"></li>
<li class="list-group-item"><input id="street_name" type="text" class="form-control" placeholder="Street Name" name="street_name" value="<%= $valid_org->street_name %>"></li> <li class="list-group-item"><input id="street_name" type="text" class="form-control" placeholder="Street Name" name="street_name" value="<%= $valid_org->street_name %>"></li>
<li class="list-group-item"><input id="town" type="text" class="form-control" placeholder="Town" name="town" value="<%= $valid_org->town %>"></li> <li class="list-group-item"><input id="town" type="text" class="form-control" placeholder="Town" name="town" value="<%= $valid_org->town %>"></li>
<li class="list-group-item"><input id="sector" type="text" class="form-control" placeholder="Sector Letter Code" name="sector" value="<%= $valid_org->sector %>"></li>
<li class="list-group-item"><input id="postcode" type="text" class="form-control" placeholder="Postcode" name="postcode" value="<%= $valid_org->postcode %>"></li> <li class="list-group-item"><input id="postcode" type="text" class="form-control" placeholder="Postcode" name="postcode" value="<%= $valid_org->postcode %>"></li>
<li class="list-group-item"><button class="btn btn-success" type="submit">Edit Organisation</button></li> <li class="list-group-item"><button class="btn btn-success" type="submit">Edit Organisation</button></li>
</form> </form>

View file

@ -72,6 +72,10 @@
<label for="town">Town</label> <label for="town">Town</label>
<input id="town" type="text" class="form-control" placeholder="Town" name="town" value="<%= $org_rs->town %>"> <input id="town" type="text" class="form-control" placeholder="Town" name="town" value="<%= $org_rs->town %>">
</div> </div>
<div class="form-group">
<label for="town">Town</label>
<input id="town" type="sector" class="form-control" placeholder="Sector Area Code" name="sector" value="<%= $org_rs->sector %>">
</div>
% } else { % } else {
<h3 class="card-header"> <h3 class="card-header">
User is not a customer or an organisation User is not a customer or an organisation