Merge branch 'calculators-constructor' of github.com:ita-social-proje…

…cts/ZeroWaste into 963-view-of-the-constructors-calculator
ita-social-projects · Nov 26, 2024 · 8a0a37f · 8a0a37f
2 parents 8744fe7 + 9130d91
commit 8a0a37f
Show file tree

Hide file tree

Showing 31 changed files with 34 additions and 868 deletions.
diff --git a/.github/workflows/ci.yml b/.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:

diff --git a/app/controllers/account/calculators_controller.rb b/app/controllers/account/calculators_controller.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Account::CalculatorsController < Account::BaseController
-  before_action :resource, only: [:edit, :update, :destroy]
   load_and_authorize_resource
 
   def index
@@ -23,6 +22,8 @@ def new
   end
 
   def edit
+    @calculator = resource
+
     collect_fields_for_form
   end
 
@@ -37,6 +38,8 @@ def create
   end
 
   def update
+    @calculator = resource
+
     if updater
       redirect_to edit_account_calculator_path(slug: @calculator), notice: t("notifications.calculator_updated")
     else
@@ -47,6 +50,8 @@ def update
   end
 
   def destroy
+    @calculator = resource
+
     @calculator.destroy
 
     redirect_to account_calculators_path, notice: t("notifications.calculator_deleted"), status: :see_other
@@ -59,7 +64,7 @@ def collection
   end
 
   def resource
-    Calculator.find(params[:slug])
+    collection.friendly.find(params[:slug])
   end
 
   def collect_fields_for_form

diff --git a/app/controllers/api/v2/calculators_controller.rb b/app/controllers/api/v2/calculators_controller.rb
diff --git a/app/lib/calculation_resolver.rb b/app/lib/calculation_resolver.rb
diff --git a/app/lib/calculator_resolver.rb b/app/lib/calculator_resolver.rb
diff --git a/app/models/calculation.rb b/app/models/calculation.rb
diff --git a/app/models/calculator.rb b/app/models/calculator.rb
@@ -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) }
 

diff --git a/app/models/category.rb b/app/models/category.rb
@@ -24,16 +24,20 @@
 #
 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 }
 

diff --git a/app/models/named_value.rb b/app/models/named_value.rb
diff --git a/app/models/range_field.rb b/app/models/range_field.rb
diff --git a/app/models/select.rb b/app/models/select.rb
diff --git a/app/models/value.rb b/app/models/value.rb
diff --git a/app/serializers/field_serializer.rb b/app/serializers/field_serializer.rb
diff --git a/db/migrate/20241119192344_change_field_in_category.rb b/db/migrate/20241119192344_change_field_in_category.rb
@@ -0,0 +1,5 @@
+class ChangeFieldInCategory < ActiveRecord::Migration[7.2]
+  def change
+    change_column_null :categories, :field_id, true
+  end
+end