Merge pull request #78 from Pear-Trading/Release-v0.9.7

Release v0.9.7

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 # Next Release
 
+# v0.9.7
+
+* **Admin Fix**: Fix error in Importing under Postgres
+* **Admin Feature** Ability to add entity to LIS Added
+* Added code endpoint for LIS organisations for web app use
+* Schema updated to account for these changes
+
 # v0.9.6
 
 * **Admin Feature** Merged organisation lists into one list

lib/Pear/LocalLoop.pm

@@ -158,6 +158,7 @@ sub startup {
   my $api_v1_supplier = $api_v1->under('/supplier');
 
   $api_v1_supplier->post('/location')->to('api-v1-supplier-location#index');
+  $api_v1_supplier->post('/location/lis')->to('api-v1-supplier-location#lis_load');
 
   my $api_v1_org = $api_v1->under('/organisation')->to('api-v1-organisation#auth');
 

lib/Pear/LocalLoop/Command/dev_data.pm

@@ -28,45 +28,57 @@ sub run {
   $schema->resultset('User')->create({
     email => 'test@example.com',
     password => 'abc123',
-    customer => {
+    entity => {
-      full_name => 'Test User',
+      type => 'customer',
-      display_name => 'Test User',
+      customer => {
-      year_of_birth => 2006,
+        full_name => 'Test User',
-      postcode => 'LA1 1AA',
+        display_name => 'Test User',
+        year_of_birth => 2006,
+        postcode => 'LA1 1AA',
+      }
     },
-    administrator => {},
+    is_admin => 1,
   });
 
   $schema->resultset('User')->create({
     email => 'test2@example.com',
     password => 'abc123',
-    customer => {
+    entity => {
-      full_name => 'Test User 2',
+      type => 'customer',
-      display_name => 'Test User 2',
+      customer => {
-      year_of_birth => 2006,
+        full_name => 'Test User 2',
-      postcode => 'LA1 1AA',
+        display_name => 'Test User 2',
+        year_of_birth => 2006,
+        postcode => 'LA1 1AA',
+      },
     },
   });
 
   $schema->resultset('User')->create({
     email => 'test3@example.com',
     password => 'abc123',
-    customer => {
+    entity => {
-      full_name => 'Test User 3',
+      type => 'customer',
-      display_name => 'Test User 3',
+      customer => {
-      year_of_birth => 2006,
+        full_name => 'Test User 3',
-      postcode => 'LA1 1AA',
+        display_name => 'Test User 3',
+        year_of_birth => 2006,
+        postcode => 'LA1 1AA',
+      },
     },
   });
 
   $schema->resultset('User')->create({
     email       => 'testorg@example.com',
     password    => 'abc123',
-    organisation => {
+    entity => {
-      name        => 'Test Org',
+      type => 'organisation',
-      street_name => 'Test Street',
+      organisation => {
-      town        => 'Lancaster',
+        name        => 'Test Org',
-      postcode    => 'LA1 1AA',
+        street_name => 'Test Street',
+        town        => 'Lancaster',
+        postcode    => 'LA1 1AA',
+      },
     },
   });
 }

lib/Pear/LocalLoop/Controller/Admin/Organisations.pm

@@ -85,9 +85,15 @@ sub valid_read {
       order_by => { -desc => 'submitted_at' },
     },
   );
+  my $associations = $valid_org->entity->associations;
+  my $assoc = {
+    lis => defined $associations ? $associations->lis : 0,
+  };
+
   $c->stash(
     valid_org => $valid_org,
     transactions => $transactions,
+    associations => $assoc,
   );
 }
 
@@ -102,6 +108,7 @@ sub valid_edit {
   $validation->required('postcode')->postcode;
   $validation->optional('pending');
   $validation->optional('is_local');
+  $validation->optional('is_lis');
 
   if ( $validation->has_error ) {
     $c->flash( error => 'The validation has failed' );
@@ -121,9 +128,12 @@ sub valid_edit {
         pending     => defined $validation->param('pending') ? 0 : 1,
         is_local    => $validation->param('is_local'),
       });
+      $valid_org->entity->update_or_create_related( 'associations', {
+        lis         => $validation->param('is_lis'),
+      });
     } );
   } finally {
-    if ( @_ ) {
+    if ( @_ ) {use Devel::Dwarn; Dwarn \@_;
       $c->flash( error => 'Something went wrong Updating the Organisation' );
     } else {
       $c->flash( success => 'Updated Organisation' );

lib/Pear/LocalLoop/Controller/Api/V1/Supplier/Location.pm

@@ -79,6 +79,9 @@ sub index {
         'organisation.name',
         'organisation.latitude',
         'organisation.longitude',
+        'organisation.street_name',
+        'organisation.town',
+        'organisation.postcode',
       ],
       group_by => [ qw/ organisation.id / ],
     },
@@ -91,6 +94,9 @@ sub index {
       latitude => $_->{organisation}->{latitude} * 1,
       longitude => $_->{organisation}->{longitude} * 1,
       name => $_->{organisation}->{name},
+      street_name => $_->{organisation}->{street_name},
+      town => $_->{organisation}->{town},
+      postcode => $_->{organisation}->{postcode},
     }
   } $org_rs->all ];
 
@@ -106,4 +112,82 @@ sub index {
   );
 }
 
