jobshop 0.0.157 → 0.0.163

data/app/models/jobshop/order_line.rb

@@ -1,13 +1,18 @@
+# frozen_string_literals: true
+
 module Jobshop
   class OrderLine < ApplicationRecord
-    self.primary_keys = [ :organization_id, :order_id, :order_line_id]
+    self.primary_keys = %i[ organization_id order_id order_line_id ]
 
     belongs_to :organization
-    belongs_to :created_by, class_name: "Jobshop::User",
-      foreign_key: [ :organization_id, :created_by_id ]
+
+    belongs_to :created_by, class_name: "Jobshop::Person",
+      foreign_key: %i[ organization_id created_by_id ]
+
     belongs_to :order, inverse_of: :order_lines,
-      foreign_key: [ :organization_id, :order_id ]
+      foreign_key: %i[ organization_id order_id ]
+
     belongs_to :product,
-      foreign_key: [ :organization_id, :product_id ]
+      foreign_key: %i[ organization_id product_id ]
   end
 end

data/app/models/jobshop/organization.rb

@@ -1,26 +1,53 @@
+# frozen_string_literals: true
+
 module Jobshop
   class Organization < ApplicationRecord
     self.primary_key = :organization_id
 
-    has_many :users, inverse_of: :organization,
-      dependent: :restrict_with_exception
-    has_many :roles, inverse_of: :organization,
-      dependent: :restrict_with_exception
-    has_many :places, inverse_of: :organization,
-      dependent: :restrict_with_exception
     has_many :collections, inverse_of: :organization,
       dependent: :restrict_with_exception
-    has_many :things, inverse_of: :organization,
+
+    has_many :companies, inverse_of: :organization,
+      dependent: :restrict_with_exception
+
+    has_many :company_types, inverse_of: :organization,
+      dependent: :restrict_with_exception,
+      class_name: "Jobshop::Company::Type"
+
+    has_many :inspection_reports, inverse_of: :organization,
+      dependent: :restrict_with_exception,
+      class_name: "Jobshop::Inspection::Report"
+
+    has_many :mailmen, inverse_of: :organization,
       dependent: :restrict_with_exception
+
     has_many :orders, inverse_of: :organization,
       dependent: :restrict_with_exception
-    has_many :companies, inverse_of: :organization,
+
+    has_many :people, inverse_of: :organization,
       dependent: :restrict_with_exception
+
+    has_many :places, inverse_of: :organization,
+      dependent: :restrict_with_exception
+
     has_many :products, inverse_of: :organization,
       dependent: :restrict_with_exception
+
+    has_many :rfqs, inverse_of: :organization,
+      dependent: :restrict_with_exception
+
+    has_many :roles, inverse_of: :organization,
+      dependent: :restrict_with_exception
+
     has_many :routing_processes, inverse_of: :organization,
       dependent: :restrict_with_exception
 
