jobshop 0.0.167 → 0.0.179

data/app/models/jobshop/customer/category.rb

@@ -1,16 +1,10 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop
   class Customer::Category < ApplicationRecord
-    self.primary_keys = %i[ organization_id category_id ]
-
-    after_initialize { self.category_id ||= SecureRandom.uuid if new_record? }
-    after_create { reload }
-
     belongs_to :organization, -> { readonly }, inverse_of: :customer_categories
 
-    has_many :customers, inverse_of: :category,
-      foreign_key: %i[ organization_id category_id ]
+    has_many :customers, inverse_of: :category
 
     validates :name, uniqueness: {
       case_insensitive: true, scope: :organization_id

data/app/models/jobshop/customer/contact.rb

@@ -1,15 +1,10 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop # :nodoc:
   class Customer::Contact < ApplicationRecord
-    self.primary_keys = %i[ organization_id customer_id contact_id ]
-
-    after_initialize { self.contact_id ||= SecureRandom.uuid if new_record? }
-    after_create { reload }
-
     belongs_to :organization, inverse_of: :customer_contacts
-    belongs_to :customer, inverse_of: :contacts,
-      foreign_key: %i[ organization_id customer_id ]
+
+    belongs_to :customer, inverse_of: :contacts
 
     validates :email,
       presence:   { if: :email_required? },

data/app/models/jobshop/department.rb

@@ -0,0 +1,10 @@
+module Jobshop
+  class Department < ApplicationRecord
+    belongs_to :organization, -> { readonly }, inverse_of: :departments
+
+    has_many :assignments, inverse_of: :department,
+      dependent: :restrict_with_exception
+
+    has_many :employees, through: :assignments
+  end
+end

data/app/models/jobshop/department/assignment.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Jobshop
+  class Department::Assignment < ApplicationRecord
+    belongs_to :organization, -> { readonly }
+
+    belongs_to :department, inverse_of: :assignments
+
+    belongs_to :employee, inverse_of: :department_assignments
+
+    before_validation(on: :create) do
+      self.organization ||= department&.organization || employee&.organization
+    end
+  end
+end

data/app/models/jobshop/employee.rb

@@ -1,18 +1,22 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop # :nodoc:
   class Employee < ApplicationRecord
-    self.primary_keys = %i[ organization_id employee_id ]
+    belongs_to :organization, -> { readonly }, inverse_of: :employees
 
-    after_initialize { self.employee_id ||= SecureRandom.uuid if new_record? }
-    after_create { reload }
+    belongs_to :user, inverse_of: :employee, optional: true
 
-    belongs_to :organization, -> { readonly }, inverse_of: :employees
+    has_many :department_assignments, inverse_of: :employee,
+      class_name: "Jobshop::Department::Assignment"
+
+    has_many :departments, through: :department_assignments
 
     has_many :employments, inverse_of: :employee,
-      foreign_key: %i[ organization_id employee_id ],
       dependent: :restrict_with_exception
 
+    has_many :rfq_line_assignments, through: :user,
+      foreign_key: :assigned_to_id, class_name: "Jobshop::RFQ::Line::Assignment"
+
     validates :email,
       presence:   { if: :email_required? },
       format:     { if: :email_required?, with: /\A[^@\s]+@[^@\s]+\z/ },
@@ -27,6 +31,9 @@ module Jobshop # :nodoc:
       joins(:employments).merge(Jobshop::Employment.inactive)
     }
 
+    accepts_nested_attributes_for :employments, allow_destroy: true,
+      reject_if: :all_blank
+
     def active?
       !!employments.active.first
     end

data/app/models/jobshop/employment.rb

@@ -1,16 +1,12 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop
   class Employment < ApplicationRecord
-    self.primary_keys = %i[ organization_id employment_id ]
+    include Auditing
 
-    after_initialize { self.employment_id ||= SecureRandom.uuid if new_record? }
-    after_create { reload }
+    belongs_to :organization, -> { readonly }, inverse_of: :employments
 