+sub lis_load {
+  my $c = shift;
+
+  return if $c->validation_error('index');
+
+  my $json = $c->stash->{api_json};
+
+  # Extra custom error, because its funny
+  if ( $json->{north_east}->{latitude} < $json->{south_west}->{latitude} ) {
+    return $c->render(
+      json => {
+        success => Mojo::JSON->false,
+        errors => [ 'upside_down' ],
+      },
+      status => 400,
+    );
+  }
+
+  my $entity = $c->stash->{api_user}->entity;
+  my $entity_type_object = $entity->type_object;
+  my $orgs_lis = $c->schema->resultset('EntityAssociation')->search(
+  {
+    'lis' => 1,
+  },
+  );
+
+  # need: organisations only, with name, latitude, and longitude
+  my $org_rs = $orgs_lis->search_related('entity',
+    {
+      'entity.type' => 'organisation',
+      'organisation.latitude' => { -between => [
+        $json->{south_west}->{latitude},
+        $json->{north_east}->{latitude},
+      ] },
+      'organisation.longitude' => { -between => [
+        $json->{south_west}->{longitude},
+        $json->{north_east}->{longitude},
+      ] },
+    },
+    {
+      join => [ qw/ organisation / ],
+      columns => [
+        'organisation.name',
+        'organisation.latitude',
+        'organisation.longitude',
+        'organisation.street_name',
+        'organisation.town',
+        'organisation.postcode',
+      ],
+      group_by => [ qw/ organisation.id / ],
+    },
+  );
+
+  $org_rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
+
+  my $locations = [ map {
+    {
+      latitude => $_->{organisation}->{latitude} * 1,
+      longitude => $_->{organisation}->{longitude} * 1,
+      name => $_->{organisation}->{name},
+      street_name => $_->{organisation}->{street_name},
+      town => $_->{organisation}->{town},
+      postcode => $_->{organisation}->{postcode},
+    }
+  } $org_rs->all ];
+
+  $c->render(
+    json => {
+      success => Mojo::JSON->true,
+      locations => $locations,
+      self => {
+        latitude => $entity_type_object->latitude,
+        longitude => $entity_type_object->longitude,
+      }
+    },
+  );
+}
+
 1;

lib/Pear/LocalLoop/Schema.pm

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

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

@@ -37,6 +37,11 @@ __PACKAGE__->might_have(
   "Pear::LocalLoop::Schema::Result::User" => "entity_id",
 );
 
+__PACKAGE__->might_have(
+"associations",
+  "Pear::LocalLoop::Schema::Result::EntityAssociation" => "entity_id",
+);
+
 __PACKAGE__->has_many(
   "purchases",
   "Pear::LocalLoop::Schema::Result::Transaction",

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

@@ -0,0 +1,34 @@
+package Pear::LocalLoop::Schema::Result::EntityAssociation;
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table("entity_association");
+
+__PACKAGE__->add_columns(
+  "id" => {
+    data_type => "integer",
+    is_auto_increment => 1,
+    is_nullable => 0,
+  },
+  "entity_id" => {
+    data_type => 'integer',
+    is_nullable => 0,
+    is_foreign_key => 1,
+  },
+  "lis" => {
+    data_type => 'boolean',
+    default => undef,
+    is_nullable => 1,
+  },
+);
+
+__PACKAGE__->set_primary_key("id");
+
+__PACKAGE__->belongs_to(
+  "entity",
+  "Pear::LocalLoop::Schema::Result::Entity",
+  "entity_id",
+);

lib/Pear/LocalLoop/Schema/ResultSet/ImportSet.pm

@@ -23,12 +23,28 @@ sub get_values {
   );
 }
 
