Merge pull request #291 from kortirso/issue_290

IS-290 fixed bug with creating oracul
kortirso · Apr 17, 2024 · 71b3ab9 · 71b3ab9
2 parents a82ac4e + 54abb88
commit 71b3ab9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -3,6 +3,7 @@ require:
   - rubocop-rspec
   - rubocop-rails
   - rubocop-factory_bot
+  - rubocop-rspec_rails
 
 AllCops:
   Exclude:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Fixed
+- bug with creating oracul
+
 ## [1.2.5] - 2024-04-03
 ### Added
 - create users with only username

diff --git a/app/forms/oraculs/create_form.rb b/app/forms/oraculs/create_form.rb
@@ -52,7 +52,7 @@ def create_forecasts(oracul, oracul_place, periodable_ids)
       grouped_ids, forecastable_type = find_grouped_ids(oracul_place, periodable_ids)
       objects = []
       oracul.oraculs_lineups.hashable_pluck(:id, :periodable_id).each do |oraculs_lineup|
-        grouped_ids[oraculs_lineup[:periodable_id]].each do |forecastable_id|
+        grouped_ids[oraculs_lineup[:periodable_id]]&.each do |forecastable_id|
           objects << {
             uuid: SecureRandom.uuid,
             oraculs_lineup_id: oraculs_lineup[:id],

diff --git a/app/javascript/locales/translations.json b/app/javascript/locales/translations.json
@@ -299,8 +299,8 @@
       "telegram": "Телеграм"
     },
     "oraculForm": {
-      "new": "Новый оракл",
-      "description": "В этой форме вам необходимо указать имя вашего оракла",
+      "new": "Новый оракул",
+      "description": "В этой форме вам необходимо указать имя вашего оракула",
       "name": "Имя",
       "save": "Сохранить"
     },

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -137,7 +137,7 @@ ru:
         league_does_not_exist: Лига не существует
     oraculs:
       create:
-        not_unique: Оракл уже создан
+        not_unique: Оракул уже создан
     auth:
       fetch_session:
         forbidden: Доступ запрещён