Organisation submitter is set to the contact if empty

app/models/orga.rb

@@ -35,21 +35,20 @@ class Orga < ActiveRecord::Base
   scope :geo, -> { where 'latitude is not null and longitude is not null' }
 
   before_validation do
-    unless submitter.blank?
+    # Populate submitter using contact info if absent
+    self.submitter ||= contact
     self.secret ||= SecureRandom.urlsafe_base64(32)[0...32]
-    end
     self.submission_time ||= Time.zone.now
   end
 
   after_create do
-    send_secret unless submitter.blank?
+    send_secret
     # Send email to moderators when an new orga is received
     ModerationorgaMailer.create(self).deliver_now!
   end
 
   after_update do
-    unless submitter.blank?
+    send_secret if secret_changed? || submitter_changed?
-      send_secret if secret_changed?
 
     if moderated_changed?
       OrgaMailer.accept(self).deliver_now!
@@ -61,7 +60,6 @@ class Orga < ActiveRecord::Base
       ModerationorgaMailer.update(self).deliver_now!
     end
   end
-  end
 
   before_destroy do
     OrgaMailer.destroy(self).deliver_now! unless submitter.blank?

test/models/orga_test.rb

@@ -20,17 +20,6 @@ class OrgaTest < ActiveSupport::TestCase
         tags: 'hello world'
       )
     end
-
-    assert_difference 'ActionMailer::Base.deliveries.size', 1 do
-      Orga.create!(
-        kind: Kind.first,
-        name: 'Tested organisation',
-        url: 'http://example.com',
-        region: Region.first,
-        contact: 'contact@example.com',
-        tags: 'hello world'
-      )
-    end
   end
 
   test 'set and send secret' do