Base setup #943

ktpe · 2024-11-07T19:06:03Z

dev

GitHub Board

calculators constructor ticket

Code reviewers

@loqimean

Second Level Review

Summary of issue

to create a foundation for the calculator builder.

Summary of change

the addition of models, updating of the controller, updating of new.html, and creation of new _partials were implemented. Additionally, the cocoon gem was added to enable working with multiple calculator fields.

Testing approach

ToDo

CHECK LIST

СI passed
Сode coverage >=95%
PR is reviewed manually again (to make sure you have 100% ready code)
All reviewers agreed to merge the PR
I've checked new feature as logged in and logged out user if needed
PR meets all conventions

app/models/calculator.rb

loqimean · 2024-11-09T09:02:06Z

app/models/category.rb

-  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 }
-
-  scope :ordered_by_name, -> { order(:uk_name) }
-  scope :ordered_by_priority, -> { order(:priority) }
-  scope :unsigned_categories, ->(product) { where.not(id: product.categories_by_prices) }


а чому це видалили?)

повернули
але видаляли бо не до кінця було зрозуміло чи потрібен був цей код для реалізації конструктора

loqimean · 2024-11-09T09:02:31Z

app/models/field.rb

+  has_many :categories, dependent: :destroy
+  accepts_nested_attributes_for :categories, reject_if: :all_blank, allow_destroy: true


Suggested change

has_many :categories, dependent: :destroy

accepts_nested_attributes_for :categories, reject_if: :all_blank, allow_destroy: true

has_many :categories, dependent: :destroy

accepts_nested_attributes_for :categories, reject_if: :all_blank, allow_destroy: true

app/models/field.rb

app/views/account/calculators/partials/_category_fields.html.erb

loqimean · 2024-11-09T09:06:05Z

db/migrate/20210524103702_change_calculators.rb

повертай

loqimean · 2024-11-09T09:07:30Z

db/migrate/20241107134610_create_formulas.rb

+      t.string :expression, null: false, default: ""
+      t.string :uk_label, null: false, default: ""
+      t.string :en_label, null: false


бажано би без дефолт велʼю, але якщо тре, то чому не скрізь тре?)

ага, додали і для :en_label

db/migrate/20241107134610_create_formulas.rb

loqimean · 2024-11-09T09:08:05Z

db/migrate/20241107135318_change_fields.rb

+    remove_columns :fields, :uuid, :selector, :type, :label, :name, :value, :from, :to, :kind, :unit
+
+    add_column :fields, :uk_label, :string, null: false, default: ""
+    add_column :fields, :en_label, :string, null: false, default: ""
+    add_column :fields, :var_name, :string, null: false, default: ""
+    add_column :fields, :field_type, :string, null: false, default: ""


change_table bulk: true

loqimean · 2024-11-09T09:09:20Z

db/migrate/20241107140542_change_categories.rb

@@ -0,0 +1,8 @@
+class ChangeCategories < ActiveRecord::Migration[7.2]
+  def change
+    remove_columns :categories, :priority, :preferable


пріоріті тре, най буде

прибрав

codecov · 2024-11-09T11:11:33Z

Codecov Report

Attention: Patch coverage is 68.42105% with 6 lines in your changes missing coverage. Please review.

Project coverage is 64.09%. Comparing base (ada0b57) to head (c8ac0fa).

Files with missing lines	Patch %	Lines
app/controllers/account/calculators_controller.rb	25.00%	3 Missing ⚠️
app/models/formula.rb	0.00%	3 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (ada0b57) and HEAD (c8ac0fa). Click for more details.

HEAD has 1 upload less than BASE

Flag BASE (ada0b57) HEAD (c8ac0fa)

2 1

Additional details and impacted files

@@                         Coverage Diff                         @@
##           feature/calculator-constructor     #943       +/-   ##
===================================================================
- Coverage                           91.16%   64.09%   -27.07%     
===================================================================
  Files                                  70       71        +1     
  Lines                                 973      997       +24     