-    belongs_to :organization, inverse_of: :employments
-
-    belongs_to :employee, inverse_of: :employments,
-      foreign_key: %i[ organization_id employee_id ]
+    belongs_to :employee, inverse_of: :employments
 
     default_scope { order(ended_on: :desc, started_on: :desc) }
 
@@ -21,5 +17,9 @@ module Jobshop
     scope :inactive, -> {
       where.not(ended_on: nil)
     }
+
+    before_validation(on: :create) do
+      self.organization ||= employee.organization
+    end
   end
 end

data/app/models/jobshop/inspection.rb

@@ -1,4 +1,4 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop
   module Inspection

data/app/models/jobshop/inspection/boolean_criterion.rb

@@ -1,31 +1,25 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop
   class Inspection::BooleanCriterion < ApplicationRecord
-    self.primary_keys = %i[ organization_id report_id criterion_id criterion_type ]
+    belongs_to :organization, -> { readonly }
 
-    after_initialize { self.criterion_id ||= SecureRandom.uuid if new_record? }
-    before_save(on: :create) { criterion.save unless criterion.persisted? }
+    belongs_to :report, -> { readonly }
 
-    belongs_to :organization
-
-    has_one :criterion, as: :criterion, autosave: true, dependent: :destroy,
-      foreign_key: %i[ organization_id report_id criterion_id criterion_type ],
-      inverse_of: :criterion
-
-    belongs_to :report, class_name: "Jobshop::Inspection::Report",
-      foreign_key: %i[ organization_id report_id ]
+    has_one :criterion, -> (boolean_criterion) {
+      where({
+        organization_id: boolean_criterion.organization_id,
+        report_id: boolean_criterion.report_id
+      })
+    }, as: :criterion, autosave: true, dependent: :destroy,
+    inverse_of: :criterion
 
     def criterion
       super || build_criterion
     end
 
     delegate :name, :name=, :position, :position=, to: :criterion
-=begin
-    def specification
-      @specification ||= "#{condition}\nPASS/FAIL"
-    end
-=end
+
     def tolerance
       @tolerance ||= condition
     end
@@ -40,8 +34,10 @@ module Jobshop
 
     # Generate a random value that has a 90% chance of being in spec.
     # TODO: This needs to go in the tests somewhere, not really in the model.
+    # :nocov:
     def random
       rand(100) < 10
     end
+    # :nocov:
   end
 end

data/app/models/jobshop/inspection/criterion.rb

@@ -1,19 +1,18 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop
   class Inspection::Criterion < ApplicationRecord
-    self.primary_keys = %i[ organization_id report_id criterion_id criterion_type ]
+    belongs_to :organization, -> { readonly }
 
-    after_initialize { self.criterion_id ||= SecureRandom.uuid if new_record? }
+    belongs_to :report, -> { readonly }
 
-    belongs_to :organization
+    belongs_to :criterion, polymorphic: true, optional: true,
+      dependent: :destroy
 
-    belongs_to :criterion, polymorphic: true, optional: true, dependent: :destroy,
-      foreign_key: %i[ organization_id report_id criterion_id criterion_type ]
+    before_validation(on: :create) do
+      self.organization ||= report.organization
+    end
 
-    belongs_to :report, class_name: "Jobshop::Inspection::Report",
-      foreign_key: %i[ organization_id report_id ], inverse_of: :criteria
-
-    delegate :ascii, :pass?, :random, :unit, to: :criterion
+    delegate :pass?, :random, :unit, to: :criterion
   end
 end

data/app/models/jobshop/inspection/deviation_criterion.rb

@@ -1,20 +1,18 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop
   class Inspection::DeviationCriterion < ApplicationRecord
-    self.primary_keys = %i[ organization_id report_id criterion_id criterion_type ]
+    belongs_to :organization, -> { readonly }
 
-    after_initialize { self.criterion_id ||= SecureRandom.uuid if new_record? }
-    before_save(on: :create) { criterion.save unless criterion.persisted? }
+    belongs_to :report, -> { readonly }
 
