jobshop 0.0.163 → 0.0.167

data/db/migrate/20171216035357_create_things.rb

@@ -23,8 +23,8 @@ class CreateThings < ActiveRecord::Migration[5.2]
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_things"
-    fk_organization_id "jobshop_things"
+    idx_table_name_pkey :jobshop_things
+    fk_organization :jobshop_things
 
     create_table :jobshop_collections, id: false do |t|
       t.uuid :organization_id, null: false
@@ -40,7 +40,7 @@ class CreateThings < ActiveRecord::Migration[5.2]
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_collections"
-    fk_organization_id "jobshop_collections"
+    idx_table_name_pkey :jobshop_collections
+    fk_organization :jobshop_collections
   end
 end

data/db/migrate/20171219022118_create_routing_processes.rb

@@ -10,49 +10,49 @@ class CreateRoutingProcesses < ActiveRecord::Migration[5.2]
       t.uuid :organization_id, null: false
       t.uuid :routing_process_id, null: false, default: "gen_random_uuid()"
       t.index %i[ organization_id routing_process_id ], unique: true,
-        name: "idx_jobshop_routing_processes_pkey"
+        name: :idx_jobshop_routing_processes_pkey
 
       t.uuid :product_id
       t.index %i[ organization_id product_id ], unique: true,
-        name: "idx_jobshop_routing_processes_product_id"
+        name: :idx_jobshop_routing_processes_product_id
     end
 
-    idx_table_name_pkey "jobshop_routing_processes"
-    fk_organization_id "jobshop_routing_processes"
-    foreign_key "jobshop_routing_processes", "jobshop_products",
-      [ "organization_id", "product_id" ]
+    idx_table_name_pkey :jobshop_routing_processes
+    fk_organization :jobshop_routing_processes
+    foreign_key :jobshop_routing_processes, :jobshop_products,
+      %i[ organization_id product_id ]
 
     create_table :jobshop_routing_process_instances, id: false do |t|
       t.uuid :organization_id, null: false
       t.uuid :routing_process_id, null: false
       t.uuid :routing_process_instance_id, null: false, default: "gen_random_uuid()"
       t.index %i[ organization_id routing_process_id routing_process_instance_id ], unique: true,
-        name: "idx_jobshop_routing_process_instances_pkey"
+        name: :idx_jobshop_routing_process_instances_pkey
 
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_routing_process_instances"
-    fk_organization_id "jobshop_routing_process_instances"
+    idx_table_name_pkey :jobshop_routing_process_instances
+    fk_organization :jobshop_routing_process_instances
 
     create_table :jobshop_routing_steps, id: false do |t|
       t.uuid :organization_id, null: false
       t.uuid :routing_step_id, null: false, default: "gen_random_uuid()"
       t.index %i[ organization_id routing_step_id ], unique: true,
-        name: "idx_jobshop_routing_steps_pkey"
+        name: :idx_jobshop_routing_steps_pkey
 
       t.uuid :routing_process_id, null: false
       t.index %i[ organization_id routing_process_id ],
-        name: "idx_jobshop_routing_steps_routing_process_id"
+        name: :idx_jobshop_routing_steps_routing_process_id
 
       t.citext :name
       t.index %i[ organization_id name ]
     end
 
-    idx_table_name_pkey "jobshop_routing_steps"
-    fk_organization_id "jobshop_routing_steps"
-    foreign_key "jobshop_routing_steps", "jobshop_routing_processes",
-      [ "organization_id", "routing_process_id" ]
+    idx_table_name_pkey :jobshop_routing_steps
+    fk_organization :jobshop_routing_steps
+    foreign_key :jobshop_routing_steps, :jobshop_routing_processes,
+      %i[ organization_id routing_process_id ]
 
     create_table :jobshop_routing_process_events
   end

data/db/migrate/20180107203241_create_inspections.rb

@@ -10,13 +10,13 @@ class CreateInspections < ActiveRecord::Migration[5.2]
       t.uuid :organization_id, null: false
       t.uuid :report_id, null: false, default: "gen_random_uuid()"
       t.index %i[ organization_id report_id ], unique: true,
-        name: "idx_jobshop_inspection_reports_pkey"
+        name: :idx_jobshop_inspection_reports_pkey
 
       t.timestamps
     end
 
     idx_table_name_pkey :jobshop_inspection_reports
-    fk_organization_id :jobshop_inspection_reports
+    fk_organization :jobshop_inspection_reports
 
     create_table :jobshop_inspection_criteria, id: false do |t|
       t.uuid :organization_id, null: false
@@ -24,14 +24,14 @@ class CreateInspections < ActiveRecord::Migration[5.2]
       t.uuid :criterion_id, null: false, default: "gen_random_uuid()"
       t.string :criterion_type, null: false
       t.index %i[ organization_id report_id criterion_id criterion_type ],
