X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cfbdd3f7e1c688e2c875ded9fd847fcc1c3a4caf..aeb4271a27f3a331d65973f3c279cbc5bfa8a8dc:/app/models/old_relation.rb?ds=inline diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index 6da7814c2..5ff12fd58 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -1,111 +1,104 @@ -class OldRelation < ActiveRecord::Base - set_table_name 'relations' +# == Schema Information +# +# Table name: relations +# +# relation_id :bigint(8) not null, primary key +# changeset_id :bigint(8) not null +# timestamp :datetime not null +# version :bigint(8) not null, primary key +# visible :boolean default(TRUE), not null +# redaction_id :integer +# +# Indexes +# +# relations_changeset_id_idx (changeset_id) +# relations_timestamp_idx (timestamp) +# +# Foreign Keys +# +# relations_changeset_id_fkey (changeset_id => changesets.id) +# relations_redaction_id_fkey (redaction_id => redactions.id) +# - belongs_to :user +class OldRelation < ApplicationRecord + include ConsistencyValidations + + self.table_name = "relations" + + # NOTE: this needs to be included after the table name changes, or + # the queries generated by Redactable will use the wrong table name. + include Redactable + + belongs_to :changeset + belongs_to :redaction, :optional => true + belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id", :inverse_of => :old_relations + + has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :query_constraints => [:relation_id, :version], :inverse_of => :old_relation + has_many :old_tags, :class_name => "OldRelationTag", :query_constraints => [:relation_id, :version], :inverse_of => :old_relation + + validates :changeset, :associated => true + validates :timestamp, :presence => true + validates :visible, :inclusion => [true, false] def self.from_relation(relation) old_relation = OldRelation.new old_relation.visible = relation.visible - old_relation.user_id = relation.user_id + old_relation.changeset_id = relation.changeset_id old_relation.timestamp = relation.timestamp - old_relation.id = relation.id + old_relation.relation_id = relation.id + old_relation.version = relation.version old_relation.members = relation.members old_relation.tags = relation.tags - return old_relation + old_relation end def save_with_dependencies! - - # see comment in old_way.rb ;-) save! - clear_aggregation_cache - clear_association_cache - @attributes.update(OldRelation.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes')) - - # ok, you can touch from here on - self.tags.each do |k,v| + tags.each do |k, v| tag = OldRelationTag.new tag.k = k tag.v = v - tag.id = self.id - tag.version = self.version + tag.relation_id = relation_id + tag.version = version tag.save! end - i = 1 - self.members.each do |m| + members.each_with_index do |m, i| member = OldRelationMember.new - member.id = self.id - member.member_type = m[0] + member.id = [relation_id, version, i] + member.member_type = m[0].classify member.member_id = m[1] member.member_role = m[2] - member.version = self.version member.save! end end def members - unless @members - @members = Array.new - OldRelationMember.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |m| - @members += [[m.type,m.id,m.role]] - end + @members ||= old_members.collect do |member| + [member.member_type, member.member_id, member.member_role] end - @members end def tags - unless @tags - @tags = Hash.new - OldRelationTag.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag| - @tags[tag.k] = tag.v - end - end - @tags = Hash.new unless @tags - @tags + @tags ||= old_tags.to_h { |t| [t.k, t.v] } end - def members=(s) - @members = s - end + attr_writer :members, :tags - def tags=(t) - @tags = t + # Temporary method to match interface to relations + def relation_members + old_members end -# has_many :relation_segments, :class_name => 'OldRelationSegment', :foreign_key => 'id' -# has_many :relation_tags, :class_name => 'OldRelationTag', :foreign_key => 'id' - - def old_members - OldRelationMember.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version]) + # Pretend we're not in any relations + def containing_relation_members + [] end - def old_tags - OldRelationTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version]) + # check whether this element is the latest version - that is, + # has the same version as its "current" counterpart. + def latest_version? + current_relation.version == version end - - def to_xml_node - el1 = XML::Node.new 'relation' - el1['id'] = self.id.to_s - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - el1['user'] = self.user.display_name if self.user.data_public? - - self.old_members.each do |member| - e = XML::Node.new 'member' - e['type'] = member.member_type.to_s - e['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML - e['role'] = member.member_role.to_s - el1 << e - end - - self.old_tags.each do |tag| - e = XML::Node.new 'tag' - e['k'] = tag.k - e['v'] = tag.v - el1 << e - end - return el1 - end end