+    has_many :things, inverse_of: :organization,
+      dependent: :restrict_with_exception
+
+    has_many :users, inverse_of: :organization,
+      dependent: :restrict_with_exception
+
     scope :grouped_by_email, ->(email_addresses) {
       Jobshop::User
         .where(email: email_addresses)

data/app/models/jobshop/person.rb

@@ -0,0 +1,30 @@
+# frozen_string_literals: true
+
+module Jobshop
+  class Person < ApplicationRecord
+    self.primary_keys = %i[ organization_id person_id ]
+
+    after_initialize { self.person_id ||= SecureRandom.uuid if new_record? }
+
+    belongs_to :organization, inverse_of: :people
+
+    has_one :company_person, inverse_of: :person,
+      foreign_key: %i[ organization_id person_id ]
+
+    has_one :company, through: :company_person,
+      foreign_key: %i[ organization_id company_id ]
+
+    validates :email,
+      presence:   { if: :email_required? },
+      format:     { if: :email_required?, with: /\A[^@\s]+@[^@\s]+\z/ },
+      uniqueness: { if: :email_changed?, scope: :organization_id, case_sensitive: false }
+
+    def name
+      @name = [ forename, surname ].join(" ")
+    end
+
+    private def email_required?
+      true
+    end
+  end
+end

data/app/models/jobshop/place.rb

@@ -1,6 +1,8 @@
+# frozen_string_literals: true
+
 module Jobshop
   class Place < ApplicationRecord
-    self.primary_keys = [ :organization_id, :place_id ]
+    self.primary_keys = %i[ organization_id place_id ]
 
     belongs_to :organization, inverse_of: :places
 

data/app/models/jobshop/product.rb

@@ -1,21 +1,19 @@
+# frozen_string_literals: true
+
 module Jobshop
   class Product < ApplicationRecord
-    self.primary_keys = [ :organization_id, :product_id ]
+    self.primary_keys = %i[ organization_id product_id ]
 
-    after_create do
-      self.class.connection.clear_query_cache
-      @attributes = self.class.unscoped {
-        self.class.find_by!(organization: organization, name: name)
-      }.instance_variable_get(:@attributes)
-      @new_record = false
-      self
-    end
+    after_initialize { self.product_id ||= SecureRandom.uuid if new_record? }
 
     belongs_to :organization, inverse_of: :products
-    belongs_to :created_by, class_name: "Jobshop::User",
-      foreign_key: [ :organization_id, :created_by_id ]
+
+    belongs_to :created_by, class_name: "Jobshop::Person",
+      foreign_key: %i[ organization_id created_by_id ]
+
     has_one :routing_process, inverse_of: :product,
-      foreign_key: [ :organization_id, :product_id ]
+      foreign_key: %i[ organization_id product_id ]
+
     has_many :routing_steps, through: :routing_process
 
     validates :name, presence: true

data/app/models/jobshop/rfq.rb

@@ -0,0 +1,22 @@
+# frozen_string_literals: true
+
+module Jobshop
+  class RFQ < ApplicationRecord
+    self.primary_keys = %i[ organization_id rfq_id ]
+
+    before_validation(on: :create) { self.rfq_id ||= SecureRandom.uuid }
+
+    belongs_to :organization, inverse_of: :rfqs
+
+    belongs_to :company, inverse_of: :rfqs, optional: true,
+      foreign_key: %i[ organization_id company_id ]
+
+    has_many :rfq_lines, inverse_of: :rfq,
+      foreign_key: %i[ organization_id rfq_id ]
+
+    def company=(value)
+      company_id = (Jobshop::Company === value) ? value.company_id : value
+      write_attribute(:company_id, company_id)
+    end
+  end
+end

data/app/models/jobshop/rfq_line.rb

@@ -0,0 +1,12 @@
+# frozen_string_literals: true
+
+module Jobshop
+  class RFQLine < ApplicationRecord
+    self.primary_keys = %i[ organization_id rfq_id rfq_line_id ]
+
+    belongs_to :organization
+
+    belongs_to :rfq, inverse_of: :rfq_lines,
+      foreign_key: %i[ organization_id rfq_id ]
+  end
+end

data/app/models/jobshop/role.rb

@@ -1,23 +1,16 @@
+# frozen_string_literals: true
+
 module Jobshop
   class Role < ApplicationRecord
-    self.primary_keys = [ :organization_id, :role_id ]
-
-    after_create do
-      self.class.connection.clear_query_cache
-
-      fresh_record = self.class.unscoped {
-        self.class.find_by!(organization: organization, name: name) }
+    self.primary_keys = %i[ organization_id role_id ]
 
-      @attributes = fresh_record.instance_variable_get(:@attributes)
-      @new_record = false
-      self
-    end
+    after_initialize { self.role_id ||= SecureRandom.uuid if new_record? }
 
     belongs_to :organization, inverse_of: :roles,
-               primary_key: [ :organization_id, :role_id ]
+               primary_key: %i[ organization_id role_id ]
 
     has_many :role_assignments, inverse_of: :role,
-             foreign_key: [ :organization_id, :role_id ]
+             foreign_key: %i[ organization_id role_id ]
 
     validates :name, presence: true
   end

data/app/models/jobshop/role_assignment.rb

@@ -1,7 +1,9 @@
+# frozen_string_literals: true
+
 module Jobshop
   class RoleAssignment < ApplicationRecord
     belongs_to :organization
-    belongs_to :user, foreign_key: [ :organization_id, :user_id ]
-    belongs_to :role, foreign_key: [ :organization_id, :role_id ]
+    belongs_to :user, foreign_key: %i[ organization_id user_id ]
+    belongs_to :role, foreign_key: %i[ organization_id role_id ]
   end
 end

data/app/models/jobshop/routing_process.rb

@@ -1,20 +1,17 @@
+# frozen_string_literals: true
+
 module Jobshop
   class RoutingProcess < ApplicationRecord
-    self.primary_keys = [ :organization_id, :routing_process_id ]
+    self.primary_keys = %i[ organization_id routing_process_id ]
 
-    after_create do
-      self.class.connection.clear_query_cache
-      @attributes = self.class.unscoped {
-        self.class.find_by!(organization: organization, product_id: product_id)
-      }.instance_variable_get(:@attributes)
-      @new_record = false
-      self
-    end
+    after_initialize { self.routing_process_id ||= SecureRandom.uuid if new_record? }
 
     belongs_to :organization, inverse_of: :routing_processes
+
     belongs_to :product, inverse_of: :routing_process,
-      foreign_key: [ :organization_id, :product_id ]
+      foreign_key: %i[ organization_id product_id ]
+
     has_many :routing_steps, inverse_of: :routing_process,
-      foreign_key: [ :organization_id, :routing_process_id ]
+      foreign_key: %i[ organization_id routing_process_id ]
   end
 end

data/app/models/jobshop/routing_step.rb

@@ -1,10 +1,12 @@
+# frozen_string_literals: true
+
 module Jobshop
   class RoutingStep < ApplicationRecord
-    self.primary_keys = [ :organization_id, :routing_step_id ]
+    self.primary_keys = %i[ organization_id routing_step_id ]
 
     belongs_to :organization
     belongs_to :routing_process, inverse_of: :routing_steps,
-      foreign_key: [ :organization_id, :routing_process_id ]
+      foreign_key: %i[ organization_id routing_process_id ]
 
     validates :name, presence: true
   end

data/app/models/jobshop/thing.rb

@@ -1,20 +1,15 @@
+# frozen_string_literals: true
+
 module Jobshop
   class Thing < ApplicationRecord
-    self.primary_keys = [ :organization_id, :thing_id ]
+    self.primary_keys = %i[ organization_id thing_id ]
 
-    after_create do
-      self.class.connection.clear_query_cache
-      fresh_thing = self.class.unscoped {
-        self.class.find_by!(organization: organization, collection: collection, name: name)
-      }
-      @attributes = fresh_thing.instance_variable_get(:@attributes)
-      @new_record = false
-      self
-    end
+    after_initialize { self.thing_id ||= SecureRandom.uuid if new_record? }
 
     belongs_to :organization, inverse_of: :things
+
     belongs_to :collection, inverse_of: :things,
-      foreign_key: [ :organization_id, :collection_id ]
+      foreign_key: %i[ organization_id collection_id ]
 
     validates :name, presence: true,
       uniqueness: { scope: :organization_id, case_sensitive: false }

data/app/models/jobshop/user.rb

@@ -1,24 +1,20 @@
+# frozen_string_literals: true
+
 module Jobshop
   class User < ApplicationRecord
-    self.primary_keys = :organization_id, :user_id
+    self.primary_keys = %i[ organization_id user_id ]
 
-    has_secure_password
-
-    after_create do
-      self.class.connection.clear_query_cache
-      @attributes = self.class.unscoped {
-        self.class.find_by!(organization: organization, email: email)
-      }.instance_variable_get(:@attributes)
-      @new_record = false
-      self
-    end
+    after_initialize { self.user_id ||= SecureRandom.uuid if new_record? }
 
     belongs_to :organization, inverse_of: :users
+
     has_many :role_assignments, inverse_of: :user,
-      foreign_key: [ :organization_id, :user_id ]
+      foreign_key: %i[ organization_id user_id ]
+
     has_many :roles, through: :role_assignments
+
     has_many :sessions, inverse_of: :user, dependent: :destroy,
-      foreign_key: [ :organization_id, :user_id ]
+      foreign_key: %i[ organization_id user_id ]
 
     validates :email,
       presence:   { if: :email_required? },
@@ -31,10 +27,7 @@ module Jobshop
       presence:     { if: :password_required? },
       confirmation: { if: :password_required? }
 
-
-    def name
-      @name = [ forename, surname ].join(" ")
-    end
+    has_secure_password
 
     def activate_session
       session_activations.activate(SecureRandom.hex).activation_token

data/db/migrate/20170311194758_initialize_jobshop.rb

@@ -1,4 +1,6 @@
-class InitializeJobshop < ActiveRecord::Migration[5.1]
+# frozen_string_literals: true
+
+class InitializeJobshop < ActiveRecord::Migration[5.2]
   def change
     enable_extension "pgcrypto" unless extension_enabled? "pgcrypto"
     enable_extension "citext"   unless extension_enabled? "citext"

data/db/migrate/20171216021339_create_organizations.rb

@@ -1,6 +1,8 @@
+# frozen_string_literals: true
+
 require "jobshop/helpers/migration.rb"
 
-class CreateOrganizations < ActiveRecord::Migration[5.1]
+class CreateOrganizations < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
   def change
@@ -10,7 +12,7 @@ class CreateOrganizations < ActiveRecord::Migration[5.1]
         name: :idx_jobshop_organizations_pkey
 
       t.citext :name, index: true
-      t.index [ :organization_id, :name ], unique: true
+      t.index %i[ organization_id name ], unique: true
 
       t.timestamps
     end

data/db/migrate/20171216021554_create_people.rb

@@ -0,0 +1,48 @@
+# frozen_string_literals: true
+
+require "jobshop/helpers/migration.rb"
+
+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
+
+      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
+
+    create_table :jobshop_users, id: false do |t|
+      t.uuid :organization_id, null: false
+      t.uuid :user_id, null: false, default: "gen_random_uuid()"
+      t.index %i[ organization_id user_id ], unique: true,
+        name: :idx_jobshop_users_pkey
+
+      t.citext :email, null: false
+      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"
+  end
+end

data/db/migrate/20171216021853_create_companies.rb

@@ -1,25 +1,64 @@
+# frozen_string_literals: true
+
 require "jobshop/helpers/migration.rb"
 
-class CreateCompanies < ActiveRecord::Migration[5.1]
+class CreateCompanies < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
-  def change
+  def change # rubocop:disable Metrics/MethodLength
+    create_table :jobshop_company_types, id: false do |t|
+      t.uuid :organization_id, null: false
+      t.uuid :type_id, null: false, default: "gen_random_uuid()"
+      t.index %i[ organization_id type_id ],
+        name: :idx_jobshop_company_types_pkey, unique: true
+
+      t.citext :name, null: false
+      t.index %i[ organization_id name ], unique: true
+
+      t.text :description
+    end
+
+    idx_table_name_pkey :jobshop_company_types
+    fk_organization_id :jobshop_company_types
+
     create_table :jobshop_companies, id: false do |t|
       t.uuid :organization_id, null: false
       t.uuid :company_id, null: false, default: "gen_random_uuid()"
-      t.index [ :organization_id, :company_id ], unique: true,
-        name: "idx_jobshop_companies_pkey"
+      t.index %i[ organization_id company_id ], unique: true,
+        name: :idx_jobshop_companies_pkey
 
       t.uuid :created_by_id, null: false
 
+      t.uuid :type_id, null: false
+
       t.citext :name, null: false
-      t.index [ :organization_id, :name ], unique: true
+      t.index %i[ organization_id name ], unique: true
 
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_companies"
-    fk_organization_id "jobshop_companies"
-    fk_created_by_id "jobshop_companies"
+    idx_table_name_pkey :jobshop_companies
+    fk_organization_id :jobshop_companies
+    fk_created_by_id :jobshop_companies
+    foreign_key :jobshop_companies, :jobshop_company_types,
+      %i[ organization_id type_id ]
+
+    create_table :jobshop_company_people, id: false do |t|
+      t.uuid :organization_id, null: false
+      t.uuid :company_id, null: false
+      t.uuid :person_id, null: false
+      t.index %i[ organization_id company_id person_id ],
+        name: :idx_jobshop_company_people_pkey, unique: true
+
+      t.index %i[ organization_id company_id ],
+        name: :idx_jobshop_company_organization_company_ids
+    end
+
+    idx_table_name_pkey :jobshop_company_people
+    fk_organization_id :jobshop_company_people
+    foreign_key :jobshop_company_people, :jobshop_companies,
+      %i[ organization_id company_id ]
+    foreign_key :jobshop_company_people, :jobshop_people,
+      %i[ organization_id person_id ]
   end
 end