Skip to content

Commit

Permalink
pdc -> statique
Browse files Browse the repository at this point in the history
  • Loading branch information
@loco-philippe
loco-philippe committed Feb 1, 2025
1 parent 3747c3b commit 9cda4eb
Show file tree
Hide file tree
Showing 23 changed files with 51 additions and 39 deletions.
11 changes: 6 additions & 5 deletions src/prefect/indicators/infrastructure/i1.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@

NUM_POCS_FOR_LEVEL_QUERY_TEMPLATE = """
SELECT
COUNT(DISTINCT PointDeCharge.id_pdc_itinerance) AS value,
COUNT(DISTINCT id_pdc_itinerance) AS value,
$level_id AS level_id
FROM
PointDeCharge
INNER JOIN Station ON PointDeCharge.station_id = Station.id
INNER JOIN Localisation ON Station.localisation_id = Localisation.id
INNER JOIN City ON Localisation.code_insee_commune = City.code
Statique
--PointDeCharge
--INNER JOIN Station ON PointDeCharge.station_id = Station.id
--INNER JOIN Localisation ON Station.localisation_id = Localisation.id
INNER JOIN City ON code_insee_commune = City.code
$join_extras
WHERE $level_id IN ($indexes)
GROUP BY $level_id
Expand Down
7 changes: 4 additions & 3 deletions src/prefect/indicators/infrastructure/i7.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@
sum(puissance_nominale) AS value,
$level_id AS level_id
FROM
pointdecharge
INNER JOIN station ON station.id = station_id
INNER JOIN localisation ON localisation_id = localisation.id
statique
--pointdecharge
--INNER JOIN station ON station.id = station_id
--INNER JOIN localisation ON localisation_id = localisation.id
INNER JOIN city on city.code = code_insee_commune
$join_extras
WHERE $level_id IN ($indexes)
Expand Down
16 changes: 9 additions & 7 deletions src/prefect/indicators/infrastructure/t1.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@
WITH
$power_range
SELECT
COUNT(DISTINCT PointDeCharge.id_pdc_itinerance) AS value,
COUNT(DISTINCT id_pdc_itinerance) AS value,
category,
$level_id AS level_id
FROM
PointDeCharge
INNER JOIN Station ON PointDeCharge.station_id = Station.id
INNER JOIN Localisation ON Station.localisation_id = Localisation.id
INNER JOIN City ON Localisation.code_insee_commune = City.code
Statique
--PointDeCharge
--INNER JOIN Station ON PointDeCharge.station_id = Station.id
--INNER JOIN Localisation ON Station.localisation_id = Localisation.id
INNER JOIN City ON code_insee_commune = City.code
LEFT JOIN puissance ON puissance_nominale::numeric <@ category
$join_extras
WHERE
Expand All @@ -50,10 +51,11 @@
WITH
$power_range
SELECT
COUNT(DISTINCT PointDeCharge.id_pdc_itinerance) AS value,
COUNT(DISTINCT id_pdc_itinerance) AS value,
category
FROM
PointDeCharge
Statique
--PointDeCharge
LEFT JOIN puissance ON puissance_nominale::numeric <@ category
GROUP BY
category
Expand Down
7 changes: 4 additions & 3 deletions src/prefect/indicators/usage/u10.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@
$level_id AS level_id
FROM
SESSION
INNER JOIN PointDeCharge ON point_de_charge_id = PointDeCharge.id
LEFT JOIN station ON station_id = station.id
LEFT JOIN localisation ON localisation_id = localisation.id
INNER JOIN statique ON point_de_charge_id = pdc_id
--INNER JOIN PointDeCharge ON point_de_charge_id = PointDeCharge.id
--LEFT JOIN station ON station_id = station.id
--LEFT JOIN localisation ON localisation_id = localisation.id
LEFT JOIN city ON city.code = code_insee_commune
$join_extras
WHERE
Expand Down
8 changes: 4 additions & 4 deletions src/prefect/indicators/usage/u11.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@
$level_id AS level_id
FROM
SESSION
INNER JOIN PointDeCharge ON point_de_charge_id = PointDeCharge.id
LEFT JOIN Station ON station_id = Station.id
LEFT JOIN Localisation ON localisation_id = Localisation.id
INNER JOIN statique ON point_de_charge_id = pdc_id
--INNER JOIN PointDeCharge ON point_de_charge_id = PointDeCharge.id
--LEFT JOIN Station ON station_id = Station.id
--LEFT JOIN Localisation ON localisation_id = Localisation.id
LEFT JOIN City ON City.code = code_insee_commune
$join_extras
WHERE
Expand All @@ -54,7 +55,6 @@
AND Session.end - Session.start > '3 minutes'::interval
"""


