scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 17:51:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add Archived to ProjectFolder name uniqueness scope

Browse source 
SCI-5417
This commit is contained in:
Urban Rotnik 2021-01-22 08:50:47 +01:00
parent e3388b880c
commit 68ac663370
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/project_folder.rb
View file

@ -8,7 +8,7 @@ class ProjectFolder < ApplicationRecord
validates :name, validates :name,
length: { minimum: Constants::NAME_MIN_LENGTH, length: { minimum: Constants::NAME_MIN_LENGTH,
maximum: Constants::NAME_MAX_LENGTH }, maximum: Constants::NAME_MAX_LENGTH },
uniqueness: { scope: %i(team_id parent_folder_id), case_sensitive: false } uniqueness: { scope: %i(team_id parent_folder_id archived), case_sensitive: false }
validate :parent_folder_team, if: -> { parent_folder.present? } validate :parent_folder_team, if: -> { parent_folder.present? }
validate :parent_folder_validation, if: -> { parent_folder.present? } validate :parent_folder_validation, if: -> { parent_folder.present? }

3
spec/models/project_folder_spec.rb
View file

@ -37,7 +37,8 @@ describe ProjectFolder, type: :model do
.is_at_most(Constants::NAME_MAX_LENGTH)) .is_at_most(Constants::NAME_MAX_LENGTH))
end end
it do it do
expect(project_folder).to validate_uniqueness_of(:name).scoped_to(%i(team_id parent_folder_id)).case_insensitive expect(project_folder)
.to validate_uniqueness_of(:name).scoped_to(%i(team_id parent_folder_id archived)).case_insensitive
end end
end end