diff --git a/app/jobs/cron/datagouv/account_by_month_job.rb b/app/jobs/cron/datagouv/account_by_month_job.rb index 97f46bf5c..187da87db 100644 --- a/app/jobs/cron/datagouv/account_by_month_job.rb +++ b/app/jobs/cron/datagouv/account_by_month_job.rb @@ -14,6 +14,6 @@ class Cron::Datagouv::AccountByMonthJob < Cron::CronJob end def data - User.where(created_at: 1.month.ago.beginning_of_month..1.month.ago.end_of_month).count + User.where(created_at: 1.month.ago.all_month).count end end diff --git a/app/jobs/cron/datagouv/administrateur_by_month_job.rb b/app/jobs/cron/datagouv/administrateur_by_month_job.rb index 346b9cf90..1391df690 100644 --- a/app/jobs/cron/datagouv/administrateur_by_month_job.rb +++ b/app/jobs/cron/datagouv/administrateur_by_month_job.rb @@ -14,6 +14,6 @@ class Cron::Datagouv::AdministrateurByMonthJob < Cron::CronJob end def data - Administrateur.where(created_at: 1.month.ago.beginning_of_month..1.month.ago.end_of_month).count + Administrateur.where(created_at: 1.month.ago.all_month).count end end diff --git a/app/jobs/cron/datagouv/file_by_month_job.rb b/app/jobs/cron/datagouv/file_by_month_job.rb index 723a48af3..f4375679a 100644 --- a/app/jobs/cron/datagouv/file_by_month_job.rb +++ b/app/jobs/cron/datagouv/file_by_month_job.rb @@ -14,6 +14,6 @@ class Cron::Datagouv::FileByMonthJob < Cron::CronJob end def data - Dossier.where(created_at: 1.month.ago.beginning_of_month..1.month.ago.end_of_month).count + Dossier.where(created_at: 1.month.ago.all_month).count end end diff --git a/app/jobs/cron/datagouv/file_depose_by_month_job.rb b/app/jobs/cron/datagouv/file_depose_by_month_job.rb index 1083d6c28..c7fd2d828 100644 --- a/app/jobs/cron/datagouv/file_depose_by_month_job.rb +++ b/app/jobs/cron/datagouv/file_depose_by_month_job.rb @@ -14,6 +14,6 @@ class Cron::Datagouv::FileDeposeByMonthJob < Cron::CronJob end def data - Dossier.where(depose_at: 1.month.ago.beginning_of_month..1.month.ago.end_of_month).count + Dossier.where(depose_at: 1.month.ago.all_month).count end end diff --git a/app/jobs/cron/datagouv/instructeur_by_month_job.rb b/app/jobs/cron/datagouv/instructeur_by_month_job.rb index cfa232c23..ea98d5dd9 100644 --- a/app/jobs/cron/datagouv/instructeur_by_month_job.rb +++ b/app/jobs/cron/datagouv/instructeur_by_month_job.rb @@ -14,6 +14,6 @@ class Cron::Datagouv::InstructeurByMonthJob < Cron::CronJob end def data - Instructeur.where(created_at: 1.month.ago.beginning_of_month..1.month.ago.end_of_month).count + Instructeur.where(created_at: 1.month.ago.all_month).count end end diff --git a/app/jobs/cron/datagouv/instructeur_connected_by_month_job.rb b/app/jobs/cron/datagouv/instructeur_connected_by_month_job.rb index 8691cb3fe..cbcb20e08 100644 --- a/app/jobs/cron/datagouv/instructeur_connected_by_month_job.rb +++ b/app/jobs/cron/datagouv/instructeur_connected_by_month_job.rb @@ -14,6 +14,6 @@ class Cron::Datagouv::InstructeurConnectedByMonthJob < Cron::CronJob end def data - Instructeur.joins(:user).where(user: { last_sign_in_at: 1.month.ago.beginning_of_month..1.month.ago.end_of_month }).count + Instructeur.joins(:user).where(user: { last_sign_in_at: 1.month.ago.all_month }).count end end diff --git a/app/jobs/cron/datagouv/procedure_by_month_job.rb b/app/jobs/cron/datagouv/procedure_by_month_job.rb index 1327c4ff3..2a044cf43 100644 --- a/app/jobs/cron/datagouv/procedure_by_month_job.rb +++ b/app/jobs/cron/datagouv/procedure_by_month_job.rb @@ -14,6 +14,6 @@ class Cron::Datagouv::ProcedureByMonthJob < Cron::CronJob end def data - Procedure.where(created_at: 1.month.ago.beginning_of_month..1.month.ago.end_of_month).count + Procedure.where(created_at: 1.month.ago.all_month).count end end diff --git a/app/jobs/cron/datagouv/procedure_closed_by_month_job.rb b/app/jobs/cron/datagouv/procedure_closed_by_month_job.rb index 11ab5dbd8..315aa7474 100644 --- a/app/jobs/cron/datagouv/procedure_closed_by_month_job.rb +++ b/app/jobs/cron/datagouv/procedure_closed_by_month_job.rb @@ -14,6 +14,6 @@ class Cron::Datagouv::ProcedureClosedByMonthJob < Cron::CronJob end def data - Procedure.where(closed_at: 1.month.ago.beginning_of_month..1.month.ago.end_of_month).count + Procedure.where(closed_at: 1.month.ago.all_month).count end end diff --git a/app/jobs/cron/datagouv/procedure_deleted_by_month_job.rb b/app/jobs/cron/datagouv/procedure_deleted_by_month_job.rb index d259a4af7..17bdccf63 100644 --- a/app/jobs/cron/datagouv/procedure_deleted_by_month_job.rb +++ b/app/jobs/cron/datagouv/procedure_deleted_by_month_job.rb @@ -14,6 +14,6 @@ class Cron::Datagouv::ProcedureDeletedByMonthJob < Cron::CronJob end def data - Procedure.where(hidden_at: 1.month.ago.beginning_of_month..1.month.ago.end_of_month).count + Procedure.where(hidden_at: 1.month.ago.all_month).count end end diff --git a/app/jobs/cron/datagouv/user_connected_with_france_connect_by_month_job.rb b/app/jobs/cron/datagouv/user_connected_with_france_connect_by_month_job.rb index 58d6ffdab..a4aea9be7 100644 --- a/app/jobs/cron/datagouv/user_connected_with_france_connect_by_month_job.rb +++ b/app/jobs/cron/datagouv/user_connected_with_france_connect_by_month_job.rb @@ -14,6 +14,6 @@ class Cron::Datagouv::UserConnectedWithFranceConnectByMonthJob < Cron::CronJob end def data - User.where(created_at: 1.month.ago.beginning_of_month..1.month.ago.end_of_month, loged_in_with_france_connect: "particulier").count + User.where(created_at: 1.month.ago.all_month, loged_in_with_france_connect: "particulier").count end end diff --git a/app/models/dossier.rb b/app/models/dossier.rb index 5b6ddc16d..82489e54a 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -281,7 +281,7 @@ class Dossier < ApplicationRecord scope :processed_in_month, -> (date) do date = date.to_datetime state_termine - .where(processed_at: date.beginning_of_month..date.end_of_month) + .where(processed_at: date.all_month) end scope :ordered_for_export, -> { order(depose_at: 'asc') diff --git a/app/models/instructeur.rb b/app/models/instructeur.rb index ac2ee5a29..c6685b57c 100644 --- a/app/models/instructeur.rb +++ b/app/models/instructeur.rb @@ -208,7 +208,7 @@ class Instructeur < ApplicationRecord h = { nb_en_construction: groupe.dossiers.visible_by_administration.en_construction.count, nb_en_instruction: groupe.dossiers.visible_by_administration.en_instruction.count, - nb_accepted: Traitement.where(dossier: groupe.dossiers.accepte, processed_at: Time.zone.yesterday.beginning_of_day..Time.zone.yesterday.end_of_day).count, + nb_accepted: Traitement.where(dossier: groupe.dossiers.accepte, processed_at: Time.zone.yesterday.all_day).count, nb_notification: nb_notification }