-        name: "idx_jobshop_inspection_criteria_pkey", unique: true
+        name: :idx_jobshop_inspection_criteria_pkey, unique: true
 
       t.integer :position, null: false
       t.index %i[ report_id position ], unique: true
 
       t.citext :name, null: false
       t.index %i[ report_id name ], unique: true,
-        name: "idx_jobshop_inspection_criteria_name"
+        name: :idx_jobshop_inspection_criteria_name
     end
 
     # At what point do Jobshop::Inspection::Criteria::Types
@@ -47,18 +47,18 @@ class CreateInspections < ActiveRecord::Migration[5.2]
     SQL
 
     idx_table_name_pkey :jobshop_inspection_criteria
-    fk_organization_id :jobshop_inspection_criteria
+    fk_organization :jobshop_inspection_criteria
 
     create_table :jobshop_inspection_tuples, id: false do |t|
       t.uuid :organization_id, null: false
       t.uuid :report_id, null: false
       t.integer :position, null: false
       t.index %i[ organization_id report_id position ], unique: true,
-        name: "idx_jobshop_inspection_tuples_pkey"
+        name: :idx_jobshop_inspection_tuples_pkey
     end
 
     idx_table_name_pkey :jobshop_inspection_tuples
-    fk_organization_id :jobshop_inspection_tuples
+    fk_organization :jobshop_inspection_tuples
 
     create_table :jobshop_inspection_results, id: false do |t|
       t.uuid :organization_id, null: false
@@ -67,14 +67,14 @@ class CreateInspections < ActiveRecord::Migration[5.2]
       t.string :criterion_type, null: false
       t.integer :position, null: false
       t.index %i[ organization_id report_id criterion_id criterion_type position ],
-        name: "idx_jobshop_inspection_results_pkey", unique: true
+        name: :idx_jobshop_inspection_results_pkey, unique: true
 
       t.decimal :value
       t.string :unit, null: false, default: "mm"
     end
 
     idx_table_name_pkey :jobshop_inspection_results
-    fk_organization_id :jobshop_inspection_results
+    fk_organization :jobshop_inspection_results
     foreign_key :jobshop_inspection_results, :jobshop_inspection_criteria,
       %i[ organization_id report_id criterion_id criterion_type ],
       "DEFERRABLE INITIALLY DEFERRED"
@@ -86,9 +86,10 @@ class CreateInspections < ActiveRecord::Migration[5.2]
       t.uuid :organization_id, null: false
       t.uuid :report_id, null: false
       t.uuid :criterion_id, null: false
-      t.string :criterion_type, null: false, default: "Jobshop::Inspection::BooleanCriterion"
+      t.string :criterion_type, null: false,
+        default: "Jobshop::Inspection::BooleanCriterion"
       t.index %i[ organization_id report_id criterion_id criterion_type ],
-        name: "idx_jobshop_inspection_boolean_criteria_pkey", unique: true
+        name: :idx_jobshop_inspection_boolean_criteria_pkey, unique: true
 
       t.citext :condition
     end
@@ -100,7 +101,7 @@ class CreateInspections < ActiveRecord::Migration[5.2]
     SQL
 
     idx_table_name_pkey :jobshop_inspection_boolean_criteria
-    fk_organization_id :jobshop_inspection_boolean_criteria
+    fk_organization :jobshop_inspection_boolean_criteria
     foreign_key :jobshop_inspection_boolean_criteria,
       :jobshop_inspection_criteria,
       %i[ organization_id report_id criterion_id criterion_type ],
@@ -127,7 +128,7 @@ class CreateInspections < ActiveRecord::Migration[5.2]
     SQL
 
     idx_table_name_pkey :jobshop_inspection_limit_criteria
-    fk_organization_id :jobshop_inspection_limit_criteria
+    fk_organization :jobshop_inspection_limit_criteria
     foreign_key :jobshop_inspection_limit_criteria,
       :jobshop_inspection_criteria,
       %i[ organization_id report_id criterion_id criterion_type ],
@@ -155,7 +156,7 @@ class CreateInspections < ActiveRecord::Migration[5.2]
     SQL
 
     idx_table_name_pkey :jobshop_inspection_deviation_criteria
-    fk_organization_id :jobshop_inspection_deviation_criteria
+    fk_organization :jobshop_inspection_deviation_criteria
     foreign_key :jobshop_inspection_deviation_criteria,
       :jobshop_inspection_criteria,
       %i[ organization_id report_id criterion_id criterion_type ],

data/db/migrate/20181117023949_create_rfqs.rb

