From 18fd5b00ba3d206698b062c9d74ba4dfecd79471 Mon Sep 17 00:00:00 2001 From: zmagod Date: Wed, 21 Jun 2017 15:01:55 +0200 Subject: [PATCH] fix hound --- app/controllers/repositories_controller.rb | 5 +- app/models/repository.rb | 46 +++++++++---------- .../import_repository/import_records.rb | 10 ++-- 3 files changed, 27 insertions(+), 34 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 60319a21f..bb6dac09b 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -197,7 +197,7 @@ class RepositoriesController < ApplicationController respond_to do |format| unless params[:file] - repository_response(t("teams.parse_sheet.errors.no_file_selected")) + repository_response(t('teams.parse_sheet.errors.no_file_selected')) return end begin @@ -240,11 +240,10 @@ class RepositoriesController < ApplicationController render json: {}, status: :ok else flash[:alert] = t('repositories.import_records.error_flash', - message: status[:errors]) + message: status[:errors]) render json: {}, status: :unprocessable_entity end end - end end diff --git a/app/models/repository.rb b/app/models/repository.rb index bc8b8264c..40cc3ed6e 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -71,13 +71,13 @@ class Repository < ActiveRecord::Base name_index = -1 nr_of_added = 0 - mappings.each.with_index do |(k, v), i| - if v == '-1' + mappings.each.with_index do |(_k, value), index| + if value == '-1' # Fill blank space, so our indices stay the same custom_fields << nil - name_index = i + name_index = index else - cf = repository_columns.find_by_id(v) + cf = repository_columns.find_by_id(value) custom_fields << cf end end @@ -91,27 +91,23 @@ class Repository < ActiveRecord::Base created_by: user, last_modified_by: user) - if record_row.save - sheet.row(i).each.with_index do |value, index| - if custom_fields[index] - # we're working with CustomField - rep_column = RepositoryTextValue.new( - data: value, - created_by: user, - last_modified_by: user, - repository_cell_attributes: { - repository_row: record_row, - repository_column: custom_fields[index] - } - ) - - if !rep_column.save - error << rep_column.errors.messages - end - else - # This custom_field does not exist - error << { '#{mappings[index]}': 'Does not exists' } - end + next unless record_row.save + sheet.row(i).each.with_index do |value, index| + if custom_fields[index] + # we're working with CustomField + rep_column = RepositoryTextValue.new( + data: value, + created_by: user, + last_modified_by: user, + repository_cell_attributes: { + repository_row: record_row, + repository_column: custom_fields[index] + } + ) + error << rep_column.errors.messages unless rep_column.save + else + # This custom_field does not exist + error << { '#{mappings[index]}': 'Does not exists' } end end end diff --git a/app/services/import_repository/import_records.rb b/app/services/import_repository/import_records.rb index f50558838..e9deea8b4 100644 --- a/app/services/import_repository/import_records.rb +++ b/app/services/import_repository/import_records.rb @@ -17,11 +17,9 @@ module ImportRepository private def run_import_actions - @repository.import_records( - @repository.open_spreadsheet(@temp_file.file), - @mappings, - @user - ) + @repository.import_records(@repository.open_spreadsheet(@temp_file.file), + @mappings, + @user) end def run_checks @@ -32,7 +30,7 @@ module ImportRepository I18n.t('repositories.import_records.error_message.no_data_to_parse') } end - unless @mappings.has_value?('-1') + unless @mappings.value?('-1') return { status: :error, errors: