jobshop 0.0.163 → 0.0.167

data/config/locales/devise.en.yml

@@ -0,0 +1,64 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      email_changed:
+        subject: "Email Changed"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"

data/config/routes.rb

@@ -1,4 +1,3 @@
 Jobshop::Engine.routes.draw do
-  post "/signin", to: "sessions#new"
-  get "/current-user", to: "users#current"
+  devise_for :users, class_name: "Jobshop::User", module: :devise
 end

data/db/migrate/20170311194758_initialize_jobshop.rb

@@ -2,7 +2,47 @@
 
 class InitializeJobshop < ActiveRecord::Migration[5.2]
   def change
-    enable_extension "pgcrypto" unless extension_enabled? "pgcrypto"
-    enable_extension "citext"   unless extension_enabled? "citext"
+    enable_extension "pgcrypto"   unless extension_enabled? "pgcrypto"
+    enable_extension "citext"     unless extension_enabled? "citext"
+    enable_extension "btree_gist" unless extension_enabled? "btree_gist"
+
+    execute <<~SQL
+      -- prepare_auditable()
+      CREATE OR REPLACE FUNCTION prepare_auditable() RETURNS TRIGGER AS $$
+        BEGIN
+          IF (TG_OP = 'UPDATE') THEN
+            NEW.version = OLD.version + 1;
+            RETURN NEW;
+          ELSIF (TG_OP = 'INSERT') THEN
+            NEW.version = 0;
+            RETURN NEW;
+          END IF;
+        END;
+      $$ LANGUAGE plpgsql;
+
+      -- process_auditable(audit_table_name)
+      CREATE OR REPLACE FUNCTION process_auditable() RETURNS TRIGGER AS $$
+        DECLARE
+          audit_table_name text := TG_ARGV[0];
+
+        BEGIN
+          IF (TG_OP = 'UPDATE') THEN
+            EXECUTE
+              FORMAT(
+                'INSERT INTO %1$I SELECT gen_random_uuid(), now(), ($1).*',
+                audit_table_name)
+              USING OLD;
+            RETURN NEW;
+          ELSIF (TG_OP = 'INSERT') THEN
+            EXECUTE
+              FORMAT(
+                'INSERT INTO %1$I SELECT gen_random_uuid(), now(), ($1).*',
+                audit_table_name)
+              USING NEW;
+            RETURN NEW;
+          END IF;
+        END;
+      $$ LANGUAGE plpgsql;
+    SQL
   end
 end

data/db/migrate/20171216021339_create_organizations.rb

@@ -11,12 +11,9 @@ class CreateOrganizations < ActiveRecord::Migration[5.2]
       t.index :organization_id, unique: true,
         name: :idx_jobshop_organizations_pkey
 
-      t.citext :name, index: true
-      t.index %i[ organization_id name ], unique: true
-
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_organizations"
+    idx_table_name_pkey :jobshop_organizations
   end
 end

data/db/migrate/20171216021400_create_employees.rb

@@ -0,0 +1,47 @@
+# frozen_string_literals: true
+
+require "jobshop/helpers/migration.rb"
+
+class CreateEmployees < ActiveRecord::Migration[5.2]
+  include Jobshop::Helpers::Migration
+
+  def change # rubocop:disable Metrics/MethodLength
+    create_table_with_auditing :jobshop_employees, primary_key: %i[
+      organization_id employee_id
+    ] do |t|
+      t.citext :email, null: false
+      t.string :forename
+      t.string :surname
+      t.timestamps
+    end
+
+    fk_organization :jobshop_employees
+
+    create_table_with_auditing :jobshop_employments, primary_key: %i[
+      organization_id employment_id
+    ] do |t|
+      t.uuid :employee_id
+      t.date :started_on, default: { expr: "('now'::text)::date" }
+      t.date :ended_on
+      t.string :title, null: false, default: ""
+      t.datetime :updated_at, null: false
+      t.uuid :updated_by_id
+      t.datetime :deleted_at
+      t.timestamps
+    end
+
+    fk_organization :jobshop_employments
+
+    execute <<~SQL
+      ALTER TABLE
+        jobshop_employments
+      ADD
+        CONSTRAINT no_overlapping_employments
+          EXCLUDE USING gist (
+            organization_id WITH =,
+            employee_id WITH =,
+            daterange(started_on, ended_on) WITH &&
+          );
+    SQL
+  end
+end

data/db/migrate/20171216021554_create_people.rb

@@ -2,28 +2,24 @@
 
 require "jobshop/helpers/migration.rb"
 
