Merge branch 'master' of github.com:domify/registry

app/models/contact.rb

@@ -7,6 +7,7 @@ class Contact < ActiveRecord::Base
   has_many :domains, through: :domain_contacts
   has_many :statuses, class_name: 'ContactStatus', dependent: :destroy
   has_many :legal_documents, as: :documentable
+  has_many :registrant_domains, class_name: 'Domain', foreign_key: 'registrant_id' # when contant is registrant
 
   accepts_nested_attributes_for :legal_documents
 
@@ -188,4 +189,21 @@ class Contact < ActiveRecord::Base
       errors.add(:ident, :invalid_country_code)
     end
   end
+
+  def related_domain_descriptions
+    @desc = {}
+
+    registrant_domains.each do |dom|
+      @desc[dom.name] ||= []
+      @desc[dom.name] << :registrant
+    end
+
+    domain_contacts.each do |dc|
+      @desc[dc.domain.name] ||= []
+      @desc[dc.domain.name] << dc.name.downcase.to_sym
+      @desc[dc.domain.name] = @desc[dc.domain.name].compact
+    end
+
+    @desc
+  end
 end

app/views/contact_mailer/email_updated.html.erb

@@ -6,10 +6,10 @@ uus aadress: <%= @contact.email %>
 <br><br>
 Eposti aadressile saadetakse domeenidega seotud infot seal hulgas kinnitustaotluseid omaniku vahetuse ja domeeni kustutamise korral. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduga oma registripidaja poole. Teie registripidaja on <%= @contact.registrar.name %>
 <br><br>
-<% if @contact.domain_contacts.present? %>
+<% if @contact.related_domain_descriptions.present? %>
 Muudatusega seotud domeenid:<br>
-<% @contact.domain_contacts.each do |dc| %>
-  <%= dc.domain.name %> (<%= dc.name %>)<br>
+<% @contact.related_domain_descriptions.each do |domain, desc| %>
+  <%= domain %> (<%= desc.map { |d| t(d, locale: :et) }.join(', ') %>)<br>
 <% end %>
 <% end %>
 <br>
@@ -35,9 +35,11 @@ new address: <% @contact.email %>
 <br><br>
 E-mail addresses are used to send important information regarding your registered domains including applications for approval of registrant change and domain deletion. Please make sure that the update and contact information are correct. Incase of problems please turn to your registrar. Your registrar is <%= @contact.registrar.name %>
 <br><br>
+<% if @contact.related_domain_descriptions.present? %>
 Domains affected by this update:<br>
-<% @contact.domain_contacts.each do |dc| %>
-  <%= dc.domain.name %> (<%= dc.name %>)<br>
+<% @contact.related_domain_descriptions.each do |domain, desc| %>
+  <%= domain %> (<%= desc.map { |d| t(d, locale: :en) }.join(', ') %>)<br>
+<% end %>
 <% end %>
 <br>
 Contact information:<br>

app/views/contact_mailer/email_updated.text.erb

@@ -6,11 +6,11 @@ uus aadress: <%= @contact.email %>
 
 Eposti aadressile saadetakse domeenidega seotud infot seal hulgas kinnitustaotluseid omaniku vahetuse ja domeeni kustutamise korral. Palun veenduge, et muudatus on korrektne ning probleemide korral pöörduga oma registripidaja poole. Teie registripidaja on <%= @contact.registrar.name %>
 
-<% if @contact.domain_contacts.present? %>
+<% if @contact.related_domain_descriptions.present? %>
 Muudatusega seotud domeenid:
-<% @contact.domain_contacts.each do |dc| %>
-  <%= dc.domain.name %> (<%= dc.name %>)
-<% end %>
+  <% @contact.related_domain_descriptions.each do |domain, desc| %>
+    <%= domain %> (<%= desc.map { |d| t(d, locale: :et) }.join(', ') %>)
+  <% end %>
 <% end %>
 
 Kontaktandmed:
@@ -35,9 +35,11 @@ new address: <% @contact.email %>
 
 E-mail addresses are used to send important information regarding your registered domains including applications for approval of registrant change and domain deletion. Please make sure that the update and contact information are correct. Incase of problems please turn to your registrar. Your registrar is <%= @contact.registrar.name %>
 
+<% if @contact.related_domain_descriptions.present? %>
 Domains affected by this update:
-<% @contact.domain_contacts.each do |dc| %>
-  <%= dc.domain.name %> (<%= dc.name %>)
+  <% @contact.related_domain_descriptions.each do |domain, desc| %>
+    <%= domain %> (<%= desc.map { |d| t(d, locale: :en) }.join(', ') %>)
+  <% end %>
 <% end %>
 
 Contact information:

config/locales/en.yml

@@ -810,3 +810,5 @@ en:
   invalid_csr_or_crt: 'Invalid CSR or CRT'
   webserver_missing_client_cert_directive: 'Webserver missing client cert directive'
   webserver_client_cert_directive_should_be_required: 'Webserver client cert directive should be required'
+  tech: Tech contact
+  admin: Admin contact

config/locales/et.yml

@@ -2,3 +2,6 @@ et:
   username: 'Kasutajanimi'
   password: 'Parool'
   log_in: 'Logi sisse'
+  registrant: 'Registreerija'
+  tech: Tehniline kontakt
+  admin: Halduskontakt

spec/models/contact_spec.rb

@@ -99,6 +99,10 @@ describe Contact do
       @contact.valid?
       @contact.errors[:code].should == ['is too long (maximum is 100 characters)']
     end
+
+    it 'should have no related domain descriptions' do
+      @contact.related_domain_descriptions.should == {}
+    end
   end
 
   context 'with valid attributes' do
@@ -189,6 +193,22 @@ describe Contact do
       # contact.statuses.map(&:value).should == %w(ok linked)
     end
 
+    context 'as birthday' do
+      before do
+        @domain = Fabricate(:domain)
+      end
+
+      it 'should have related domain descriptions hash' do
+        contact = @domain.registrant
+        contact.related_domain_descriptions.should == { "#{@domain.name}" => [:registrant] }
+      end
+
+      it 'should have related domain descriptions hash' do
+        contact = @domain.contacts.first
+        contact.related_domain_descriptions.should == { "#{@domain.name}" => [:admin] }
+      end
+    end
+
     context 'as birthday' do
       before :all do
         @contact.ident_type = 'birthday'