Skip to content

Commit

Permalink
Remove Rib deletion ability (#1370)
Browse files Browse the repository at this point in the history
  • Loading branch information
pskl authored Feb 4, 2025
1 parent e83f752 commit a25fd61
Show file tree
Hide file tree
Showing 16 changed files with 12 additions and 75 deletions.
10 changes: 1 addition & 9 deletions app/controllers/ribs_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@ class RibsController < ApplicationController # rubocop:disable Metrics/ClassLeng
before_action :set_classe, :set_bulk_rib_breadcrumbs, only: %i[missing bulk_create]
before_action :set_student, :check_establishment!, :set_rib_breadcrumbs, except: %i[missing bulk_create]
before_action :check_classes, only: :bulk_create
before_action :set_rib, only: %i[edit update destroy confirm_deletion]
before_action :set_rib, only: %i[edit update]

def new
@rib = Rib.new
end

def edit; end

def confirm_deletion; end

def create
@rib = @student.create_new_rib(rib_params)

Expand All @@ -44,12 +42,6 @@ def update
end
end

def destroy
@rib.destroy

redirect_to student_path(@student), notice: t("flash.ribs.destroyed", name: @student.full_name)
end

def missing
@ribs = @classe
.active_students
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/poll_payments_server_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class PollPaymentsServerJob < ApplicationJob
sidekiq_options retry: false

def perform
dir = ASP::Server.get_all_files!
dir = ASP::Server.fetch_all_files!

Dir.each_child(dir) do |filename|
next if filename == ".keep" # these are the Git-keep files of our local dev
Expand Down
1 change: 1 addition & 0 deletions app/models/pfmp_state_machine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,6 @@ class PfmpStateMachine

after_transition(to: :validated) do |pfmp|
PfmpManager.new(pfmp).create_new_payment_request!
Sync::StudentJob.perform_later(pfmp.schooling)
end
end
2 changes: 1 addition & 1 deletion app/services/asp/readers/payments_file_reader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def process! # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
rescue ActiveRecord::RecordNotFound => e
Sentry.capture_exception(
ReadingFileError.new(
"Payment file reading failed for asp_prestation_dossier_id: #{node.asp_prestation_dossier_id}" \
"Payment file reading failed for asp_prestation_dossier_id: #{node.asp_prestation_dossier_id} " \
"with message #{e.message}, Node contents: #{node.to_h}"
)
)
Expand Down
19 changes: 0 additions & 19 deletions app/views/ribs/confirm_deletion.html.haml

This file was deleted.

1 change: 0 additions & 1 deletion app/views/students/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@

.fr-btns-group.fr-btns-group--inline
%li= button_to "Modifier les coordonnées bancaires", edit_student_rib_path(@student, @student.rib(current_establishment)), class: 'fr-btn fr-btn--secondary', method: :get
%li= button_to "Supprimer les coordonnées bancaires", confirm_deletion_student_rib_path(@student, @student.rib(current_establishment)), class: 'fr-btn fr-btn--secondary', method: :get

= render partial: 'pfmps/pfmp_student_table', locals: { schoolings: @schoolings }
2 changes: 1 addition & 1 deletion config/initializers/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Aplypro
VERSION = "2.1.4"
VERSION = "2.1.5"
end
3 changes: 0 additions & 3 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,6 @@ fr:
edit: &edit_rib_title
title: "Modification de coordonnées bancaires pour %{name}"
breadcrumb: "Modification de coordonnées bancaires"
confirm_deletion:
title: "Suppression de coordonnées bancaires pour %{name}"
breadcrumb: "Suppression de coordonnées bancaires"
update: *edit_rib_title
missing: &missing_ribs_title Saisir des coordonnées bancaires
bulk_create: *missing_ribs_title
Expand Down
6 changes: 1 addition & 5 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@
end

resources :students, only: %i[show] do
resources :ribs, only: %i[new create destroy update edit] do
member do
get "confirm_deletion"
end
end
resources :ribs, only: %i[new create update edit]
end

resources :school_years, path: :year, only: [] do
Expand Down
9 changes: 0 additions & 9 deletions features/saisie_de_coordonnees_bancaires.feature
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ Fonctionnalité: Le personnel de direction saisit des coordonnées bancaires
Alors la page contient "Coordonnées bancaires mises à jour"
Et la page contient "Murie Carrie"

Scénario: Le personnel de direction peut supprimer un RIB
Sachant que je renseigne les coordonnées bancaires de l'élève "Marie Curie" de la classe "2NDEB"
Et que je clique sur "Supprimer les coordonnées bancaires"
Quand je clique sur "Confirmer la suppression"
Alors la page contient "Les coordonnées bancaires de Marie Curie ont bien été supprimées"
Et la page contient "Aucune coordonnée bancaire enregistrée pour le moment."

Scénario: Le personnel de direction peut relancer une demande de paiement en modifiant les coordonnées bancaires
Quand je consulte la classe de "2NDEB"
Et que je renseigne et valide une PFMP de 9 jours pour "Marie Curie"
Expand All @@ -54,13 +47,11 @@ Fonctionnalité: Le personnel de direction saisit des coordonnées bancaires
Et que je remplis "Titulaire du compte" avec "Luigi Curie"
Et que je clique sur "Modifier les coordonnées bancaires"
Alors la page contient "Modifier les coordonnées bancaires"
Et la page contient "Supprimer les coordonnées bancaires"

Scénario: Le personnel de direction ne peut pas accéder au RIB d'un élève s'il a été déclaré dans un autre établissement
Sachant que je renseigne les coordonnées bancaires de l'élève "Marie Curie" de la classe "2NDEB"
Et que l'élève "Marie Curie" a été transféré dans l'établissement "TEST" en classe "1EREB"
Alors la page contient "Modifier les coordonnées bancaires"
Et la page contient "Supprimer les coordonnées bancaires"
Quand je me déconnecte
Et que je suis un personnel MENJ directeur de l'établissement "TEST"
Sachant que je me connecte en tant que personnel MENJ
Expand Down
7 changes: 0 additions & 7 deletions features/step_definitions/rib_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@
)
end