-    belongs_to :organization
-
-    belongs_to :report, class_name: "Jobshop::Inspection::Report",
-      foreign_key: %i[ organization_id report_id ]
-
-    has_one :criterion, as: :criterion, autosave: true, dependent: :destroy,
-      foreign_key: %i[ organization_id report_id criterion_id criterion_type ],
-      inverse_of: :criterion
+    has_one :criterion, -> (deviation_criterion) {
+      where({
+        organization_id: deviation_criterion.organization_id,
+        report_id: deviation_criterion.report_id
+      })
+    }, as: :criterion, autosave: true, dependent: :destroy,
+    inverse_of: :criterion
 
     def criterion
       super || build_criterion

data/app/models/jobshop/inspection/limit_criterion.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 module Jobshop
   class Inspection::LimitCriterion < ApplicationRecord
-    self.primary_keys = %i[ organization_id report_id criterion_id criterion_type ]
-
-    after_initialize { self.criterion_id ||= SecureRandom.uuid if new_record? }
-    before_save(on: :create) { criterion.save unless criterion.persisted? }
+    belongs_to :organization, -> { readonly }
 
-    belongs_to :organization
+    belongs_to :report, -> { readonly }
 
-    has_one :criterion, as: :criterion, autosave: true, dependent: :destroy,
-      foreign_key: %i[ organization_id report_id criterion_id criterion_type ],
-      inverse_of: :criterion
+    has_one :criterion, -> (criterion) {
+      where({
+        organization_id: criterion.organization_id,
+        report_id: criterion.report_id
+      })
+    }, as: :criterion, autosave: true, dependent: :destroy,
+    inverse_of: :criterion
 
-    belongs_to :report, class_name: "Jobshop::Inspection::Report",
-      foreign_key: %i[ organization_id report_id ]
+    belongs_to :report
 
     def criterion
       super || build_criterion

data/app/models/jobshop/inspection/report.rb

@@ -1,39 +1,27 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop
   class Inspection::Report < ApplicationRecord
-    self.primary_keys = %i[ organization_id report_id ]
-
-    after_initialize { self.report_id ||= SecureRandom.uuid if new_record? }
-
-    belongs_to :organization, inverse_of: :inspection_reports
-
-    has_many :criteria, -> { includes(:criterion).order(:position) },
-      foreign_key: %i[ organization_id report_id ], inverse_of: :report
-
-    has_many :limit_criteria, inverse_of: :report,
-      foreign_key: %i[ organization_id report_id ]
-
-    has_many :tuples, -> { order(:position) },  inverse_of: :report,
-      foreign_key: %i[ organization_id report_id ]
-
-=begin
-    def ascii
-      require "terminal-table"
-      table = Terminal::Table.new do |t|
-        t.title = "Inspection Report"
-        t << [ "Feature" ].concat(criteria.map(&:criterion).map(&:name))
-        t << [ "Specification" ].concat(criteria.map(&:criterion).map(&:specification))
-        tuples.each do |tuple|
-          results = criteria.map do |criterion|
-            tuple.results.find_by(criterion: criterion)
-          end
-          t << [ tuple.position ].concat(results.map(&:value))
-        end
-      end
-
-      puts table
-    end
-=end
+    belongs_to :organization, -> { readonly }, inverse_of: :inspection_reports
+
+    has_many :criteria, -> (report) {
+      where({ organization_id: report.organization_id }) #.includes(:criterion)
+        .order(:position)
+    }
+
+    has_many :boolean_criteria, -> (report) {
+      rewhere({ organization_id: report.organization_id, report_id: report.id })
+    }, through: :criteria, source: :criterion,
+    source_type: "Jobshop::Inspection::BooleanCriterion"
+
+    has_many :deviation_criteria, -> (report) {
+      rewhere({ organization_id: report.organization_id, report_id: report.id })
+    }, through: :criteria, source: :criterion,
+    source_type: "Jobshop::Inspection::DeviationCriterion"
+
+    has_many :limit_criteria, -> (report) {
+      rewhere({ organization_id: report.organization_id, report_id: report.id })
+    }, through: :criteria, source: :criterion,
+    source_type: "Jobshop::Inspection::LimitCriterion"
   end
 end