@@ -1,39 +1,47 @@
+# frozen_string_literals: true
+
 require "jobshop/helpers/migration.rb"
 
 class CreateRFQs < ActiveRecord::Migration[5.2]
   include Jobshop::Helpers::Migration
 
-  def change
-    create_table :jobshop_rfqs, id: false do |t|
-      t.uuid :organization_id, null: false
-      t.uuid :rfq_id, null: false, default: "gen_random_uuid()"
-      t.index %i[ organization_id rfq_id ], unique: true,
-        name: "idx_jobshop_rfqs_pkey"
-
-      t.uuid :company_id, null: true
-      t.index %i[ organization_id company_id ], where: "company_id IS NOT NULL"
-      t.index %i[ organization_id company_id ], where: "company_id IS NULL",
-        name: "idx_jobshop_rfqs_company_is_null"
-
+  def change # rubocop:disable Metrics/MethodLength
+    create_table_with_auditing :jobshop_rfqs, primary_key: %i[
+      organization_id rfq_id
+    ] do |t|
+      t.uuid :customer_id, null: true
+      t.uuid :requested_by_id, null: true
       t.string :from
       t.string :subject, null: false
       t.text :content, null: false
-
       t.timestamps
     end
 
-    idx_table_name_pkey "jobshop_rfqs"
-    fk_organization_id "jobshop_rfqs"
-    foreign_key "jobshop_rfqs", "jobshop_companies",
-      [ "organization_id", "company_id" ]
+    # Index for RFQs from known customer
+    add_index :jobshop_rfqs, %i[ organization_id customer_id ],
+      where: "customer_id IS NOT NULL"
+
+    # Index for RFQs from unknown party
+    add_index :jobshop_rfqs, %i[ organization_id customer_id ],
+      where: "customer_id IS NULL", name: :idx_jobshop_rfqs_customer_id_is_null
+
+    fk_organization :jobshop_rfqs
+
+    foreign_key :jobshop_rfqs, :jobshop_customers,
+      %i[ organization_id customer_id ]
+
+    foreign_key :jobshop_rfqs, :jobshop_customer_contacts, {
+      organization_id: :organization_id,
+      customer_id: :customer_id,
+      requested_by_id: :contact_id
+    }
 
     create_table :jobshop_rfq_lines, id: false do |t|
       t.uuid :organization_id, null: false
       t.uuid :rfq_id, null: false
-      t.uuid :rfq_line_id, null: false, default: "gen_random_uuid()"
+      t.uuid :rfq_line_id, null: false
       t.index %i[ organization_id rfq_id rfq_line_id ], unique: true,
         name: "idx_jobshop_rfq_lines_pkey"
-
       t.timestamps
     end
   end

data/db/migrate/20181118014603_create_mailmen.rb

@@ -1,3 +1,5 @@
+# frozen_string_literals: true
+
 require "jobshop/helpers/migration.rb"
 
 class CreateMailmen < ActiveRecord::Migration[5.2]
@@ -8,7 +10,7 @@ class CreateMailmen < ActiveRecord::Migration[5.2]
       t.uuid :organization_id, null: false
       t.citext :address, null: false
       t.index %i[ organization_id address ], unique: true,
-        name: "idx_jobshop_mailmen_pkey"
+        name: :idx_jobshop_mailmen_pkey
 
       t.string :handler_type, null: false
 
@@ -19,11 +21,11 @@ class CreateMailmen < ActiveRecord::Migration[5.2]
       ALTER TABLE jobshop_mailmen
         ADD CONSTRAINT valid_handler_type
           CHECK (handler_type IN (
-            'Jobshop::RFQHandler'
+            'Jobshop::Mailroom::RFQHandler'
           ))
     SQL
 
-    idx_table_name_pkey "jobshop_mailmen"
-    fk_organization_id "jobshop_mailmen"
+    idx_table_name_pkey :jobshop_mailmen
+    fk_organization :jobshop_mailmen
   end
 end

data/db/seeds.rb

