Merge branch 'calculators-constructor' into new_calc_specs

.github/workflows/ci.yml

@@ -52,7 +52,9 @@ jobs:
           bundler-cache: true
 
       - name: Install system dependencies
-        run: sudo apt-get install -y libvips42 libvips-dev imagemagick
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libvips42 libvips-dev imagemagick
 
       - uses: actions/setup-node@v1
         with:

app/models/calculator.rb

@@ -5,9 +5,9 @@
 # Table name: calculators
 #
 #  id         :bigint           not null, primary key
-#  en_name    :string           not null
+#  en_name    :string           default(""), not null
 #  slug       :string
-#  uk_name    :string           not null
+#  uk_name    :string           default(""), not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #
@@ -27,8 +27,8 @@ class Calculator < ApplicationRecord
   has_many :fields, dependent: :destroy
   has_many :formulas, dependent: :destroy
 
-  accepts_nested_attributes_for :fields, reject_if: :all_blank, allow_destroy: true
-  accepts_nested_attributes_for :formulas, reject_if: :all_blank, allow_destroy: true
+  accepts_nested_attributes_for :fields, allow_destroy: true
+  accepts_nested_attributes_for :formulas, allow_destroy: true
 
   scope :ordered_by_name, -> { order(:en_name) }
 

app/models/category.rb

@@ -5,24 +5,39 @@
 # Table name: categories
 #
 #  id         :bigint           not null, primary key
-#  name       :string
+#  en_name    :string
+#  preferable :boolean          default(FALSE), not null
+#  price      :decimal(10, 2)   default(0.0), not null
 #  priority   :integer          default(0), not null
+#  uk_name    :string
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
-#  preferable :boolean          default: false
+#  field_id   :bigint           not null
+#
+# Indexes
+#
+#  index_categories_on_field_id  (field_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (field_id => fields.id)
 #
 class Category < ApplicationRecord
   include Translatable
+  translates :name
 
-  belongs_to :field
+  PRIORITY_RANGE = 0..10
 
-  translates :name
+  belongs_to :field, optional: true
+  has_many :diapers_periods, dependent: :destroy
+  has_many :category_categoryables, dependent: :restrict_with_exception
+
+  enum :preferable, { not_preferable: false, preferable: true }
 
   validates :uk_name, :en_name, presence: true
   validates :uk_name, :en_name,
             length: { minimum: 3, maximum: 30 },
             format: { with: /\A[\p{L}0-9\s'-]+\z/i },
-            uniqueness: { case_sensitive: false },
             allow_blank: true
   validates :priority, numericality: { greater_than_or_equal_to: 0 }
 

app/models/diapers_period.rb

@@ -2,14 +2,23 @@
 #
 # Table name: diapers_periods
 #
-#  category_id :bigint          null: false
-#  price :decimal               precision: 8, scale: 2
-#  period_start :integer        null: false
-#  period_end :integer          null: false
-#  usage_amount :integer        null: false
-#  created_at :datetime         null: false
-#  updated_at :datetime         null: false
-#  index ["category_id"], name: "index_diapers_periods_on_category_id"
+#  id           :bigint           not null, primary key
+#  period_end   :integer          not null
+#  period_start :integer          not null
+#  price        :decimal(8, 2)    not null
+#  usage_amount :integer          not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  category_id  :bigint           not null
+#
+# Indexes
+#
+#  index_diapers_periods_on_category_id  (category_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (category_id => categories.id)
+#
 
 class DiapersPeriod < ApplicationRecord
   belongs_to :category

app/models/field.rb

@@ -5,24 +5,22 @@
 # Table name: fields
 #
 #  id            :bigint           not null, primary key
-#  from          :integer
-#  kind          :integer          not null
-#  label         :string
-#  name          :string
-#  selector      :string           not null
-#  to            :integer
-#  type          :string           not null
+#  en_label      :string           default(""), not null
+#  kind          :string           not null
+#  uk_label      :string           default(""), not null
 #  unit          :integer          default("day")
-#  uuid          :uuid             not null
-#  value         :string
+#  var_name      :string           default(""), not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #  calculator_id :bigint           not null
 #
 # Indexes
 #
 #  index_fields_on_calculator_id  (calculator_id)
-#  index_fields_on_uuid           (uuid) UNIQUE
+#
+# Foreign Keys
+#
+#  fk_rails_...  (calculator_id => calculators.id)
 #
 class Field < ApplicationRecord
   include Translatable

app/models/formula.rb

@@ -1,3 +1,26 @@
+# == Schema Information
+#
+# Table name: formulas
+#
+#  id            :bigint           not null, primary key
+#  en_label      :string           default(""), not null
+#  en_unit       :string
+#  expression    :string           default(""), not null
+#  priority      :integer          default(0), not null
+#  uk_label      :string           default(""), not null
+#  uk_unit       :string
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  calculator_id :bigint           not null
+#
+# Indexes
+#
+#  index_formulas_on_calculator_id  (calculator_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (calculator_id => calculators.id)
+#
 class Formula < ApplicationRecord
   belongs_to :calculator
 

app/models/price.rb

@@ -14,9 +14,9 @@
 #
 # Indexes
 #
-#  index_prices_on_category_id                                      (category_id)
-#  index_prices_on_category_id_and_priceable_id_and_priceable_type  (category_id,priceable_id,priceable_type) UNIQUE
-#  index_prices_on_priceable                                        (priceable_type,priceable_id)
+#  idx_on_category_id_priceable_id_priceable_type_1fa9ce7f24  (category_id,priceable_id,priceable_type) UNIQUE
+#  index_prices_on_category_id                                (category_id)
+#  index_prices_on_priceable                                  (priceable_type,priceable_id)
 #
 class Price < ApplicationRecord
   belongs_to :priceable, polymorphic: true

app/models/product.rb

@@ -14,6 +14,7 @@
 # Indexes
 #
 #  index_products_on_product_type_id  (product_type_id)
+#  index_products_on_title            (title) UNIQUE
 #  index_products_on_uuid             (uuid) UNIQUE
 #
 class Product < ApplicationRecord