+# TODO: Inherit employees/contacts from common people table
+# TODO: This table only exists because roles still link to it. remove this once
+# TODO: roles are migrated to their respective parent.
 class CreatePeople < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
   def change # rubocop:disable Metrics/MethodLength
-    create_table :jobshop_people, id: false do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :person_id, null: false, default: "gen_random_uuid()"
-      t.index %i[ organization_id person_id ], unique: true,
-        name: :idx_jobshop_people_pkey
-
+    create_table_with_auditing :jobshop_people, primary_key: %i[
+      organization_id person_id
+    ] do |t|
       t.citext :email, null: false
-      t.index %i[ organization_id email ], unique: true
-
-      t.string :job_title
       t.string :forename
       t.string :surname
-
       t.timestamps
     end
 
-    idx_table_name_pkey :jobshop_people
-    fk_organization_id :jobshop_people
+    add_index :jobshop_people, %i[ organization_id email ], unique: true
+    fk_organization :jobshop_people
 
     create_table :jobshop_users, id: false do |t|
       t.uuid :organization_id, null: false
@@ -31,18 +27,17 @@ class CreatePeople < ActiveRecord::Migration[5.2]
       t.index %i[ organization_id user_id ], unique: true,
         name: :idx_jobshop_users_pkey
 
-      t.citext :email, null: false
+      # Database authenticatable
+      t.citext :email, null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
       t.index %i[ organization_id email ], unique: true
 
       t.string :email_authentication_token, index: { unique: true }
       t.datetime :email_authentication_token_sent_at, :datetime
-
-      t.string :password_digest, null: false, default: ""
-
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_users"
-    fk_organization_id "jobshop_users"
+    idx_table_name_pkey :jobshop_users
+    fk_organization :jobshop_users
   end
 end

data/db/migrate/20171216021853_create_customers.rb

@@ -0,0 +1,57 @@
+# frozen_string_literals: true
+
+require "jobshop/helpers/migration.rb"
+
+class CreateCustomers < ActiveRecord::Migration[5.2]
+  include Jobshop::Helpers::Migration
+
+  def change
+    create_table_with_auditing :jobshop_customer_categories, primary_key: %i[
+      organization_id category_id
+    ] do |t|
+      t.citext :name, null: false
+      t.text :description
+    end
+
+    add_index :jobshop_customer_categories, %i[ organization_id name ], unique: true
+
+    fk_organization :jobshop_customer_categories
+
+    create_table_with_auditing :jobshop_customers, primary_key: %i[
+      organization_id customer_id
+    ] do |t|
+      t.citext :name, null: false
+      t.uuid :category_id, null: false
+      t.string :email_from_domain
+      t.timestamps
+    end
+
+    add_index :jobshop_customers, %i[ organization_id name ], unique: true
+
+    foreign_key :jobshop_customers, :jobshop_customer_categories,
+      %i[ organization_id category_id ]
+
+    # Reverse index on email_from_domain allows for search on just a domain
+    # given the entire address.
+    #
+    # example.com will be indexed as moc.elpmaxe
+    add_index :jobshop_customers,
+      "organization_id, reverse(lower(email_from_domain)) text_pattern_ops",
+      name: :idx_jobshop_customers_reverse_address, unique: true
+
+    fk_organization :jobshop_customers
+
+    create_table_with_auditing :jobshop_customer_contacts, primary_key: %i[
+      organization_id customer_id contact_id
+    ] do |t|
+      t.citext :email, null: false
+      t.string :surname
+      t.string :forename
+    end
+
+    fk_organization :jobshop_customer_contacts
+
+    foreign_key :jobshop_customer_contacts, :jobshop_customers,
+      %i[ organization_id customer_id ]
+  end
+end

data/db/migrate/20171216022020_create_places.rb

@@ -1,22 +1,21 @@
+# frozen_string_literals: true
+
 require "jobshop/helpers/migration.rb"
 
 class CreatePlaces < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
   def change
-    create_table :jobshop_places, id: false do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :place_id, null: false, default: "gen_random_uuid()"
-      t.index %i[ organization_id place_id ], unique: true,
-        name: "idx_jobshop_places_pkey"
-
+    create_table_with_auditing :jobshop_places, primary_key: %i[
+      organization_id place_id
+    ]do |t|
       t.citext :name, null: false
-      t.index %i[ organization_id name ], unique: true
 
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_places"
-    fk_organization_id "jobshop_places"
+    add_index :jobshop_places, %i[ organization_id name ], unique: true
+
+    fk_organization :jobshop_places
   end
 end

data/db/migrate/20171216022135_create_products.rb

