e6cf07b810
Before this commit, the monthly dossiers count was serialized into the
Stat record using human-formatted dates, as:
```ruby
s.dossiers_in_the_last_4_months = {
"octobre 2021"=>409592,
"novembre 2021"=>497823,
"décembre 2021"=>38170,
"janvier 2022"=>0
}
```
Turns out the ordering of keys in a serialized hash is not guaranteed.
After a round-trip to the database, the keys will be wrongly sorted.
Instead we want to save raw Date objects, which will preserve the
ordering. The date formatting can be applied at display-time by the
controller.
Fix #6848
117 lines
5 KiB
Ruby
117 lines
5 KiB
Ruby
# == Schema Information
|
|
#
|
|
# Table name: stats
|
|
#
|
|
# id :bigint not null, primary key
|
|
# administrations_partenaires :bigint default(0)
|
|
# dossiers_brouillon :bigint default(0)
|
|
# dossiers_cumulative :jsonb not null
|
|
# dossiers_depose_avant_30_jours :bigint default(0)
|
|
# dossiers_deposes_entre_60_et_30_jours :bigint default(0)
|
|
# dossiers_en_construction :bigint default(0)
|
|
# dossiers_en_instruction :bigint default(0)
|
|
# dossiers_in_the_last_4_months :jsonb not null
|
|
# dossiers_not_brouillon :bigint default(0)
|
|
# dossiers_termines :bigint default(0)
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
#
|
|
class Stat < ApplicationRecord
|
|
class << self
|
|
def update_stats
|
|
states = sum_hashes(dossiers_states, deleted_dossiers_states)
|
|
stat = Stat.first || Stat.new
|
|
|
|
stat.update(
|
|
dossiers_en_construction: states['en_construction'],
|
|
dossiers_en_instruction: states['en_instruction'],
|
|
dossiers_brouillon: states['brouillon'],
|
|
dossiers_depose_avant_30_jours: states['dossiers_depose_avant_30_jours'],
|
|
dossiers_deposes_entre_60_et_30_jours: states['dossiers_deposes_entre_60_et_30_jours'],
|
|
dossiers_not_brouillon: states['not_brouillon'],
|
|
dossiers_termines: states['termines'],
|
|
dossiers_cumulative: cumulative_month_serie([
|
|
[Dossier.state_not_brouillon, :depose_at],
|
|
[DeletedDossier.where.not(state: :brouillon), :deleted_at]
|
|
]),
|
|
dossiers_in_the_last_4_months: last_four_months_serie([
|
|
[Dossier.state_not_brouillon, :depose_at],
|
|
[DeletedDossier.where.not(state: :brouillon), :deleted_at]
|
|
]),
|
|
administrations_partenaires: AdministrateursProcedure.joins(:procedure).merge(Procedure.publiees_ou_closes).select('distinct administrateur_id').count
|
|
)
|
|
end
|
|
|
|
private
|
|
|
|
def dossiers_states
|
|
sanitize_and_exec(Dossier, <<-EOF
|
|
SELECT
|
|
COUNT(*) FILTER ( WHERE state != 'brouillon' ) AS "not_brouillon",
|
|
COUNT(*) FILTER ( WHERE state != 'brouillon' and depose_at BETWEEN :one_month_ago AND :now ) AS "dossiers_depose_avant_30_jours",
|
|
COUNT(*) FILTER ( WHERE state != 'brouillon' and depose_at BETWEEN :two_months_ago AND :one_month_ago ) AS "dossiers_deposes_entre_60_et_30_jours",
|
|
COUNT(*) FILTER ( WHERE state = 'brouillon' ) AS "brouillon",
|
|
COUNT(*) FILTER ( WHERE state = 'en_construction' ) AS "en_construction",
|
|
COUNT(*) FILTER ( WHERE state = 'en_instruction' ) AS "en_instruction",
|
|
COUNT(*) FILTER ( WHERE state in ('accepte', 'refuse', 'sans_suite') ) AS "termines"
|
|
FROM dossiers
|
|
WHERE hidden_at IS NULL
|
|
EOF
|
|
)
|
|
end
|
|
|
|
def deleted_dossiers_states
|
|
sanitize_and_exec(DeletedDossier, <<-EOF
|
|
SELECT
|
|
COUNT(*) FILTER ( WHERE state != 'brouillon' ) AS "not_brouillon",
|
|
COUNT(*) FILTER ( WHERE state != 'brouillon' and deleted_at BETWEEN :one_month_ago AND :now ) AS "dossiers_depose_avant_30_jours",
|
|
COUNT(*) FILTER ( WHERE state != 'brouillon' and deleted_at BETWEEN :two_months_ago AND :one_month_ago ) AS "dossiers_deposes_entre_60_et_30_jours",
|
|
COUNT(*) FILTER ( WHERE state = 'brouillon' ) AS "brouillon",
|
|
COUNT(*) FILTER ( WHERE state = 'en_construction' ) AS "en_construction",
|
|
COUNT(*) FILTER ( WHERE state = 'en_instruction' ) AS "en_instruction",
|
|
COUNT(*) FILTER ( WHERE state in ('accepte', 'refuse', 'sans_suite') ) AS "termines"
|
|
FROM deleted_dossiers
|
|
EOF
|
|
)
|
|
end
|
|
|
|
def last_four_months_serie(associations_with_date_attribute)
|
|
timeseries = associations_with_date_attribute.map do |association, date_attribute|
|
|
association.group_by_month(date_attribute, last: 4, current: false).count
|
|
end
|
|
|
|
sum_hashes(*timeseries).sort.to_h
|
|
end
|
|
|
|
def cumulative_month_serie(associations_with_date_attribute)
|
|
timeseries = associations_with_date_attribute.map do |association, date_attribute|
|
|
association.group_by_month(date_attribute, current: false).count
|
|
end
|
|
|
|
cumulative_serie(sum_hashes(*timeseries))
|
|
end
|
|
|
|
def cumulative_serie(sums)
|
|
sum = 0
|
|
sums.keys.sort.index_with { |date| sum += sums[date] }
|
|
end
|
|
|
|
def sum_hashes(*hashes)
|
|
{}.merge(*hashes) { |_k, v1, v2| v1 + v2 }
|
|
end
|
|
|
|
def max_date
|
|
Time.zone.now.beginning_of_month - 1.second
|
|
end
|
|
|
|
def sanitize_and_exec(model, query)
|
|
sanitized_query = ActiveRecord::Base.sanitize_sql([
|
|
query,
|
|
now: Time.zone.now,
|
|
one_month_ago: 1.month.ago,
|
|
two_months_ago: 2.months.ago
|
|
])
|
|
model.connection.select_all(sanitized_query).first
|
|
end
|
|
end
|
|
end
|