mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-06 15:05:26 +08:00
Merge pull request #319 from Ducz0r/lm-sci-720-fix
Add uniqueness to sample_type & sample_group name
This commit is contained in:
commit
a41278f03c
4 changed files with 51 additions and 3 deletions
|
@ -2,7 +2,8 @@ class SampleGroup < ActiveRecord::Base
|
|||
auto_strip_attributes :name, :color, nullify: false
|
||||
validates :name,
|
||||
presence: true,
|
||||
length: { maximum: Constants::NAME_MAX_LENGTH }
|
||||
length: { maximum: Constants::NAME_MAX_LENGTH },
|
||||
uniqueness: { scope: :organization, case_sensitive: false }
|
||||
validates :color,
|
||||
presence: true,
|
||||
length: { maximum: Constants::COLOR_MAX_LENGTH }
|
||||
|
|
|
@ -2,7 +2,8 @@ class SampleType < ActiveRecord::Base
|
|||
auto_strip_attributes :name, nullify: false
|
||||
validates :name,
|
||||
presence: true,
|
||||
length: { maximum: Constants::NAME_MAX_LENGTH }
|
||||
length: { maximum: Constants::NAME_MAX_LENGTH },
|
||||
uniqueness: { scope: :organization, case_sensitive: false }
|
||||
validates :organization, presence: true
|
||||
|
||||
belongs_to :created_by, foreign_key: 'created_by_id', class_name: 'User'
|
||||
|
|
|
@ -0,0 +1,46 @@
|
|||
class RenameNonUniqueSampleTypesGroups < ActiveRecord::Migration
|
||||
def up
|
||||
Organization.find_each do |org|
|
||||
st_ids = []
|
||||
org.sample_types.find_each do |st|
|
||||
next unless SampleType.where(organization_id: org.id)
|
||||
.where(name: st.name)
|
||||
.count > 1
|
||||
st_ids << st.id
|
||||
end
|
||||
|
||||
next if st_ids.count.zero?
|
||||
|
||||
cntr = -1
|
||||
SampleType.where(id: st_ids).find_each do |st|
|
||||
cntr += 1
|
||||
next if cntr.zero?
|
||||
new_name = "#{st.name} (#{cntr})"
|
||||
st.update(name: new_name)
|
||||
end
|
||||
end
|
||||
|
||||
Organization.find_each do |org|
|
||||
sg_ids = []
|
||||
org.sample_groups.find_each do |sg|
|
||||
next unless SampleGroup.where(organization_id: org.id)
|
||||
.where(name: sg.name)
|
||||
.count > 1
|
||||
sg_ids << sg.id
|
||||
end
|
||||
|
||||
next if sg_ids.count.zero?
|
||||
|
||||
cntr = -1
|
||||
SampleGroup.where(id: sg_ids).find_each do |sg|
|
||||
cntr += 1
|
||||
next if cntr.zero?
|
||||
new_name = "#{sg.name} (#{cntr})"
|
||||
sg.update(name: new_name)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
|
@ -11,7 +11,7 @@
|
|||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20161012112900) do
|
||||
ActiveRecord::Schema.define(version: 20161125153600) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
|
|
Loading…
Reference in a new issue