Bugfixes (#1132)

betagouv · Oct 7, 2024 · dc8e5cc · dc8e5cc
1 parent ce2beee
commit dc8e5cc
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/app/models/asp/payment_request.rb b/app/models/asp/payment_request.rb
@@ -62,6 +62,11 @@ def to_consider
       end
     end
 
+    # XXX: Some records dont have a rib attached (yet)
+    def rib_with_fallback
+      rib || student.rib(pfmp.establishment)
+    end
+
     def mark_ready!
       transition_to!(:ready)
     rescue ASP::Errors::IncompletePaymentRequestError

diff --git a/app/models/asp/payment_request_validator.rb b/app/models/asp/payment_request_validator.rb
@@ -99,7 +99,7 @@ def student
     end
 
     def rib
-      @rib ||= payment_request.rib || student.rib
+      @rib ||= payment_request.rib_with_fallback
     end
 
     def pfmp

diff --git a/app/models/pfmp_state_machine.rb b/app/models/pfmp_state_machine.rb
@@ -25,7 +25,7 @@ class PfmpStateMachine
   end
 
   guard_transition(to: :rectified) do |pfmp|
-    pfmp.latest_payment_request.in_state?(:paid)
+    pfmp.latest_payment_request&.in_state?(:paid)
   end
 
   after_transition(to: :rectified) do |pfmp|

diff --git a/app/services/asp/mappers/coord_paie_mapper.rb b/app/services/asp/mappers/coord_paie_mapper.rb
@@ -17,7 +17,7 @@ class CoordPaieMapper
       attr_reader :rib, :iban
 
       def initialize(payment_request)
-        @rib = payment_request.rib || payment_request.student.rib
+        @rib = payment_request.rib_with_fallback
         @iban = Bank::IBAN.new(rib.iban)
       end
 

diff --git a/app/views/asp/schoolings/_schooling.html.haml b/app/views/asp/schoolings/_schooling.html.haml
@@ -65,22 +65,23 @@
   %table
     %caption.fr-h2 Coordonnées bancaires
     %tbody
+      - rib = @schooling.student.rib(@schooling.establishment)
       - if @schooling.student.rib.blank?
         %tr
           %td Pas de coordonnées bancaires renseignées
       - else
         %tr
           %td Nom du RIB
-          %td= @schooling.student.rib.name
+          %td= rib.name
         %tr
           %td IBAN
-          %td= @schooling.student.rib.iban
+          %td= rib.iban
         %tr
           %td BIC
-          %td= @schooling.student.rib.bic
+          %td= rib.bic
         %tr
           %td RIB appartient à l'élève ?
-          %td= @schooling.student.rib.personal? ? "Oui" : "Non"
+          %td= rib.personal? ? "Oui" : "Non"
 
 %h2 Demandes de paiements
 - if @pfmps.blank?

diff --git a/app/views/pfmps/confirm_rectification.html.haml b/app/views/pfmps/confirm_rectification.html.haml
@@ -38,7 +38,7 @@
                     %td= number_to_currency(last_paid_request.pfmp.amount, unit: "€", format: "%n %u")
                   %tr
                     %th{scope: "row"} IBAN
-                    %td= last_paid_request.rib&.iban || @student.rib(current_establishment).iban
+                    %td= last_paid_request.rib_with_fallback&.iban
                 - else
                   %tr
                     %td{colspan: 2} Aucun paiement effectué

diff --git a/app/views/ribs/confirm_deletion.html.haml b/app/views/ribs/confirm_deletion.html.haml
@@ -2,16 +2,17 @@
   = dsfr_alert(type: :warning, title: "La suppression des coordonnées bancaires est irréversible")
 
 .fr-col-md-6.fr-mt-3w
+  - rib = @student.rib(current_establishment)
   %ul
     %li
       Titulaire :
-      %span= @student.rib.name
+      %span= rib.name
     %li
       IBAN :
-      %code= @student.rib.iban
+      %code= rib.iban
     %li
       BIC :
-      %code= @student.rib.bic
+      %code= rib.bic
 
   .fr-btns-group.fr-btns-group--inline.fr-mt-3w
     = link_to "Annuler", student_path(@student), class: 'fr-btn fr-btn--secondary'