👽️ Envoi l'audio de la consigne au client

app/controllers/api/questionnaires_controller.rb

@@ -45,6 +45,7 @@ def includes_association(type)
       default_question_includes = [
         { transcription_intitule: :audio_attachment },
         { transcription_modalite_reponse: :audio_attachment },
+        { transcription_consigne: :audio_attachment },
         :illustration_attachment
       ]
       default_question_includes.push(association_to_include).flatten

app/models/question.rb

@@ -58,18 +58,23 @@ def supprime_attachment
   end
 
   def json_audio_fields
-    return {} if sans_audios?
-    return { 'audio_url' => transcription_intitule.audio_url } if transcription_intitule&.complete?
-    if modalite_complete_sans_audio_intitule?
-      return { 'audio_url' => transcription_modalite_reponse.audio_url }
+    json = { 'consigne_audio' => transcription_consigne&.audio_url }
+    json['audio_url'] = audio_url
+    unless transcription_intitule&.complete?
+      json['intitule_audio'] =
+        transcription_intitule&.audio_url
     end
-
-    { 'audio_url' => transcription_modalite_reponse&.audio_url,
-      'intitule_audio' => transcription_intitule&.audio_url }
+    json
   end
 
   private
 
+  def audio_url
+    return transcription_intitule.audio_url if transcription_intitule&.complete?
+
+    transcription_modalite_reponse&.audio_url
+  end
+
   def reject_transcriptions(attributes)
     attributes['audio'].blank? && attributes['ecrit'].blank? if new_record?
   end
@@ -83,12 +88,4 @@ def supprime_transcription
   def supprime_illustration?
     illustration.attached? && supprimer_illustration == '1'
   end
-
-  def sans_audios?
-    transcription_intitule&.audio_url.blank? && transcription_modalite_reponse&.audio_url.blank?
-  end
-
-  def modalite_complete_sans_audio_intitule?
-    transcription_intitule&.audio_url.blank? && transcription_modalite_reponse&.complete?
-  end
 end

spec/models/question_clic_dans_image_spec.rb

@@ -32,7 +32,7 @@
       json = question_clic_dans_image.as_json
       expect(json.keys)
         .to match_array(%w[description id intitule audio_url nom_technique type illustration
-                           modalite_reponse zone_cliquable image_au_clic])
+                           modalite_reponse zone_cliquable image_au_clic consigne_audio])
       expect(json['type']).to eql('clic-dans-image')
       expect(json['intitule']).to eql('Mon Intitulé')
       expect(json['illustration']).to eql(Rails.application.routes.url_helpers.url_for(

spec/models/question_glisser_deposer_spec.rb

@@ -29,7 +29,8 @@
     it 'serialise les champs' do
       expect(json.keys).to match_array(%w[id intitule audio_url nom_technique
                                           description illustration modalite_reponse type
-                                          reponsesNonClassees zone_depot_url])
+                                          reponsesNonClassees zone_depot_url consigne_audio
+                                          intitule_audio])
       expect(json['type']).to eql('glisser-deposer')
       expect(json['modalite_reponse']).to eql(modalite.ecrit)
       expect(json['illustration']).to eql(Rails.application.routes.url_helpers.url_for(

spec/models/question_qcm_spec.rb

@@ -26,7 +26,7 @@
       json = question_qcm.as_json
       expect(json.keys)
         .to match_array(%w[choix description id intitule audio_url nom_technique type metacompetence
-                           type_qcm illustration modalite_reponse])
+                           type_qcm illustration modalite_reponse consigne_audio])
       expect(json['type']).to eql('qcm')
       expect(json['intitule']).to eql('Mon Intitulé')
       expect(json['illustration']).to eql(Rails.application.routes.url_helpers.url_for(

spec/models/question_saisie_spec.rb

@@ -31,7 +31,7 @@
     it 'serialise les champs' do
       expect(json.keys).to match_array(%w[id intitule audio_url nom_technique suffix_reponse
                                           description illustration modalite_reponse type sous_type
-                                          placeholder reponse])
+                                          placeholder reponse consigne_audio])
       expect(json['type']).to eql('saisie')
       expect(json['sous_type']).to eql('redaction')
       expect(json['placeholder']).to eql('écrivez ici')

spec/models/question_spec.rb

@@ -52,11 +52,8 @@
 
   describe '#json_audio_fields' do
     let(:question) { create :question }
-
-    context "quand la question n'a pas de transcriptions audios" do
-      it 'ne retourne rien' do
-        expect(question.json_audio_fields).to be_empty
-      end
+    let!(:transcription_consigne) do
+      create :transcription, question_id: question.id, categorie: :consigne
     end
 
     context 'quand la question a des transcriptions audios' do
@@ -69,8 +66,8 @@
 
         it "retourne l'url de l'audio de l'intitulé dans le champ audio_url" do
           expect(question.transcription_intitule.complete?).to be true
-          expect(question.json_audio_fields).to eq(
-            { 'audio_url' => question.transcription_intitule.audio_url }
+          expect(question.json_audio_fields['audio_url']).to eq(
+            question.transcription_intitule.audio_url
           )
         end
       end
@@ -99,8 +96,8 @@
 
         it "retourne l'url de l'audio de la modalité de réponse dans le champ intitule_audio" do
           expect(question.transcription_modalite_reponse.complete?).to be true
-          expect(question.json_audio_fields).to eq(
-            { 'audio_url' => question.transcription_modalite_reponse.audio_url }
+          expect(question.json_audio_fields['audio_url']).to eq(
+            question.transcription_modalite_reponse.audio_url
           )
         end
       end
@@ -123,6 +120,15 @@
           expect(fields['intitule_audio']).to eq(question.transcription_intitule.audio_url)
         end
       end
+
+      it "retourne l'audio de la consigne" do
+        question.transcription_consigne.audio.attach(
+          io: Rails.root.join('spec/support/alcoolique.mp3').open, filename: 'alcoolique.mp3'
+        )
+        expect(question.json_audio_fields['consigne_audio']).to eq(
+          question.transcription_consigne.audio_url
+        )
+      end
     end
   end
 end