Merge pull request #106 from NatLibFi/EKIRJASTO-22-include-audience-i…

…n-report Ekirjasto 22 include audience in report
NatLibFi · Oct 30, 2024 · d8ab44f · d8ab44f
2 parents 82057e8 + ef6fc98
commit d8ab44f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/api/local_analytics_exporter.py b/api/local_analytics_exporter.py
@@ -89,6 +89,7 @@ def export_excel(self, _db, start, end, locations=None, library=None):
             "Sijainti",
             "Formaatti",
             "Kategoria(t)",
+            "Kohderyhmä",
             "Kieli",
             "Kustantaja/Julkaisija",
             "Kaikki lainat",
@@ -123,6 +124,8 @@ def export_excel(self, _db, start, end, locations=None, library=None):
                     row.get("medium", ""),
                     # Kategoria(t)
                     categories,
+                    # Kohderyhmä
+                    row.get("audience", ""),
                     # Kieli
                     row.get("language", ""),
                     # Kustantaja/Julkaisija
@@ -392,6 +395,7 @@ def analytics_query_loan_statistics(self, start, end, locations=None, library=No
                         [(Work.fiction == True, True)],
                         else_=False,
                     ).label("fiction"),
+                    Work.audience,
                     Work.id.label("work_id"),
                     Edition.publisher,
                     Edition.language,
@@ -516,6 +520,7 @@ def analytics_query_loan_statistics(self, start, end, locations=None, library=No
                 events.publisher,
                 events.language,
                 genres.label("genres"),
+                events.audience,
                 contributors.label("contributors"),
                 events.location,
                 events.library_name,

diff --git a/tests/api/finland/test_loan_excel_export.py b/tests/api/finland/test_loan_excel_export.py
@@ -30,6 +30,7 @@
         "publisher": "Standard Ebooks",
         "language": "eng",
         "genres": ["General Fiction"],
+        "audience": "adults",
         "contributors": ["Eliot, George (Author)", "Fake contributor (Author)"],
         "location": None,
         "library_name": "Open Access Library",
@@ -45,6 +46,7 @@
         "publisher": "Standard Ebooks",
         "language": "eng",
         "genres": ["Philosophy"],
+        "audience": "adults",
         "contributors": ["Russell, Bertrand (Author)"],
         "location": None,
         "library_name": "Open Access Library",
@@ -83,6 +85,7 @@ def test_export_excel(self):
             "Sijainti",
             "Formaatti",
             "Kategoria(t)",
+            "Kohderyhmä",
             "Kieli",
             "Kustantaja/Julkaisija",
             "Kaikki lainat",