No place without app type

app/controllers/places_controller.rb

@@ -14,7 +14,6 @@ def new
   def create
     @place = Place.new(place_params)
     authorize @place
-
     if @place.save
       create_agenda(@place)
       redirect_to places_path

app/jobs/prepare_place_transfert_job.rb

@@ -85,16 +85,22 @@ def transfert_appointment_notifications(old_place, new_place, slot)
   end
 
   def modify_notif_content(old_place, new_place, notification)
-    attributes = %i[name adress display_phone contact_email preparation_link]
+    attributes = %i[name adress contact_email preparation_link]
 
     modified_content = notification.content
-
     attributes.each do |attr|
       if old_place.send(attr) && new_place.send(attr)
         modified_content = modified_content.gsub(old_place.send(attr), new_place.send(attr))
       end
     end
 
+    if old_place.display_phone && new_place.display_phone
+      modified_content = modified_content.gsub(old_place.display_phone(spaces: false),
+                                               new_place.display_phone(spaces: false))
+      modified_content = modified_content.gsub(old_place.display_phone(spaces: true),
+                                               new_place.display_phone(spaces: false))
+    end
+
     modified_content
   end
 end

app/models/place.rb

@@ -8,6 +8,7 @@ class Place < ApplicationRecord
   validates :contact_email, presence: true, if: :email_main_contact_method?
   validates :contact_email, format: { with: URI::MailTo::EMAIL_REGEXP }, allow_blank: true
   validates :preparation_link, presence: true
+  validate :appointment_types?
 
   has_many :agendas, dependent: :destroy
   has_many :place_appointment_types, dependent: :destroy
@@ -71,4 +72,12 @@ def transfert_out_date
   def transfert_in_date
     transfert_in&.date
   end
+
+  private
+
+  def appointment_types?
+    return true unless appointment_types.empty?
+
+    errors.add(:appointment_types, I18n.t('activerecord.errors.models.place.attributes.appointment_types.empty'))
+  end
 end

app/views/places/edit.html.erb

@@ -2,6 +2,12 @@
 <div class='edit-place-wrapper'>
   <div class='edit-place-form-container'>
     <%= simple_form_for @place, html: { class: 'edit-place-form' } do |f| %>
+      <% invalid = @place.errors.include?(:appointment_types) %>
+      <% if invalid %>
+        <div class="fr-alert fr-alert--warning fr-my-2w">
+            <h3 class="fr-alert__title"><%=  @place.errors.full_messages_for(:appointment_types).first %></h3>
+        </div>
+      <% end %>
       <div class='edit-place-data-container'>
         <%= f.input :name %>
         <%= f.input :adress %>

app/views/places/new.html.erb

@@ -1,5 +1,11 @@
 <h1 class='form-title'><%= t('new_place_title') %></h1>
 <%= simple_form_for @place, html: { class: 'basic-form' } do |f| %>
+  <% invalid = @place.errors.include?(:appointment_types) %>
+  <% if invalid %>
+    <div class="fr-alert fr-alert--warning fr-my-2w">
+      <h3 class="fr-alert__title"><%=  @place.errors.messages_for(:appointment_types).first %></h3>
+    </div>
+  <% end %>
   <%= f.input :name %>
   <%= f.input :adress %>
   <%= f.input :phone %>

config/locales/fr.yml

@@ -68,6 +68,7 @@ fr:
         name: Nom
         phone: Téléphone
         preparation_link: Lien d'information sur le lieu
+        appointment_types: Types de convocation
       slot:
         appointment_type: Type de convocation
         available: Disponible
@@ -177,6 +178,8 @@ fr:
               blank: Adresse manquante
             name:
               blank: Nom manquant
+            appointment_types:
+              empty: Veuillez sélectionner au moins un type de convocation
         place_transfert:
           attributes:
             date:

spec/factories/places.rb

@@ -4,5 +4,6 @@
     adress { 'fake adress' }
     phone { '0606060606' }
     organization
+    appointment_types { [create(:appointment_type)] }
   end
 end

