Merge branch 'master' into fix/data-export

Author: gary-van-woerkens

packages/api/egapro/constants.py

@@ -12,10 +12,10 @@
 }
 
 # Always let the comment for us to switch between enabled read current year or not
-PUBLIC_YEARS = YEARS
-# PUBLIC_YEARS = [2018, 2019, 2020, 2021, 2022]
-PUBLIC_YEARS_REPEQ = YEARS_REPEQ
-# PUBLIC_YEARS_REPEQ = [2021, 2022]
+# PUBLIC_YEARS = YEARS
+PUBLIC_YEARS = [2018, 2019, 2020, 2021, 2022, 2023, 2024]
+# PUBLIC_YEARS_REPEQ = YEARS_REPEQ
+PUBLIC_YEARS_REPEQ = [2021, 2022, 2023, 2024]
 
 REGIONS = {
     "01": "Guadeloupe",

packages/api/egapro/csv_representation.py

@@ -8,7 +8,7 @@
 from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE
 from progressist import ProgressBar
 
-from egapro import config, constants, db
+from egapro import config, constants, db, sql
 from egapro.utils import flatten, remove_one_year
 
 
@@ -55,7 +55,10 @@ async def as_xlsx(max_rows=None, debug=False):
     :debug:             Turn on debug to be able to read the generated Workbook
     """
     print("Reading from DB")
-    records = await db.representation_equilibree.all()
+    records = await db.representation_equilibree.fetch(
+        f"SELECT * FROM {db.representation_equilibree.table_name} WHERE year = ANY($1::int[])",
+        constants.PUBLIC_YEARS_REPEQ
+    )
     print("Flattening JSON")
     if max_rows:
         records = records[:max_rows]

packages/api/egapro/exporter.py

@@ -36,7 +36,7 @@ async def public_data(path: Path):
     :path:          chemin vers le fichier d'export
     """
 
-    records = await db.declaration.fetch(sql.public_declarations)
+    records = await db.declaration.fetch(sql.public_declarations, constants.PUBLIC_YEARS)
     writer = csv.writer(path, delimiter=";")
     writer.writerow(
         [
@@ -141,7 +141,7 @@ async def public_data_as_xlsx(debug=False):
     """
 
     print("Reading from DB")
-    records = await db.declaration.fetch(sql.public_declarations)
+    records = await db.declaration.fetch(sql.public_declarations, constants.PUBLIC_YEARS)
     workbook = Workbook(write_only=not debug)
     sheet: Union[WriteOnlyWorksheet, Worksheet] = workbook.create_sheet()
     sheet.title = "Données publiques Index Egapro"

packages/api/egapro/sql/public_declarations.sql

@@ -1 +1 @@
-SELECT data FROM declaration JOIN search ON declaration.siren=search.siren AND declaration.year=search.year
+SELECT data FROM declaration JOIN search ON declaration.siren=search.siren AND declaration.year=search.year WHERE declaration.year = ANY($1::int[])