@task(task_run_name="values-for-target-{level:02d}")
def get_values_for_targets(
connection: Connection,
Expand Down
7 changes: 4 additions & 3 deletions src/prefect/indicators/usage/u12.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@
$level_id AS level_id
FROM
statusf
INNER JOIN PointDeCharge ON statusf.point_de_charge_id = PointDeCharge.id
LEFT JOIN Station ON station_id = Station.id
LEFT JOIN Localisation ON localisation_id = Localisation.id
INNER JOIN statique ON point_de_charge_id = pdc_id
--INNER JOIN PointDeCharge ON statusf.point_de_charge_id = PointDeCharge.id
--LEFT JOIN Station ON station_id = Station.id
--LEFT JOIN Localisation ON localisation_id = Localisation.id
LEFT JOIN City ON City.code = code_insee_commune
LEFT JOIN puissance ON puissance_nominale::numeric <@ category
$join_extras
Expand Down
7 changes: 4 additions & 3 deletions src/prefect/indicators/usage/u13.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@
$level_id AS level_id
FROM
statusf
INNER JOIN PointDeCharge ON statusf.point_de_charge_id = PointDeCharge.id
LEFT JOIN Station ON station_id = Station.id
LEFT JOIN Localisation ON localisation_id = Localisation.id
INNER JOIN statique ON point_de_charge_id = pdc_id
--INNER JOIN PointDeCharge ON statusf.point_de_charge_id = PointDeCharge.id
--LEFT JOIN Station ON station_id = Station.id
--LEFT JOIN Localisation ON localisation_id = Localisation.id
LEFT JOIN City ON City.code = code_insee_commune
$join_extras
WHERE
Expand Down
7 changes: 4 additions & 3 deletions src/prefect/indicators/usage/u5.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@
$level_id AS level_id
FROM
Session
INNER JOIN PointDeCharge ON point_de_charge_id = PointDeCharge.id
LEFT JOIN Station ON station_id = Station.id
LEFT JOIN Localisation ON localisation_id = Localisation.id
INNER JOIN statique ON point_de_charge_id = pdc_id
--INNER JOIN PointDeCharge ON point_de_charge_id = PointDeCharge.id
--LEFT JOIN Station ON station_id = Station.id
--LEFT JOIN Localisation ON localisation_id = Localisation.id
LEFT JOIN City ON City.code = code_insee_commune
$join_extras
WHERE
Expand Down
10 changes: 6 additions & 4 deletions src/prefect/indicators/usage/u6.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@
$level_id AS level_id
FROM
sessionf
INNER JOIN PointDeCharge ON sessionf.point_de_charge_id = PointDeCharge.id
LEFT JOIN Station ON station_id = Station.id
LEFT JOIN Localisation ON localisation_id = Localisation.id
INNER JOIN statique ON point_de_charge_id = pdc_id
--INNER JOIN PointDeCharge ON sessionf.point_de_charge_id = PointDeCharge.id
--LEFT JOIN Station ON station_id = Station.id
--LEFT JOIN Localisation ON localisation_id = Localisation.id
LEFT JOIN City ON City.code = code_insee_commune
LEFT JOIN puissance ON puissance_nominale::numeric <@ category
$join_extras
Expand Down Expand Up @@ -77,7 +78,8 @@
category
FROM
sessionf
INNER JOIN PointDeCharge ON sessionf.point_de_charge_id = PointDeCharge.id
INNER JOIN statique ON point_de_charge_id = pdc_id
--INNER JOIN PointDeCharge ON sessionf.point_de_charge_id = PointDeCharge.id
LEFT JOIN puissance ON puissance_nominale::numeric <@ category
GROUP BY
category
Expand Down
10 changes: 6 additions & 4 deletions src/prefect/indicators/usage/u9.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@
$level_id AS level_id
FROM
sessionf
INNER JOIN PointDeCharge ON sessionf.point_de_charge_id = PointDeCharge.id
LEFT JOIN Station ON station_id = Station.id
LEFT JOIN Localisation ON localisation_id = Localisation.id
INNER JOIN statique ON point_de_charge_id = pdc_id
--INNER JOIN PointDeCharge ON sessionf.point_de_charge_id = PointDeCharge.id
--LEFT JOIN Station ON station_id = Station.id
--LEFT JOIN Localisation ON localisation_id = Localisation.id
LEFT JOIN City ON City.code = code_insee_commune
LEFT JOIN puissance ON puissance_nominale::numeric <@ category
$join_extras
Expand Down Expand Up @@ -77,7 +78,8 @@
category
FROM
sessionf
INNER JOIN PointDeCharge ON sessionf.point_de_charge_id = PointDeCharge.id
INNER JOIN statique ON point_de_charge_id = pdc_id
--INNER JOIN PointDeCharge ON sessionf.point_de_charge_id = PointDeCharge.id
LEFT JOIN puissance ON puissance_nominale::numeric <@ category
GROUP BY
category
Expand Down
0 src/prefect/tests/infrastructure/_test_i1.py → src/prefect/tests/infrastructure/test_i1.py
View file
File renamed without changes.
0 src/prefect/tests/infrastructure/_test_i4.py → src/prefect/tests/infrastructure/test_i4.py
View file
File renamed without changes.
0 src/prefect/tests/infrastructure/_test_i7.py → src/prefect/tests/infrastructure/test_i7.py
View file
File renamed without changes.
0 src/prefect/tests/infrastructure/_test_t1.py → src/prefect/tests/infrastructure/test_t1.py
View file
File renamed without changes.
0 ...efect/tests/infrastructure/_test_utils.py → ...refect/tests/infrastructure/test_utils.py
View file
File renamed without changes.
0 src/prefect/tests/usage/_test_c1.py → src/prefect/tests/usage/test_c1.py
View file
File renamed without changes.
0 src/prefect/tests/usage/_test_u10.py → src/prefect/tests/usage/test_u10.py
View file
File renamed without changes.
0 src/prefect/tests/usage/_test_u11.py → src/prefect/tests/usage/test_u11.py
View file
File renamed without changes.
0 src/prefect/tests/usage/_test_u12.py → src/prefect/tests/usage/test_u12.py
View file
File renamed without changes.
0 src/prefect/tests/usage/_test_u13.py → src/prefect/tests/usage/test_u13.py
View file
File renamed without changes.
0 src/prefect/tests/usage/_test_u5.py → src/prefect/tests/usage/test_u5.py
View file
File renamed without changes.
0 src/prefect/tests/usage/_test_u6.py → src/prefect/tests/usage/test_u6.py
View file
File renamed without changes.
0 src/prefect/tests/usage/_test_u9.py → src/prefect/tests/usage/test_u9.py
View file
File renamed without changes.

0 comments on commit 9cda4eb

Please sign in to comment.