Add map URL and contacts and stats

app/lib/api.py

@@ -17,6 +17,10 @@ class GetAPI(BaseAPI):
     results_per_page: int = 20
     params: dict = {}
 
+    def __init__(self):
+        super().__init__()
+        self.params = {}
+
     def add_parameter(self, key: str, value: str | int) -> None:
         self.params[key] = value
 

app/records/routes.py

@@ -1,6 +1,10 @@
 from app.records import router
 from app.schemas import Filter
-from app.sources.rosetta import RosettaRecordDetails, RosettaRecordsSearch
+from app.sources.rosetta import (
+    RosettaRecordDetails,
+    RosettaRecordsSearch,
+    RosettaRecordsSearchStats,
+)
 
 from .schemas import Record, RecordArchive, RecordCreator, RecordSearchResults
 

app/records/schemas/search.py

@@ -19,3 +19,4 @@ class RecordSearchResults(APISearchResponse):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
     results: list[RecordSearchResult] = []
+    results_stats: dict = {}

app/sources/rosetta/__init__.py

@@ -1 +1,5 @@
-from .api import RosettaRecordDetails, RosettaRecordsSearch
+from .api import (
+    RosettaRecordDetails,
+    RosettaRecordsSearch,
+    RosettaRecordsSearchStats,
+)

app/sources/rosetta/api.py

@@ -9,6 +9,7 @@
     RecordSearchResults,
 )
 from config import Config
+from pydash import objects
 
 from .lib import RosettaResponseParser, RosettaSourceParser
 
@@ -34,9 +35,15 @@ def get_result(
         self.add_parameter("from", offset)
         url = self.build_url()
         raw_results = self.execute(url)
-        return self.parse_results(raw_results, page, url)
+        results = self.parse_results(raw_results, page, url)
+        stats_api = RosettaRecordsSearchStats(self.params["q"])
+        results_stats = stats_api.get_result()
+        results.results_stats = results_stats
+        return results.toJSON() if results.page_in_range() else {}
 
-    def parse_results(self, raw_results, page, source_url) -> dict:
+    def parse_results(
+        self, raw_results, page, source_url
+    ) -> RecordSearchResults:
         response = RecordSearchResults()
         response.source_url = source_url
         for r in raw_results["metadata"]:
@@ -69,7 +76,32 @@ def parse_results(self, raw_results, page, source_url) -> dict:
         )
         response.results_per_page = self.results_per_page
         response.page = page
-        return response.toJSON() if response.page_in_range() else {}
+        return response
+
+
+class RosettaRecordsSearchStats(RosettaRecords):
+    def __init__(self, query_string):
+        super().__init__()
+        self.api_path = "/search"
+        self.add_parameter("q", query_string)
+
+    def get_result(self) -> dict:
+        stats = {
+            "tna": None,
+            "digitised": None,
+            "nonTna": None,
+            "creator": None,
+            "archive": None,
+        }
+        for group in stats:
+            self.add_parameter("filter", f"group:({group})")
+            url = self.build_url()
+            print(url)
+            raw_results = self.execute(url)
+            print(url)
+            results_count = objects.get(raw_results, "stats.total")
+            stats[group] = results_count
+        return stats
 
 
 class RosettaRecordDetails(RosettaRecords):

app/sources/rosetta/lib/response_parser.py

@@ -340,11 +340,18 @@ def contact_info(self) -> dict:
                 ),
                 None,
             ):
+                ephemera = (
+                    ephemera.replace("mapURL", "mapurl")
+                    .replace("jobTitle", "jobtitle")
+                    .replace("firstName", "firstname")
+                    .replace("lastName", "lastname")
+                )
                 document = PyQuery(ephemera)
                 return {
                     "address_line_1": document("addressline1")
                     .text()
-                    .replace("<br /><br />", ", "),
+                    .replace("<br /><br />", ", ")
+                    or None,
                     "town": document("addresstown").text() or None,
                     "postcode": document("postcode").text() or None,
                     "country": document("addresscountry").text() or None,
@@ -353,6 +360,15 @@ def contact_info(self) -> dict:
                     "phone": document("telephone").text() or None,
                     "fax": document("fax").text() or None,
                     "email": document("email").text() or None,
+                    "contacts": [
+                        {
+                            "first_name": contact.find("firstname").text
+                            or None,
+                            "last_name": contact.find("lastname").text or None,
+                            "job_title": contact.find("jobtitle").text or None,
+                        }
+                        for contact in document("contact")
+                    ],
                 }
         return {}