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

Move followed_dossiers_with_notifications to a Dossier scope

Browse source 
Instead of instructeur.followed_dossiers_with_notifications, we can now write instructeur.followed_dossiers.with_notifications.

Yay composition!
This commit is contained in:
Nicolas Bouilleaud 2019-09-23 14:38:12 +02:00 • committed by simon lehericey
parent 780e157190
commit 03c950ea97
4 changed files with 51 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/models/instructeur.rb
View file

@ -113,13 +113,15 @@ class Instructeur < ApplicationRecord
procedure
.defaut_groupe_instructeur.dossiers
.send(scope) # :en_cours or :termine or :not_archived (or any other Dossier scope)
.merge(followed_dossiers_with_notifications)
.merge(followed_dossiers)
.with_notifications
end
def procedures_with_notifications(scope)
dossiers = Dossier
.send(scope) # :en_cours or :termine (or any other Dossier scope)
.merge(followed_dossiers_with_notifications)
.merge(followed_dossiers)
.with_notifications
Procedure
.where(id: dossiers.joins(:groupe_instructeur)
@ -128,29 +130,6 @@ class Instructeur < ApplicationRecord
.distinct
end
def followed_dossiers_with_notifications
# Relations passed to #or must be “structurally compatible”, i.e. query the same tables.
joined_dossiers = self.followed_dossiers
.left_outer_joins(:champs, :champs_private, :avis, :commentaires)
updated_demandes = joined_dossiers
.where('champs.updated_at > follows.demande_seen_at')
# We join `:champs` twice, the second time with `has_many :champs_privates`. ActiveRecord generates the SQL: 'LEFT OUTER JOIN "champs" "champs_privates_dossiers" ON …'. We can then use this `champs_privates_dossiers` alias to disambiguate the table in this WHERE clause.
updated_annotations = joined_dossiers
.where('champs_privates_dossiers.updated_at > follows.annotations_privees_seen_at')
updated_avis = joined_dossiers
.where('avis.updated_at > follows.avis_seen_at')
updated_messagerie = joined_dossiers
.where('commentaires.updated_at > follows.messagerie_seen_at')
.where.not(commentaires: { email: OLD_CONTACT_EMAIL })
.where.not(commentaires: { email: CONTACT_EMAIL })
updated_demandes.or(updated_annotations).or(updated_avis).or(updated_messagerie)
end
def mark_tab_as_seen(dossier, tab)
attributes = {}
attributes["#{tab}_seen_at"] = Time.zone.now