===================================================================
- Hits                                  887      639      -248     
- Misses                                 86      358      +272

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

loqimean · 2024-11-10T10:03:25Z

app/models/field.rb

-
-    self.selector = "#{kind&.first&.upcase}#{index}"
-  end
+  FIELD_TYPES = [


Роби хешом, а ще тре конвертнеш в масив

loqimean · 2024-11-10T10:04:02Z

app/views/account/calculators/partials/_form.html.erb

+      <%= f.input :en_name, label: "Calculator Name:", class: 'form-control' %>
+
+    <!-- formula input-->
+    <div id="formulas" class="space-y-4">


Щось тут не гуд по ідентецшинам

досі не гуд

loqimean · 2024-11-10T10:04:26Z

config/database.yml.sample

@@ -23,4 +23,4 @@ production:
  <<: *default
 #   database: zero_waste_production
 #   username: zero_waste
-#   password: <%= ENV['ZERO_WASTE_DATABASE_PASSWORD'] %>
+#   password: <%= ENV['ZERO_WASTE_DATABASE_PASSWORD'] %>


Нова строка

db/migrate/20241107134610_create_formulas.rb

loqimean · 2024-11-10T10:06:06Z

db/migrate/20241107140542_change_categories.rb

+    change_table :categories, bulk: true do |t|
+      t.remove :preferable, type: :boolean
+
+      t.float :price, null: false, default: 0.0


Завжди для ціни юзай BigDecimal, чи то Decimal. Загугли

зробив через decimal
пишуть що BigDecimal вже буде юзатись у рубі коді, не в міграціях

loqimean · 2024-11-10T10:06:32Z

spec/features/account/create_calculator_spec.rb

Видали, якщо не тре

loqimean · 2024-11-10T10:06:43Z

spec/features/account/update_calculator_spec.rb

loqimean · 2024-11-10T10:38:33Z

.vscode/settings.json

видаляй)

loqimean · 2024-11-10T10:39:19Z

app/models/field.rb


-  before_create :set_selector, if: -> { selector.blank? }
+  # enum :kind, { form: 0, parameter: 1, result: 2 }


kind, FIELD_TYPES

loqimean · 2024-11-10T10:40:08Z

app/views/account/calculators/partials/_form.html.erb

+      <%= f.input :en_name, label: "Calculator Name:", class: 'form-control' %>
+
+    <!-- formula input-->
+    <div id="formulas" class="space-y-4">


досі не гуд

loqimean · 2024-11-13T08:38:31Z

.vscode/settings.json

видаляй

loqimean · 2024-11-13T08:38:41Z

app/controllers/account/calculators_controller.rb

@@ -15,6 +15,13 @@ def show
    # TODO: fill it
  end

+  def new
+    @calculator = Calculator.new


тести)

loqimean · 2024-11-13T08:40:10Z

app/models/category.rb

+  validates :en_name, presence: true
+  validates :en_name,


а чому нема укр назви?) також транслейтабл?)

loqimean · 2024-11-13T08:40:48Z

app/models/field.rb


-  private
+  enum :kind, { number: 0, category: 1 }


юзайте текстові велєю + константи на ті велʼю

loqimean · 2024-11-13T08:40:56Z

app/models/field.rb


-  before_create :set_selector, if: -> { selector.blank? }
+  accepts_nested_attributes_for :categories, reject_if: :all_blank, allow_destroy: true


це має бути в самому низу

loqimean · 2024-11-13T08:42:24Z

app/views/account/calculators/partials/_field_fields.html.erb

+  <%= f.input :kind, 
+    collection: Field.kinds.map { |k, _| [k.humanize, k] },
+    prompt: "Select Field Type",
+    label: "Field Type:",
+    input_html: { data: { field_type_target: "fieldTypeSelect" } } %>


Suggested change

<%= f.input :kind,

collection: Field.kinds.map { |k, _| [k.humanize, k] },