@@ -6,24 +6,17 @@ class CreateProducts < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
   def change
-    create_table :jobshop_products, id: false do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :product_id, null: false, default: "gen_random_uuid()"
-      t.index %i[ organization_id product_id ], unique: true,
-        name: "idx_jobshop_products_pkey"
-
-      t.uuid :created_by_id, null: false
-
+    create_table_with_auditing :jobshop_products, primary_key: %i[
+      organization_id product_id
+    ] do |t|
       t.citext :name, null: false
-      t.index %i[ organization_id name ], unique: true
-
       t.text :description
 
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_products"
-    fk_organization_id "jobshop_products"
-    fk_created_by_id "jobshop_products"
+    add_index :jobshop_products, %i[ organization_id name ], unique: true
+
+    fk_organization :jobshop_products
   end
 end

data/db/migrate/20171216022605_create_orders.rb

@@ -6,50 +6,33 @@ class CreateOrders < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
   def change # rubocop:disable Metrics/MethodLength
-    create_table :jobshop_orders, id: false do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :order_id, null: false, default: "gen_random_uuid()"
-      t.index %i[ organization_id order_id ], unique: true,
-        name: "idx_jobshop_orders_pkey"
-
-      t.uuid :created_by_id, null: false
-
-      t.uuid :company_id, null: false
-      t.index %i[ organization_id company_id ]
-
+    create_table_with_auditing :jobshop_orders, primary_key: %i[
+      organization_id order_id
+    ] do |t|
+      t.uuid :customer_id, null: false
       t.string :number
-      t.index %i[ organization_id number ], unique: true
-
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_orders"
-    fk_organization_id "jobshop_orders"
-    fk_created_by_id "jobshop_orders"
-    foreign_key "jobshop_orders", "jobshop_companies",
-      [ "organization_id", "company_id" ]
-
-    create_table :jobshop_order_lines, id: false do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :order_id, null: false
-      t.uuid :order_line_id, null: false, default: "gen_random_uuid()"
-      t.index %i[ organization_id order_id order_line_id ], unique: true,
-        name: "idx_jobshop_order_lines_pkey"
-
-      t.uuid :created_by_id, null: false
+    add_index :jobshop_orders, %i[ organization_id number ], unique: true
+    add_index :jobshop_orders, %i[ organization_id customer_id ],
+      name: :idx_jobshop_orders_organization_customer
+    fk_organization :jobshop_orders
+    foreign_key :jobshop_orders, :jobshop_customers,
+      %i[ organization_id customer_id ]
 
+    create_table_with_auditing :jobshop_order_lines, primary_key: %i[
+      organization_id order_id order_line_id
+    ] do |t|
       t.uuid :product_id, null: false
-      t.index %i[ organization_id product_id ]
-
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_order_lines"
-    fk_organization_id "jobshop_order_lines"
-    fk_created_by_id "jobshop_order_lines"
-    foreign_key "jobshop_order_lines", "jobshop_orders",
-      [ "organization_id", "order_id" ]
-    foreign_key "jobshop_order_lines", "jobshop_products",
-      [ "organization_id", "product_id" ]
+    add_index :jobshop_order_lines, %i[ organization_id product_id ]
+    fk_organization :jobshop_order_lines
+    foreign_key :jobshop_order_lines, :jobshop_orders,
+      %i[ organization_id order_id ]
+    foreign_key :jobshop_order_lines, :jobshop_products,
+      %i[ organization_id product_id ]
   end
 end

data/db/migrate/20171216023018_create_roles.rb

@@ -19,7 +19,7 @@ class CreateRoles < ActiveRecord::Migration[5.2]
     end
 
     idx_table_name_pkey :jobshop_roles
-    fk_organization_id :jobshop_roles
+    fk_organization :jobshop_roles
 
     create_table :jobshop_role_assignments, id: false do |t|
       t.uuid :organization_id, null: false
@@ -34,9 +34,11 @@ class CreateRoles < ActiveRecord::Migration[5.2]
       t.timestamps
     end
 
-    fk_organization_id :jobshop_role_assignments
+    fk_organization :jobshop_role_assignments
+
     foreign_key :jobshop_role_assignments, :jobshop_roles,
       %i[ organization_id role_id ]
+
     foreign_key :jobshop_role_assignments, :jobshop_people,
       %i[ organization_id person_id ]
 
@@ -49,6 +51,6 @@ class CreateRoles < ActiveRecord::Migration[5.2]
         unique: true, name: :idx_jobshop_abilities_secondary_key
     end
 
-    fk_organization_id :jobshop_abilities
+    fk_organization :jobshop_abilities
   end
 end