data/app/models/jobshop/mailman.rb

@@ -1,4 +1,4 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 # +Jobshop::Mailman+
 #
@@ -6,9 +6,7 @@
 # approrpriate handler. If no handler is found, the email is rejected.
 module Jobshop
   class Mailman < ApplicationRecord
-    self.primary_keys = %i[ organization_id address ]
-
-    belongs_to :organization, inverse_of: :mailmen
+    belongs_to :organization, -> { readonly }, inverse_of: :mailmen
 
     validates :address, presence: true
 

data/app/models/jobshop/order.rb

@@ -1,35 +1,11 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop
   class Order < ApplicationRecord
-    self.primary_keys = %i[ organization_id order_id ]
-
-    after_initialize { self.order_id ||= SecureRandom.uuid if new_record? }
-
     belongs_to :organization, -> { readonly }, inverse_of: :orders
 
-    belongs_to :customer, foreign_key: %i[ organization_id customer_id ]
-
-    has_many :order_lines, inverse_of: :order,
-      foreign_key: %i[ organization_id order_id ]
-
-    around_save :notify_on_save
-
-    def add_listener(listener)
-      (@listeners ||= []) << listener
-    end
-
-    def notify_listeners(event_name, *args)
-      @listeners && @listeners.each do |listener|
-        if listener.respond_to?(event_name)
-          listener.public_send(event_name, self, *args)
-        end
-      end
-    end
+    belongs_to :customer
 
-    def notify_on_save
-      yield
-      notify_listeners(:on_save)
-    end
+    has_many :order_lines, inverse_of: :order
   end
 end

data/app/models/jobshop/order_line.rb

@@ -1,17 +1,11 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop
   class OrderLine < ApplicationRecord
-    self.primary_keys = %i[ organization_id order_id order_line_id ]
+    belongs_to :organization, -> { readonly }
 
-    after_initialize { self.order_line_id ||= SecureRandom.hex if new_record? }
+    belongs_to :order, inverse_of: :order_lines
 
-    belongs_to :organization
-
-    belongs_to :order, inverse_of: :order_lines,
-      foreign_key: %i[ organization_id order_id ]
-
-    belongs_to :product,
-      foreign_key: %i[ organization_id product_id ]
+    belongs_to :product, inverse_of: :orders
   end
 end

data/app/models/jobshop/organization.rb

@@ -1,8 +1,8 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
 
 module Jobshop
   class Organization < ApplicationRecord
-    self.primary_key = :organization_id
+    include Auditing
 
     has_many :collections, inverse_of: :organization,
       dependent: :restrict_with_exception
@@ -18,8 +18,11 @@ module Jobshop
       dependent: :restrict_with_exception,
       class_name: "Jobshop::Customer::Contact"
 
-    has_many :employees, -> { merge(Jobshop::Employee.active) },
-      inverse_of: :organization, dependent: :restrict_with_exception
+    has_many :departments, inverse_of: :organization,
+      dependent: :restrict_with_exception
+
+    has_many :employees, inverse_of: :organization,
+      dependent: :restrict_with_exception
 
     has_many :employments, inverse_of: :organization,
       dependent: :restrict_with_exception
@@ -55,16 +58,6 @@ module Jobshop
     has_many :users, inverse_of: :organization,
       dependent: :restrict_with_exception
 
-=begin
-    scope :grouped_by_email, ->(email_addresses) {
-      Jobshop::User
-        .where(email: email_addresses)
-        .joins(:organization)
-        .includes(:organization)
-        .each_with_object({}) { |user, organizations|
-          (organizations[user.email] ||= []) << user.organization
-        }
-    }
-=end
+    validates :name, presence: true
   end
 end