Constructors validations #948
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
loqimean
requested changes
Nov 9, 2024
app/validators/field_validator.rb
Outdated
|
|
||
| return if used_in_any_formula | ||
|
|
||
| record.errors.add(:var_name, "field isn't used in any formula") |
There was a problem hiding this comment.
юзай локалізацію, думаю передай тут символ та додай переклад ключа в локалях
app/validators/field_validator.rb
Outdated
|
|
||
| def field_is_part_of_any_formula(record) | ||
| used_in_any_formula = record.calculator.formulas.any? do |formula| | ||
| formula.expression.scan(/\b[a-zA-Z_]\w*\b/).uniq.include?(record.var_name) |
There was a problem hiding this comment.
винеси регексп в константу
app/validators/formula_validator.rb
Outdated
|
|
||
| def fields_are_included_in_formulas(record) | ||
| field_names = record.calculator.fields.map(&:var_name) | ||
| formula_variables = record.expression.scan(/\b[a-zA-Z_]\w*\b/).uniq |
app/validators/formula_validator.rb
Outdated
|
|
||
| return if unused_fields.blank? | ||
|
|
||
| record.errors.add(:expression, "requires fields #{unused_fields.join(', ')} to be initialized") |
NVMakarenko
approved these changes
Nov 9, 2024
ktpe
approved these changes
Nov 10, 2024
loqimean
reviewed
Nov 10, 2024
spec/models/formula_spec.rb
Outdated
Comment on lines
32
to
33
| calculator.fields.build(var_name: "a") | ||
| calculator.fields.build(var_name: "b") |
spec/models/field_spec.rb
Outdated
| @@ -52,6 +45,19 @@ | |||
| is_expected.to define_enum_for(:unit) | |||
| .with_values([:day, :week, :month, :year, :date, :times, :money, :items]) | |||
| } | |||
|
|
|||
| it "is valid when field is used in any of calculators formulas" do | |||
| calculator.formulas.build(expression: "a + b") | |||
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## calculators-constructor #948 +/- ##
===========================================================
- Coverage 83.98% 80.57% -3.42%
===========================================================
Files 65 65
Lines 974 978 +4
===========================================================
- Hits 818 788 -30
- Misses 156 190 +34 ☔ View full report in Codecov by Sentry. 🚨 Try these New Features:
|
SleekMutt
changed the base branch from
base-setup
to
calculators-constructor
loqimean
reviewed
Dec 1, 2024
| @@ -6,6 +6,7 @@ | |||
|
|
|||
| <!-- formula input--> | |||
| <div id="formulas" class="space-y-4"> | |||
| <%= f.error_notification message: f.object.errors[:formulas].to_sentence if f.object.errors[:formulas].present? %> | |||
There was a problem hiding this comment.
навіщо це? точно потрібно? також де скріншот, як це виглядає?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
part of: #359
Code reviewers
Second Level Review
Summary of issue
There is no validations for constructors models
Summary of change
Created new validations for formula and field models
CHECK LIST