jobshop 0.0.167 → 0.0.179

data/db/migrate/20171216021350_create_users.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require "jobshop/helpers/migration.rb"
+
+class CreateUsers < ActiveRecord::Migration[5.2]
+  include Jobshop::Helpers::Migration
+
+  def change
+    create_table_with_auditing :jobshop_users do |t|
+      t.references :organization, type: :uuid, null: false,
+        foreign_key: { to_table: :jobshop_organizations }
+
+      t.index %i[ organization_id id ], unique: true
+
+      t.citext :email, null: false
+
+      t.index %i[ organization_id email ], unique: true
+
+      t.string :encrypted_password, null: false, default: ""
+
+      t.string :reset_password_token, index: { unique: true }
+
+      t.datetime :reset_password_sent_at
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20171216021400_create_employees.rb

@@ -1,37 +1,55 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 require "jobshop/helpers/migration.rb"
 
 class CreateEmployees < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
-  def change # rubocop:disable Metrics/MethodLength
+  def change
+    create_employees_table
+    create_employments_table
+  end
+
+  private def create_employees_table
     create_table_with_auditing :jobshop_employees, primary_key: %i[
-      organization_id employee_id
+      organization_id id
     ] do |t|
+      t.references :user, type: :uuid, foreign_key: { to_table: :jobshop_users }
+
       t.citext :email, null: false
+
       t.string :forename
       t.string :surname
+
       t.timestamps
     end
 
     fk_organization :jobshop_employees
 
+    foreign_key :jobshop_employees, :jobshop_users,
+      { organization_id: :organization_id, user_id: :id }
+  end
+
+  private def create_employments_table
     create_table_with_auditing :jobshop_employments, primary_key: %i[
-      organization_id employment_id
+      organization_id id
     ] do |t|
-      t.uuid :employee_id
+      t.references :employee, type: :uuid, null: false,
+        foreign_key: { to_table: :jobshop_employees }
+
+      t.string :title, null: false, default: ""
+
       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
 
+    foreign_key :jobshop_employments, :jobshop_employees,
+      { organization_id: :organization_id, employee_id: :id }
+
     execute <<~SQL
       ALTER TABLE
         jobshop_employments

data/db/migrate/20171216021853_create_customers.rb

@@ -1,4 +1,4 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 require "jobshop/helpers/migration.rb"
 
@@ -6,30 +6,40 @@ class CreateCustomers < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
   def change
+    create_customer_categories_table
+    create_customers_table
+    create_customer_contacts_table
+  end
+
+  private def create_customer_categories_table
     create_table_with_auditing :jobshop_customer_categories, primary_key: %i[
-      organization_id category_id
+      organization_id id
     ] do |t|
       t.citext :name, null: false
+      t.index %i[ organization_id name ], unique: true
+
       t.text :description
     end
 
-    add_index :jobshop_customer_categories, %i[ organization_id name ], unique: true
-
     fk_organization :jobshop_customer_categories
+  end
 
+  private def create_customers_table
     create_table_with_auditing :jobshop_customers, primary_key: %i[
-      organization_id customer_id
+      organization_id id
     ] do |t|
       t.citext :name, null: false
-      t.uuid :category_id, null: false
+      t.index %i[ organization_id name ], unique: true
+
+      t.references :category, type: :uuid, null: false, foreign_key:
+        { to_table: :jobshop_customer_categories }
+
       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 ]
+    fk_organization :jobshop_customers
 
     # Reverse index on email_from_domain allows for search on just a domain
     # given the entire address.
@@ -39,19 +49,24 @@ class CreateCustomers < ActiveRecord::Migration[5.2]
       "organization_id, reverse(lower(email_from_domain)) text_pattern_ops",
       name: :idx_jobshop_customers_reverse_address, unique: true
 
-    fk_organization :jobshop_customers
+    foreign_key :jobshop_customers, :jobshop_customer_categories,
+      { organization_id: :organization_id, category_id: :id }
+  end
 
+  private def create_customer_contacts_table
     create_table_with_auditing :jobshop_customer_contacts, primary_key: %i[
-      organization_id customer_id contact_id
+      organization_id customer_id id
     ] do |t|
       t.citext :email, null: false
-      t.string :surname
+      t.index %i[ organization_id email ], unique: true
+
       t.string :forename
