DGNum/demarches-normaliennes
11
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #284 from sgmap/rename_and_refactor_dossier_with_notification_for

Browse source 
[Fix #276] Rename and refactor dossier_with_notification_for
This commit is contained in:
gregoirenovel 2017-05-12 16:30:40 +02:00 committed by GitHub
commit c65b1e232a
4 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/facades/dossiers_list_facades.rb
View file

@ -30,7 +30,7 @@ class DossiersListFacades
end
def gestionnaire_procedures_name_and_id_list
@current_devise_profil.procedures.order('libelle ASC').inject([]) { |acc, procedure| acc.push({id: procedure.id, libelle: procedure.libelle, unread_notifications: @current_devise_profil.dossier_with_notification_for(procedure)}) }
@current_devise_profil.procedures.order('libelle ASC').inject([]) { |acc, procedure| acc.push({id: procedure.id, libelle: procedure.libelle, unread_notifications: @current_devise_profil.dossiers_with_notifications_count_for_procedure(procedure)}) }
end
def unread_notifications

13
app/models/gestionnaire.rb
View file

@ -86,16 +86,9 @@ class Gestionnaire < ActiveRecord::Base
0
end
def dossier_with_notification_for procedure
procedure_ids = dossiers_follow.pluck(:procedure_id)
if procedure_ids.include?(procedure.id)
return dossiers_follow.where(procedure_id: procedure.id)
.inject(0) do |acc, dossier|
acc += ((dossier.notifications.where(already_read: false).count) > 0 ? 1 : 0)
end
end
0
def dossiers_with_notifications_count_for_procedure(procedure)
followed_dossiers_id = dossiers_follow.where(procedure: procedure).pluck(:id)
Notification.unread.where(dossier_id: followed_dossiers_id).select(:dossier_id).distinct(:dossier_id).count
end
def dossiers_with_notifications_count

2
app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
View file

@ -28,7 +28,7 @@
- if total_new > 0
.badge.progress-bar-success{ title: 'Nouveaux dossiers' }
= total_new
- unread_notif_count = current_gestionnaire.dossier_with_notification_for(procedure)
- unread_notif_count = current_gestionnaire.dossiers_with_notifications_count_for_procedure(procedure)
- if unread_notif_count > 0
.badge.progress-bar-warning{ title: 'Notifications' }
= unread_notif_count

22
spec/models/gestionnaire_spec.rb
View file

@ -313,8 +313,8 @@ describe Gestionnaire, type: :model do
end
end
describe '#dossier_with_notification_for' do
subject { gestionnaire.dossier_with_notification_for(procedure) }
describe '#dossiers_with_notifications_count_for_procedure' do
subject { gestionnaire.dossiers_with_notifications_count_for_procedure(procedure) }
context 'without notifications' do
it { is_expected.to eq(0) }
@ -336,12 +336,28 @@ describe Gestionnaire, type: :model do
it { is_expected.to eq(0) }
end
context 'with 2 notification' do
context 'with 2 notifications' do
let!(:notification){ create(:notification, already_read: false, dossier: dossier) }
let!(:notification2){ create(:notification, already_read: false, dossier: dossier) }
it { is_expected.to eq(1) }
end
context 'with another dossier' do
let!(:dossier2){create(:dossier, procedure: procedure, state: 'received')}
let!(:follow2){ create(:follow, dossier: dossier2, gestionnaire: gestionnaire) }
context 'and some notifications' do
let!(:notification){ create(:notification, already_read: false, dossier: dossier) }
let!(:notification2){ create(:notification, already_read: false, dossier: dossier) }
let!(:notification3){ create(:notification, already_read: false, dossier: dossier) }
let!(:notification4){ create(:notification, already_read: false, dossier: dossier2) }
let!(:notification5){ create(:notification, already_read: false, dossier: dossier2) }
it { is_expected.to eq(2) }
end
end
end
end
end