Skip to content

Commit

Permalink
db: Add has_legal_unit to statistical_unit
Browse files Browse the repository at this point in the history
  • Loading branch information
jhf committed Nov 14, 2024
1 parent d8952fa commit db962d5
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 12 deletions.
5 changes: 4 additions & 1 deletion migrations/0064_create_timeline_establishment.up.sql
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ CREATE VIEW public.timeline_establishment
, postal_country_id
, postal_country_iso_2
, invalid_codes
, has_legal_unit
, establishment_id
, legal_unit_id
, enterprise_id
Expand Down Expand Up @@ -101,6 +102,8 @@ CREATE VIEW public.timeline_establishment
--
, es.invalid_codes AS invalid_codes
--
, (es.legal_unit_id IS NOT NULL) AS has_legal_unit
--
, es.id AS establishment_id
, es.legal_unit_id AS legal_unit_id
, es.enterprise_id AS enterprise_id
Expand Down Expand Up @@ -171,4 +174,4 @@ CREATE VIEW public.timeline_establishment
) AS ds ON TRUE
--
ORDER BY t.unit_type, t.unit_id, t.valid_after
;
;
24 changes: 14 additions & 10 deletions migrations/0065_create_timeline_legal_unit.up.sql
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ CREATE VIEW public.timeline_legal_unit
, postal_country_id
, postal_country_iso_2
, invalid_codes
, has_legal_unit
, establishment_ids
, legal_unit_id
, enterprise_id
Expand Down Expand Up @@ -103,6 +104,8 @@ CREATE VIEW public.timeline_legal_unit
--
, lu.invalid_codes AS invalid_codes
--
, TRUE AS has_legal_unit
--
, lu.id AS legal_unit_id
, lu.enterprise_id AS enterprise_id
, COALESCE(public.get_jsonb_stats(NULL, lu.id, t.valid_after, t.valid_to), '{}'::JSONB) AS stats
Expand Down Expand Up @@ -172,7 +175,7 @@ CREATE VIEW public.timeline_legal_unit
OR COALESCE(ds.id = pol.data_source_id , FALSE)
OR COALESCE(ds.id = ANY(sfu.data_source_ids), FALSE)
) AS ds ON TRUE
), aggregation AS (
), establishment_aggregation AS (
SELECT tes.legal_unit_id
, basis.valid_after
, basis.valid_to
Expand Down Expand Up @@ -210,15 +213,15 @@ CREATE VIEW public.timeline_legal_unit
FROM (
SELECT unnest(basis.data_source_ids) AS id
UNION ALL
SELECT unnest(aggregation.data_source_ids) AS id
SELECT unnest(esa.data_source_ids) AS id
) AS ids
) AS data_source_ids
, (
SELECT array_agg(DISTINCT code)
FROM (
SELECT unnest(basis.data_source_codes) AS code
UNION ALL
SELECT unnest(aggregation.data_source_codes) AS code
SELECT unnest(esa.data_source_codes) AS code
) AS codes
) AS data_source_codes
, basis.legal_form_id
Expand All @@ -243,20 +246,21 @@ CREATE VIEW public.timeline_legal_unit
, basis.postal_country_id
, basis.postal_country_iso_2
, basis.invalid_codes
, COALESCE(aggregation.establishment_ids, ARRAY[]::INT[]) AS establishment_ids
, basis.has_legal_unit
, COALESCE(esa.establishment_ids, ARRAY[]::INT[]) AS establishment_ids
, basis.legal_unit_id
, basis.enterprise_id
-- Expose the stats for just this entry.
, basis.stats AS stats
-- Continue one more aggregation iteration adding the stats for this unit
-- to the aggregated stats for establishments, by using the internal
-- aggregation function for one more step.
, public.jsonb_stats_to_summary(COALESCE(aggregation.stats_summary,'{}'::JSONB), basis.stats) AS stats_summary
, public.jsonb_stats_to_summary(COALESCE(esa.stats_summary,'{}'::JSONB), basis.stats) AS stats_summary
FROM basis
LEFT OUTER JOIN aggregation
ON basis.legal_unit_id = aggregation.legal_unit_id
AND basis.valid_after = aggregation.valid_after
AND basis.valid_to = aggregation.valid_to
LEFT OUTER JOIN establishment_aggregation AS esa
ON basis.legal_unit_id = esa.legal_unit_id
AND basis.valid_after = esa.valid_after
AND basis.valid_to = esa.valid_to
--
ORDER BY unit_type, unit_id, valid_after
;
;
9 changes: 8 additions & 1 deletion migrations/0066_create_timeline_enterprise.up.sql
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ CREATE VIEW public.timeline_enterprise
, postal_country_id
, postal_country_iso_2
, invalid_codes
, has_legal_unit
, establishment_ids
, legal_unit_ids
, enterprise_id
Expand Down Expand Up @@ -104,6 +105,8 @@ CREATE VIEW public.timeline_enterprise
--
, plu.invalid_codes AS invalid_codes
--
, TRUE AS has_legal_unit
--
, en.id AS enterprise_id
, plu.id AS primary_legal_unit_id
FROM public.timesegments AS t
Expand Down Expand Up @@ -229,6 +232,8 @@ CREATE VIEW public.timeline_enterprise
--
, pes.invalid_codes AS invalid_codes
--
, FALSE AS has_legal_unit
--
, en.id AS enterprise_id
, pes.id AS primary_establishment_id
FROM public.timesegments AS t
Expand Down Expand Up @@ -381,6 +386,7 @@ CREATE VIEW public.timeline_enterprise
, basis.postal_country_id
, basis.postal_country_iso_2
, basis.invalid_codes
, basis.has_legal_unit
, COALESCE(lua.establishment_ids, ARRAY[]::INT[]) AS establishment_ids
, COALESCE(lua.legal_unit_ids, ARRAY[]::INT[]) AS legal_unit_ids
, basis.enterprise_id
Expand Down Expand Up @@ -449,6 +455,7 @@ CREATE VIEW public.timeline_enterprise
, basis.postal_country_id
, basis.postal_country_iso_2
, basis.invalid_codes
, basis.has_legal_unit
, COALESCE(esa.establishment_ids, ARRAY[]::INT[]) AS establishment_ids
, ARRAY[]::INT[] AS legal_unit_ids
, basis.enterprise_id
Expand All @@ -467,4 +474,4 @@ CREATE VIEW public.timeline_enterprise
)
SELECT * FROM basis_with_both
ORDER BY unit_type, unit_id, valid_after
;
;
5 changes: 5 additions & 0 deletions migrations/0069_create_statistical_unit_def.up.sql
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ CREATE VIEW public.statistical_unit_def
, postal_country_id
, postal_country_iso_2
, invalid_codes
, has_legal_unit
, establishment_ids
, legal_unit_ids
, enterprise_ids
Expand Down Expand Up @@ -98,6 +99,7 @@ CREATE VIEW public.statistical_unit_def
, postal_country_id
, postal_country_iso_2
, invalid_codes
, has_legal_unit
, NULL::INT[] AS establishment_ids
, NULL::INT[] AS legal_unit_ids
, NULL::INT[] AS enterprise_ids
Expand Down Expand Up @@ -148,6 +150,7 @@ CREATE VIEW public.statistical_unit_def
, postal_country_id
, postal_country_iso_2
, invalid_codes
, has_legal_unit
, COALESCE(establishment_ids,ARRAY[]::INT[]) AS establishment_ids
, NULL::INT[] AS legal_unit_ids
, NULL::INT[] AS enterprise_ids
Expand Down Expand Up @@ -202,6 +205,7 @@ CREATE VIEW public.statistical_unit_def
, postal_country_id
, postal_country_iso_2
, invalid_codes
, has_legal_unit
, COALESCE(establishment_ids,ARRAY[]::INT[]) AS establishment_ids
, COALESCE(legal_unit_ids,ARRAY[]::INT[]) AS legal_unit_ids
, NULL::INT[] AS enterprise_ids
Expand Down Expand Up @@ -254,6 +258,7 @@ CREATE VIEW public.statistical_unit_def
, data.postal_country_id
, data.postal_country_iso_2
, data.invalid_codes
, data.has_legal_unit
, data.establishment_ids
, data.legal_unit_ids
, data.enterprise_ids
Expand Down

0 comments on commit db962d5

Please sign in to comment.