+      t.string :surname
     end
 
     fk_organization :jobshop_customer_contacts
 
     foreign_key :jobshop_customer_contacts, :jobshop_customers,
-      %i[ organization_id customer_id ]
+      { organization_id: :organization_id, customer_id: :id }
   end
 end

data/db/migrate/20171216022020_create_places.rb

@@ -1,4 +1,4 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 require "jobshop/helpers/migration.rb"
 
@@ -7,15 +7,14 @@ class CreatePlaces < ActiveRecord::Migration[5.2]
 
   def change
     create_table_with_auditing :jobshop_places, primary_key: %i[
-      organization_id place_id
+      organization_id id
     ]do |t|
       t.citext :name, null: false
+      t.index %i[ organization_id name ], unique: true
 
       t.timestamps
     end
 
-    add_index :jobshop_places, %i[ organization_id name ], unique: true
-
     fk_organization :jobshop_places
   end
 end

data/db/migrate/20171216022135_create_products.rb

@@ -1,4 +1,4 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 require "jobshop/helpers/migration.rb"
 
@@ -7,16 +7,16 @@ class CreateProducts < ActiveRecord::Migration[5.2]
 
   def change
     create_table_with_auditing :jobshop_products, primary_key: %i[
-      organization_id product_id
+      organization_id id
     ] do |t|
       t.citext :name, null: false
+      t.index %i[ organization_id name ], unique: true
+
       t.text :description
 
       t.timestamps
     end
 
-    add_index :jobshop_products, %i[ organization_id name ], unique: true
-
     fk_organization :jobshop_products
   end
 end

data/db/migrate/20171216022605_create_orders.rb

@@ -1,38 +1,52 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 require "jobshop/helpers/migration.rb"
 
 class CreateOrders < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
-  def change # rubocop:disable Metrics/MethodLength
+  def change
+    create_orders_table
+    create_order_lines_table
+  end
+
+  private def create_orders_table
     create_table_with_auditing :jobshop_orders, primary_key: %i[
-      organization_id order_id
+      organization_id id
     ] do |t|
-      t.uuid :customer_id, null: false
+      t.references :customer, type: :uuid, null: false,
+        foreign_key: { to_table: :jobshop_customers }
+
       t.string :number
+      t.index %i[ organization_id number ], unique: true
+
       t.timestamps
     end
 
-    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 ]
+      { organization_id: :organization_id, customer_id: :id }
+  end
 
+  private def create_order_lines_table
     create_table_with_auditing :jobshop_order_lines, primary_key: %i[
-      organization_id order_id order_line_id
+      organization_id order_id id
     ] do |t|
-      t.uuid :product_id, null: false
+      t.references :product, type: :uuid, null: false,
+        foreign_key: { to_table: :jobshop_products }
+
       t.timestamps
     end
 
-    add_index :jobshop_order_lines, %i[ organization_id product_id ]
     fk_organization :jobshop_order_lines
+
+    add_index :jobshop_order_lines, %i[ organization_id product_id ]
+
     foreign_key :jobshop_order_lines, :jobshop_orders,
-      %i[ organization_id order_id ]
+      { organization_id: :organization_id, order_id: :id }
+
     foreign_key :jobshop_order_lines, :jobshop_products,
-      %i[ organization_id product_id ]
+      { organization_id: :organization_id, product_id: :id }
   end
 end

data/db/migrate/20171216023018_create_roles.rb

@@ -1,52 +1,55 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 require "jobshop/helpers/migration.rb"
 
 class CreateRoles < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
-  def change # rubocop:disable Metrics/MethodLength
-    create_table :jobshop_roles, id: false do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :role_id, null: false, default: "gen_random_uuid()"
-      t.index %i[ organization_id role_id ], unique: true,
-        name: :idx_jobshop_roles_pkey
+  def change
+    create_roles_table
+    create_role_assignments_table
+#    create_abilities_table
+  end
 
+  private def create_roles_table
+    create_table_with_auditing :jobshop_roles, primary_key: %i[
+      organization_id id
+    ] do |t|
       t.citext :name
+
+      t.references :resource, polymorphic: true
+
       t.index %i[ organization_id name ], unique: true