+sub _unordered_get_values {
+  my $self = shift;
+  my $id = shift;
+  my $include_ignored = shift;
+  my $include_imported = shift;
+
+  return $self->find($id)->search_related(
+    'values',
+    {
+      ( $include_ignored ? () : ( ignore_value => 0 ) ),
+      ( $include_imported ? () : ( transaction_id =>  undef ) ),
+    },
+  );
+}
+
 sub get_users {
   my $self = shift;
 
-  return $self->get_values(@_)->search({},
+  return $self->_unordered_get_values(@_)->search({},
     {
       group_by => 'user_name',
+      columns => [ qw/ user_name / ],
     },
   );
 }
@@ -36,9 +52,10 @@ sub get_users {
 sub get_orgs {
   my $self = shift;
   
-  return $self->get_values(@_)->search({},
+  return $self->_unordered_get_values(@_)->search({},
     {
       group_by => 'org_name',
+      columns => [ qw/ org_name / ],
     },
   );
 }

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

@@ -0,0 +1,18 @@
+-- 
+-- Created by SQL::Translator::Producer::PostgreSQL
+-- Created on Thu Nov 23 14:08:17 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/17/001-auto.sql

@@ -0,0 +1,328 @@
+-- 
+-- Created by SQL::Translator::Producer::PostgreSQL
+-- Created on Thu Nov 23 14:08:16 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: 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: 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: 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,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "entity_association_idx_entity_id" on "entity_association" ("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,
+  "is_local" 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,
+  "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: 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: 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: 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");
+
+;
+--
+-- 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 "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 "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 "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 "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;
+
+;

share/ddl/PostgreSQL/upgrade/16-17/001-auto.sql

@@ -0,0 +1,25 @@
+-- Convert schema 'share/ddl/_source/deploy/16/001-auto.yml' to 'share/ddl/_source/deploy/17/001-auto.yml':;
+
+;
+BEGIN;
+
+;
+CREATE TABLE "entity_association" (
+  "id" serial NOT NULL,
+  "entity_id" integer NOT NULL,
+  "lis" boolean,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "entity_association_idx_entity_id" on "entity_association" ("entity_id");
+
+;
+ALTER TABLE "entity_association" ADD CONSTRAINT "entity_association_fk_entity_id" FOREIGN KEY ("entity_id")
+  REFERENCES "entities" ("id") ON DELETE CASCADE DEFERRABLE;
+
+;
+ALTER TABLE import_values ALTER COLUMN transaction_id TYPE integer;
+
+;
+
+COMMIT;
+

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

@@ -0,0 +1,18 @@
+-- 
+-- Created by SQL::Translator::Producer::SQLite
+-- Created on Thu Nov 23 14:08:17 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/17/001-auto.sql

@@ -0,0 +1,228 @@
+-- 
+-- Created by SQL::Translator::Producer::SQLite
+-- Created on Thu Nov 23 14:08:17 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: 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: 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: 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,
+  FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
+);
+CREATE INDEX entity_association_idx_entity_id ON entity_association (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,
+  is_local 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,
+  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: 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: 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: 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);
+COMMIT;

share/ddl/SQLite/upgrade/16-17/001-auto.sql

@@ -0,0 +1,66 @@
+-- Convert schema 'share/ddl/_source/deploy/16/001-auto.yml' to 'share/ddl/_source/deploy/17/001-auto.yml':;
+
+;
+BEGIN;
+
+;
+CREATE TABLE entity_association (
+  id INTEGER PRIMARY KEY NOT NULL,
+  entity_id integer NOT NULL,
+  lis boolean,
+  FOREIGN KEY (entity_id) REFERENCES entities(id) ON DELETE CASCADE
+);
+
+;
+CREATE INDEX entity_association_idx_entity_id ON entity_association (entity_id);
+
+;
+CREATE TEMPORARY TABLE import_values_temp_alter (
+  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
+);
+
+;
+INSERT INTO import_values_temp_alter( id, set_id, user_name, purchase_date, purchase_value, org_name, transaction_id, ignore_value) SELECT id, set_id, user_name, purchase_date, purchase_value, org_name, transaction_id, ignore_value FROM import_values;
+
+;
+DROP 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_id02 ON import_values (set_id);
+
+;
+CREATE INDEX import_values_idx_transacti00 ON import_values (transaction_id);
+
+;
+INSERT INTO import_values SELECT id, set_id, user_name, purchase_date, purchase_value, org_name, transaction_id, ignore_value FROM import_values_temp_alter;
+
+;
+DROP TABLE import_values_temp_alter;
+
+;
+
+COMMIT;
+

share/ddl/_source/deploy/17/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/v1/supplier/location.t

@@ -49,6 +49,9 @@ $t->post_ok('/api/v1/supplier/location' => json => {
       name => 'Test Org 2',
       latitude => 54.04679,
       longitude => -2.7963,
+      street_name => 'Test Street',
+      town => 'Lancaster',
+      postcode => 'LA1 1AG',
     },
   ])
   ->json_is('/self', {
@@ -56,4 +59,32 @@ $t->post_ok('/api/v1/supplier/location' => json => {
       longitude => -2.79611,
   });
 
+  $t->post_ok('/api/v1/supplier/location/lis' => json => {
+      session_key => $session_key,
+      north_east => {
+        latitude => 54.077665,
+        longitude => -2.761860,
+      },
+      south_west => {
+        latitude => 54.013361,
+        longitude => -2.857647,
+      },
+    })
+    ->status_is(200)->or($framework->dump_error)
+    ->json_is('/success', Mojo::JSON->true)
+    ->json_is('/locations', [
+      {
+        name => 'Test Org 2',
+        latitude => 54.04679,
+        longitude => -2.7963,
+        street_name => 'Test Street',
+        town => 'Lancaster',
+        postcode => 'LA1 1AG',
+      },
+    ])
+    ->json_is('/self', {
+        latitude => 54.04725,
+        longitude => -2.79611,
+    });
+
 done_testing;

t/etc/fixtures/config/full.pl

@@ -99,8 +99,8 @@ my $org1 = {
     street_name => 'Test Street',
     town        => 'Lancaster',
     postcode    => 'LA1 1AF',
-    latitude     => 54.04725,
+    latitude    => 54.04725,
-    longitude    => -2.79611,
+    longitude   => -2.79611,
   },
   user => {
     email    => 'org1@example.com',
@@ -115,13 +115,16 @@ my $org2 = {
     street_name => 'Test Street',
     town        => 'Lancaster',
     postcode    => 'LA1 1AG',
-    latitude     => 54.04679,
+    latitude    => 54.04679,
-    longitude    => -2.7963,
+    longitude   => -2.7963,
   },
   user => {
     email    => 'org2@example.com',
     password => 'abc123',
   },
+  associations => {
+    lis => 1,
+  },
   type => "organisation",
 };
 
@@ -207,4 +210,3 @@ $fixtures->dump({
   schema => $schema,
   directory => "$Bin/../data/" . $data_set,
 });
-

t/etc/fixtures/data/full/_config_set

@@ -2,64 +2,88 @@ $VAR1 = {
           'has_many' => {
                           'fetch' => 0
                         },
+          'belongs_to' => {
+                            'fetch' => 0
+                          },
+          'might_have' => {
+                            'fetch' => 0
+                          },
           'sets' => [
+                      {
+                        'class' => 'EntityAssociation',
+                        'quantity' => 'all'
+                      },
+                      {
+                        'quantity' => 'all',
+                        'class' => 'ViewQuantisedTransactionPg'
+                      },
                       {
                         'class' => 'OrganisationPayroll',
                         'quantity' => 'all'
                       },
-                      {
-                        'quantity' => 'all',
-                        'class' => 'User'
-                      },
-                      {
-                        'quantity' => 'all',
-                        'class' => 'Customer'
-                      },
-                      {
-                        'class' => 'Entity',
-                        'quantity' => 'all'
-                      },
-                      {
-                        'quantity' => 'all',
-                        'class' => 'LeaderboardValue'
-                      },
                       {
                         'quantity' => 'all',
                         'class' => 'Feedback'
                       },
                       {
-                        'class' => 'Organisation',
+                        'class' => 'LeaderboardValue',
-                        'quantity' => 'all'
-                      },
-                      {
-                        'class' => 'GbPostcode',
                         'quantity' => 'all'
                       },
                       {
                         'quantity' => 'all',
-                        'class' => 'LeaderboardSet'
+                        'class' => 'GbPostcode'
-                      },
-                      {
-                        'quantity' => 'all',
-                        'class' => 'AccountToken'
                       },
                       {
                         'quantity' => 'all',
                         'class' => 'SessionToken'
                       },
+                      {
+                        'quantity' => 'all',
+                        'class' => 'ViewQuantisedTransactionSQLite'
+                      },
+                      {
+                        'class' => 'LeaderboardSet',
+                        'quantity' => 'all'
+                      },
+                      {
+                        'class' => 'ImportSet',
+                        'quantity' => 'all'
+                      },
+                      {
+                        'quantity' => 'all',
+                        'class' => 'ImportValue'
+                      },
+                      {
+                        'class' => 'AccountToken',
+                        'quantity' => 'all'
+                      },
+                      {
+                        'quantity' => 'all',
+                        'class' => 'Leaderboard'
+                      },
                       {
                         'quantity' => 'all',
                         'class' => 'Transaction'
                       },
                       {
-                        'class' => 'Leaderboard',
+                        'quantity' => 'all',
+                        'class' => 'Organisation'
+                      },
+                      {
+                        'class' => 'Customer',
                         'quantity' => 'all'
+                      },
+                      {
+                        'class' => 'ImportLookup',
+                        'quantity' => 'all'
+                      },
+                      {
+                        'class' => 'Entity',
+                        'quantity' => 'all'
+                      },
+                      {
+                        'quantity' => 'all',
+                        'class' => 'User'
                       }
-                    ],
+                    ]
-          'belongs_to' => {
-                            'fetch' => 0
-                          },
-          'might_have' => {
-                            'fetch' => 0
-                          }
         };

t/etc/fixtures/data/full/entity_association/1.fix

@@ -0,0 +1,6 @@
+$HASH1 = {
+           entity_id
+                 => 6,
+           id    => 1,
+           lis   => 1
+         };

t/etc/fixtures/data/full/gb_postcodes/LA2-0AA.fix

@@ -1,6 +1,6 @@
 $HASH1 = {
            incode    => '0AA',
            latitude  => 54.02493,
-           longitude => -2.80717,
+           longitude => -2.80718,
            outcode   => 'LA2'
          };

t/etc/fixtures/data/full/organisations/1.fix

@@ -3,6 +3,7 @@ $HASH1 = {
            entity_id
                     => 5,
            id       => 1,
+           is_local => undef,
            latitude => 54.04725,
            longitude
                     => -2.79611,

t/etc/fixtures/data/full/organisations/2.fix

@@ -3,6 +3,7 @@ $HASH1 = {
            entity_id
                     => 6,
            id       => 2,
+           is_local => undef,
            latitude => 54.04679,
            longitude
                     => -2.7963,

templates/admin/organisations/valid_read.html.ep

@@ -99,6 +99,15 @@ function initMap() {
                       value="0"<%= $valid_org->pending ? '' : ' checked' %>>
             </div>
           </div>
+          <div class="form-group row">
+            <label for="lis" class="col-md-4 col-form-label">Part of LIS</label>
+            <div class="col-md-8">
+              <select id="lis" class="form-control" name="is_lis">
+                <option value="0"<%= !$associations->{lis} ? '' : ' selected' %>>Not In Story</option>
+                <option value="1"<%= $associations->{lis} ? ' selected' : '' %>>In Story</option>
+              </select>
+            </div>
+          </div>
           <div class="form-group row">
             <label for="local" class="col-md-4 col-form-label">Is Local</label>
             <div class="col-md-8">