spec/features/places_spec.rb

@@ -22,13 +22,17 @@
 
   describe 'creation', logged_in_as: 'local_admin' do
     it 'creates a place and its first agenda' do
+      create(:appointment_type, name: 'Premier contact Spip')
+
       visit new_place_path
 
       fill_in 'Nom', with: 'Spip 72'
       fill_in 'Adresse', with: '93 rue des charmes 72200 La Flèche'
       fill_in 'Téléphone', with: '0606060606'
       fill_in "Lien d'information sur le lieu", with: 'https://mon-suivi-justice.beta.gouv.fr/preparer_spip92'
-
+      within first('.edit-place-appointment-types-container') do
+        check 'Premier contact Spip'
+      end
       expect { click_button 'Enregistrer' }.to change { Place.count }.by(1)
                                            .and change { Agenda.count }.by(1)
     end
@@ -72,14 +76,14 @@
     end
 
     it 'allows to select appointment_types' do
-      place = create(:place, name: 'Spip du 91', organization: @user.organization)
       apt_type = create(:appointment_type, name: 'Premier contact Spip')
-
+      place = build(:place, name: 'Spip du 91', organization: @user.organization, appointment_types: [])
+      place.save(validate: false)
       expect(place.appointment_types).to be_empty
 
       visit edit_place_path(place)
       within first('.edit-place-appointment-types-container') do
-        check 'Premier contact Spip'
+        check apt_type.name
       end
 
       click_button('Enregistrer')

spec/jobs/prepare_place_transfert_job_spec.rb

@@ -28,10 +28,12 @@
                      preparation_link: 'https://mon-suivi-justice.beta.gouv.fr/preparer_spip_loiret_montargis')
     end
     let(:new_place) do
-      create(:place, organization:, name: 'Nouveau SPIP 45 - Montargis',
-                     adress: '8 av Adolphe Cochery, 45200 Montargis',
-                     phone: '0238858585', contact_email: '[email protected]',
-                     preparation_link: 'https://mon-suivi-justice.beta.gouv.fr/preparer_new_spip_loiret_montargis')
+      np = build(:place, organization:, name: 'Nouveau SPIP 45 - Montargis',
+                         adress: '8 av Adolphe Cochery, 45200 Montargis',
+                         phone: '0238858585', contact_email: '[email protected]',
+                         preparation_link: 'https://mon-suivi-justice.beta.gouv.fr/preparer_new_spip_loiret_montargis')
+      np.save(validate: false)
+      np
     end
     let(:place_transfert) do
       create(:place_transfert, old_place:, new_place:, date: next_valid_day(date: Date.tomorrow))
@@ -80,7 +82,7 @@
     end
 
     it('should copy old place appointment types to new place') do
-      expect(new_place.appointment_types).to match_array(old_place.appointment_types)
+      expect(new_place.reload.appointment_types).to match_array(old_place.appointment_types)
     end
 
     it('should copy old place slot types to new place') do

spec/models/place_spec.rb

@@ -27,6 +27,10 @@
       expect(build(:place, contact_email: 'youpi')).not_to be_valid
     end
 
+    it 'denies without appointment_types' do
+      expect(build(:place, appointment_types: [])).not_to be_valid
+    end
+
     it 'is valid with the factory\'s attributes' do
       expect(build(:place)).to be_valid
     end

spec/support/notification_helpers.rb

@@ -1,8 +1,8 @@
 module NotificationHelpers
-  def convocation_template(place)
+  def convocation_template(place, spaces: false)
     "Votre convocation au SPIP a été modifiée. Vous êtes désormais convoqué au #{place.name} le 08/08/2023 à 09h45.
     Merci de venir avec une pièce d'identité au #{place.adress}.
-    En cas de problème, contactez votre conseiller référent ou le standard au #{place.display_phone}
+    En cas de problème, contactez votre conseiller référent ou le standard au #{place.display_phone(spaces:)}
     ou par mail #{place.contact_email}.
     Plus d'informations sur #{place.preparation_link}"
   end