Quand("je supprime les coordonnées bancaires") do
steps %(
Quand je clique sur "Supprimer les coordonnées bancaires"
Et que je clique sur "Confirmer la suppression"
)
end

Quand("je saisis en masse les coordonnées bancaires d'un tiers pour {string}") do |name|
within_fieldset(name) do
steps %(
Expand Down
2 changes: 1 addition & 1 deletion features/support/asp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class FakeServer
class << self
def upload_file!(io:, path:); end

def get_all_files! # rubocop:disable Naming/AccessorMethodName
def fetch_all_files!
TEMP_ASP_DIR
end

Expand Down
2 changes: 1 addition & 1 deletion lib/asp/entities/enregistrement.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def individu(xml)
rescue ActiveModel::ValidationError => e
Sentry.capture_exception(
ASP::Errors::PaymentFileValidationError.new(
"Payment file validation failed for p_r: #{payment_request.id}" \
"Payment file validation failed for p_r: #{payment_request.id} " \
"with message #{e.message}"
)
)
Expand Down
2 changes: 1 addition & 1 deletion lib/asp/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def upload_file!(io:, path:)
instance.connection.upload!(StringIO.new(io), File.join(DROP_FOLDER, path))
end

def get_all_files! # rubocop:disable Naming/AccessorMethodName
def fetch_all_files!
Dir
.mktmpdir("aplypro_asp")
.tap do |dir|
Expand Down
6 changes: 3 additions & 3 deletions spec/jobs/poll_payments_server_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@

allow(saver_double).to receive(:persist_file!)

allow(server_double).to receive(:get_all_files!).and_return(File.dirname(mock_file))
allow(server_double).to receive(:fetch_all_files!).and_return(File.dirname(mock_file))
allow(server_double).to receive(:remove_file!)
end

it "calls the get_all_files! ASP::Server method" do
it "calls the fetch_all_files! ASP::Server method" do
perform_enqueued_jobs(only: described_class) { described_class.perform_later }

expect(server_double).to have_received(:get_all_files!)
expect(server_double).to have_received(:fetch_all_files!)
end

it "feeds each file to an ASP::FileSaver" do
Expand Down
13 changes: 0 additions & 13 deletions spec/requests/ribs_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,6 @@
end
end

describe "DELETE /rib" do
context "when trying to delete a RIB from a student in another establishment" do
let(:other_student) { create(:schooling).student }
let(:other_rib) { create(:rib, student: other_student) }

it "doesnt delete the rib" do
delete student_rib_path(other_student, other_rib)

expect(Rib.find(other_rib.id)).not_to be_nil
end
end
end

describe "POST classes/:classe_id/ribs/bulk_create" do
let(:rib) { build(:rib, student: student, establishment: student.establishment) }
let(:rib_params) do
Expand Down

0 comments on commit a25fd61

Please sign in to comment.