prompt: "Select Field Type",

label: "Field Type:",

input_html: { data: { field_type_target: "fieldTypeSelect" } } %>

<%= f.input(

:kind,

collection: Field.kinds.map { |k, _| [k.humanize, k] },

prompt: "Select Field Type",

label: "Field Type:",

input_html: { data: { field_type_target: "fieldTypeSelect" }}

) %>

ktpe added 4 commits November 7, 2024 16:29

added migrations

2df2b28

added models; little fixes for new view

ee6bea1

added cocoon; added cocoon-vanilla-js;

098b870

added nested fields; added new action; added stimulus js for field_type;

161e251

ktpe requested review from loqimean, igorSimash, NVMakarenko and SleekMutt November 7, 2024 19:06

codestyle fixes via rubocop

bb70151

ktpe closed this Nov 7, 2024

ktpe reopened this Nov 7, 2024

ktpe changed the base branch from calculators_constructor to feature/calculator-constructor November 7, 2024 19:24

ktpe added 3 commits November 7, 2024 23:01

modified calculator model;

84c6ccb

fixed calc model;

5de9f1d

fixed createting calculator;

3cdf6f7

loqimean requested changes Nov 9, 2024

View reviewed changes

fixed CI; fixed code style; optimized code;

78ee5dc

returned validations for category.rb, field.rb; temporary removed specs;

e0b2a54

ktpe requested a review from loqimean November 10, 2024 09:34

loqimean requested changes Nov 10, 2024

View reviewed changes

changed price type; fixed code style; removed unused specs;

5c47931

loqimean approved these changes Nov 10, 2024

View reviewed changes

ktpe added 2 commits November 10, 2024 13:58

fixed type_fields;

0af47bf

revomed field_type; added enum kind logic; changed categories migration;

c8ac0fa

ktpe requested a review from loqimean November 12, 2024 21:15

loqimean requested changes Nov 13, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Base setup #943

Base setup #943

ktpe commented Nov 7, 2024 •

edited

Loading

loqimean Nov 9, 2024

ktpe Nov 10, 2024 •

edited

Loading

loqimean Nov 9, 2024

ktpe Nov 10, 2024

loqimean Nov 9, 2024

ktpe Nov 10, 2024

loqimean Nov 9, 2024

ktpe Nov 10, 2024

loqimean Nov 9, 2024

ktpe Nov 10, 2024

loqimean Nov 9, 2024

ktpe Nov 10, 2024

codecov bot commented Nov 9, 2024 •

edited

Loading

loqimean Nov 10, 2024

loqimean Nov 10, 2024

loqimean Nov 10, 2024

loqimean Nov 10, 2024

loqimean Nov 10, 2024

ktpe Nov 10, 2024

loqimean Nov 10, 2024

loqimean Nov 10, 2024

loqimean Nov 10, 2024

loqimean Nov 10, 2024

loqimean Nov 10, 2024

loqimean Nov 13, 2024

loqimean Nov 13, 2024

loqimean Nov 13, 2024

loqimean Nov 13, 2024

loqimean Nov 13, 2024

loqimean Nov 13, 2024

		has_many :categories, dependent: :destroy
		accepts_nested_attributes_for :categories, reject_if: :all_blank, allow_destroy: true


		before_create :set_selector, if: -> { selector.blank? }
		# enum :kind, { form: 0, parameter: 1, result: 2 }

Base setup #943

Are you sure you want to change the base?

Base setup #943

Conversation

ktpe commented Nov 7, 2024 • edited Loading

GitHub Board

Code reviewers

Second Level Review

Summary of issue

Summary of change

Testing approach

CHECK LIST

Choose a reason for hiding this comment

ktpe Nov 10, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Nov 9, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ktpe commented Nov 7, 2024 •

edited

Loading

ktpe Nov 10, 2024 •

edited

Loading

codecov bot commented Nov 9, 2024 •

edited

Loading