+      t.index %i[ organization_id name resource_type resource_id ],
+        name: :idx_jobshop_roles_organization_name_type_id
 
       t.timestamps
     end
 
-    idx_table_name_pkey :jobshop_roles
     fk_organization :jobshop_roles
+  end
 
-    create_table :jobshop_role_assignments, id: false do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :person_id, null: false
-      t.uuid :role_id, null: false
-
-      t.index %i[ organization_id person_id role_id ], unique: true,
-        name: :jobshop_role_assignment_user_roles_ckey
-      t.index %i[ organization_id role_id person_id ], unique: true,
-        name: :jobshop_role_assignment_role_users_ckey
+  private def create_role_assignments_table
+    create_table_with_auditing :jobshop_role_assignments, primary_key: %i[
+        organization_id id
+    ] do |t|
+      t.references :user, type: :uuid, foreign_key: { to_table: :jobshop_users }
+      t.references :role, type: :uuid, foreign_key: { to_table: :jobshop_roles }
 
-      t.timestamps
+      t.index %i[ organization_id user_id role_id ], unique: true,
+        name: :idx_jobshop_users_roles_organization_id_user_id_role_id
     end
 
     fk_organization :jobshop_role_assignments
+  end
 
-    foreign_key :jobshop_role_assignments, :jobshop_roles,
-      %i[ organization_id role_id ]
-
-    foreign_key :jobshop_role_assignments, :jobshop_people,
-      %i[ organization_id person_id ]
-
-    create_table :jobshop_abilities, id: :uuid, default: "gen_random_uuid()" do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :resource_id
+  private def create_abilities_table
+    create_table_with_auditing :jobshop_abilities, primary_key: %i[
+      organization_id id
+    ] do |t|
       t.string :resource_class, null: false
       t.integer :action
+      t.uuid :resource_id
       t.index %i[ organization_id resource_class action resource_id ],
         unique: true, name: :idx_jobshop_abilities_secondary_key
     end

data/db/migrate/20171216035357_create_things.rb

@@ -1,4 +1,4 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 require "jobshop/helpers/migration.rb"
 
@@ -6,41 +6,44 @@ class CreateThings < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
   def change
-    create_table :jobshop_things, id: false do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :thing_id, null: false, default: "gen_random_uuid()"
-      t.index %i[ organization_id thing_id ],
-        name: :idx_jobshop_things_pkey, unique: true
+    create_collections_table
+    create_things_table
+  end
 
-      t.uuid :collection_id, null: false
+  private def create_collections_table
+    create_table_with_auditing :jobshop_collections, primary_key: %i[
+      organization_id id
+    ] do |t|
       t.citext :name
-      t.index %i[ organization_id collection_id name ], unique: true,
-        name: :idx_jobshop_organization_id_collection_id_name
+      t.index %i[ organization_id name ], unique: true
 
-      t.jsonb :custom_fields, null: false, default: "{}"
-      t.index :custom_fields, using: :gin
+      t.jsonb :schema, null: false, default: "{}"
 
       t.timestamps
     end
 
-    idx_table_name_pkey :jobshop_things
-    fk_organization :jobshop_things
-
-    create_table :jobshop_collections, id: false do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :collection_id, null: false, default: "gen_random_uuid()"
-      t.index %i[ organization_id collection_id ], unique: true,
-        name: :idx_jobshop_collections_pkey
+    fk_organization :jobshop_collections
+  end
 
+  private def create_things_table
+    create_table_with_auditing :jobshop_things, primary_key: %i[
+      organization_id id
+    ]do |t|
+      t.references :collection, null: false, type: :uuid,
+        foreign_key: { to_table: :jobshop_collections }
       t.citext :name
-      t.index %i[ organization_id name ], unique: true
+      t.index %i[ organization_id collection_id name ], unique: true,
+        name: :idx_jobshop_organization_id_collection_id_name
 
-      t.jsonb :schema, null: false, default: "{}"
+      t.jsonb :custom_fields, null: false, default: "{}"
+      t.index :custom_fields, using: :gin
 
       t.timestamps
     end
 
-    idx_table_name_pkey :jobshop_collections
-    fk_organization :jobshop_collections
+    fk_organization :jobshop_things
+
+    foreign_key :jobshop_things, :jobshop_collections,
+      { organization_id: :organization_id, collection_id: :id }
   end
 end