scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-10 08:21:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2971 from okriuchykhin/ok_SCI_5238

Browse source 
Improve limit check for repository list and checklist items [SCI-5238]
This commit is contained in:
Alex Kriuchykhin 2020-11-30 19:59:46 +01:00 • committed by GitHub
commit 7b17d9d54d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/repository_checklist_item.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class RepositoryChecklistItem < ApplicationRecord class RepositoryChecklistItem < ApplicationRecord
belongs_to :repository_column belongs_to :repository_column, inverse_of: :repository_checklist_items
belongs_to :created_by, foreign_key: 'created_by_id', class_name: 'User', belongs_to :created_by, foreign_key: 'created_by_id', class_name: 'User',
inverse_of: :created_repository_checklist_types inverse_of: :created_repository_checklist_types
belongs_to :last_modified_by, foreign_key: 'last_modified_by_id', class_name: 'User', belongs_to :last_modified_by, foreign_key: 'last_modified_by_id', class_name: 'User',
@ -18,7 +18,7 @@ class RepositoryChecklistItem < ApplicationRecord
def validate_per_column_limit def validate_per_column_limit
if repository_column && if repository_column &&
repository_column.repository_checklist_items.count > Constants::REPOSITORY_CHECKLIST_ITEMS_PER_COLUMN repository_column.repository_checklist_items.size > Constants::REPOSITORY_CHECKLIST_ITEMS_PER_COLUMN
errors.add(:base, :per_column_limit) errors.add(:base, :per_column_limit)
end end
end end

2
app/models/repository_list_item.rb
View file

@ -15,7 +15,7 @@ class RepositoryListItem < ApplicationRecord
def validate_per_column_limit def validate_per_column_limit
if repository_column && if repository_column &&
repository_column.repository_list_items.count > Constants::REPOSITORY_LIST_ITEMS_PER_COLUMN repository_column.repository_list_items.size > Constants::REPOSITORY_LIST_ITEMS_PER_COLUMN
errors.add(:base, :per_column_limit) errors.add(:base, :per_column_limit)
end end
end end

2
app/models/repository_list_value.rb
View file

@ -61,7 +61,7 @@ class RepositoryListValue < ApplicationRecord
value.repository_list_item = value.repository_cell value.repository_list_item = value.repository_cell
.repository_column .repository_column
.repository_list_items .repository_list_items
.find(payload) .find_by(id: payload)
value value
end end

4
spec/factories/repository_checklist_items.rb
View file

@ -6,5 +6,9 @@ FactoryBot.define do
repository_column { create :repository_column, :checklist_type } repository_column { create :repository_column, :checklist_type }
created_by { create :user } created_by { create :user }
last_modified_by { created_by } last_modified_by { created_by }
after(:create) do |item|
item.repository_column.reload
end
end end
end end

4
spec/factories/repository_list_items.rb
View file

@ -6,5 +6,9 @@ FactoryBot.define do
repository_column { create :repository_column, :list_type } repository_column { create :repository_column, :list_type }
created_by { create :user } created_by { create :user }
last_modified_by { created_by } last_modified_by { created_by }
after(:create) do |item|
item.repository_column.reload
end
end end
end end

2
spec/models/repository_list_value_spec.rb
View file

@ -89,8 +89,8 @@ RSpec.describe RepositoryListValue, type: :model do
describe 'self.new_with_payload' do describe 'self.new_with_payload' do
let(:user) { create :user } let(:user) { create :user }
let(:column) { create :repository_column } let(:column) { create :repository_column }
let(:cell) { build :repository_cell, repository_column: column }
let(:list_item) { create :repository_list_item, repository_column: column } let(:list_item) { create :repository_list_item, repository_column: column }
let(:cell) { build :repository_cell, repository_column: column }
let(:attributes) do let(:attributes) do
{ {
repository_cell: cell, repository_cell: cell,