@@ -0,0 +1,126 @@
+# frozen_string_literals: true
+
+def factory_paths
+  [ Jobshop::Engine.root.join("spec/factories") ]
+end
+
+private def clean_database
+  require "database_cleaner"
+  DatabaseCleaner.strategy = :truncation
+  DatabaseCleaner.clean
+end
+
+def do_with_spinner(name, &block)
+  title = "[:spinner] #{name.ljust(40, '.')}"
+  spinner = TTY::Spinner.new(title, format: :dots)
+  spinner.auto_spin
+  t1 = Time.now
+  retval = yield
+  t2 = Time.now
+  delta = t2 - t1
+  spinner.success("done (#{delta}s)")
+  retval
+end
+
+do_with_spinner("Loading factories") do
+  require "factory_bot_rails"
+  FactoryBot.definition_file_paths = factory_paths
+  FactoryBot.find_definitions if Rails.env.development?
+end
+
+do_with_spinner("Cleaning database") do
+  clean_database
+end
+
+@org = do_with_spinner("Creating test Organization") do
+  FactoryBot.create(:organization)
+end
+
+@ceo = do_with_spinner("Creating test Person") do
+  employee = FactoryBot.create(:employee, organization: @org)
+  employee.employments.create!({ started_on: rand(10..20).years.ago,
+                                 title: Faker::Job.title })
+end
+
+@places = do_with_spinner("Creating test Places") do
+  FactoryBot.create_list(:place, 10, organization: @org)
+end
+
+@customers = do_with_spinner("Creating test customers") do
+  FactoryBot.create_list(:customer, 10, organization: @org)#,
+  #created_by: @ceo)
+end
+
+@products = do_with_spinner("Creating test Products") do
+  FactoryBot.create_list(:product, 10,
+                         organization: @org)#,
+  #created_by: @ceo)
+end
+
+do_with_spinner("Creating test Routers for Products") do
+  @products.each do |product|
+    rp = FactoryBot.create(:routing_process, organization: @org,
+                           product: product)
+    FactoryBot.create_list(:routing_step, rand(1..4),organization: @org,
+                           routing_process: rp)
+  end
+end
+
+do_with_spinner("Creating sample Orders") do
+  50.times do
+    ord = FactoryBot.create(:order, organization: @org,
+                            customer: @customers.sample)
+    #created_by: @ceo)
+    FactoryBot.create_list(:order_line, rand(1..4), organization: @org,
+                           order: ord,
+                           product: @products.sample)
+    #created_by: @ceo)
+  end
+end
+
+@widgets = do_with_spinner("Creating Collection of widgets") do
+  wc = FactoryBot.create(:widget_collection,
+                         organization: @org)
+  FactoryBot.create_list(:widget_thing, 50, organization: @org,
+                         collection: wc)
+end
+
+@widget_packs = do_with_spinner("Creating Collection of widget packs") do
+  wpc = FactoryBot.create(:widget_pack_collection,
+                          organization: @org)
+  FactoryBot.create_list(:widget_pack_thing, 50, organization: @org,
+                         collection: wpc,
+                         widgets: @widgets)
+end
+
+do_with_spinner("Creating Inspection Reports") do
+  5.times do
+    report = FactoryBot.create(:inspection_report, organization: @org)
+    5.times do |index|
+      FactoryBot.create(Jobshop::Inspection::CRITERION_TYPES.sample,
+                        organization: @org, report: report,
+                        position: (index + 1))
+    end
+    5.times do |index|
+      tuple = FactoryBot.create(:inspection_tuple, organization: @org,
+                                report: report, position: (index + 1))
+      report.criteria.each do |criterion|
+        FactoryBot.create(:inspection_result, organization: @org,
+                          report: report, criterion: criterion,
+                          tuple: tuple)
+      end
+    end
+  end
+end
+
+do_with_spinner("Creating RFQ Mailman") do
+  @org.mailmen.create!(address: "rfq@jobshop.io",
+                       handler_type: "Jobshop::Mailroom::RFQHandler")
+end
+
+do_with_spinner("Creating sample RFQs") do
+  50.times do
+    FactoryBot.create(:rfq, organization: @org,
+                      customer: @customers.sample)
+  end
+end

data/lib/generators/jobshop/app/app_generator.rb

@@ -72,7 +72,6 @@ module Jobshop
       end
 
       def finish_template
-        generate "jobshop:config" unless options[:pretend]
         build :config_schema_format
         build :mount_engine
         super
@@ -81,6 +80,7 @@ module Jobshop
       def run_bundle
         super
         bundle_command("binstub jobshop") if bundle_install?
+        generate("jobshop:config") unless options[:pretend]
       end
 
     protected

data/lib/generators/jobshop/app/templates/Procfile.tt

@@ -1 +1,2 @@
 web: bundle exec puma -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development}
+postmaster: bundle exec rails jobshop:postmaster

data/lib/generators/jobshop/app/templates/config/database.yml.tt

@@ -5,15 +5,15 @@ default: &default
 
 development:
   <<: *default
-  database: dummy_development
+  database: jobshop_canary_development
 
 test:
   <<: *default
-  database: dummy_test
+  database: jobshop_canary_test
 
 production:
   <<: *default
-  database: dummy_production
-  # username: dummy
-  # password: <%= ENV['DUMMY_DATABASE_PASSWORD'] %>
+  database: jobshop_canary_production
+  # username: <%= ENV['JOBSHOP_CANARY_DB_USER_NAME'] %>
+  # password: <%= ENV['JOBSHOP_CANARY_PASSWORD'] %>
   # url: <%= ENV['DATABASE_URL'] %>