add back findspot needed for query_by_museum_number

ElectronicBabylonianLiterature · Nov 2, 2023 · 7474d9d · 7474d9d
1 parent 22769e5
commit 7474d9d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/ebl/fragmentarium/application/archaeology_schemas.py b/ebl/fragmentarium/application/archaeology_schemas.py
@@ -78,6 +78,9 @@ class ArchaeologySchema(Schema):
         DateWithNotesSchema, data_key="excavationDate", many=True, load_default=tuple()
     )
     findspot_id = fields.Integer(allow_none=True, default=None, data_key="findspotId")
+    findspot = fields.Nested(
+        FindspotSchema, allow_none=True, default=None, data_key="findspot"
+    )
 
     @post_load
     def create_archaeology(self, data, **kwargs) -> Archaeology:

diff --git a/ebl/fragmentarium/domain/archaeology.py b/ebl/fragmentarium/domain/archaeology.py
@@ -3,6 +3,7 @@
 from ebl.fragmentarium.domain.iso_date import DateWithNotes
 from ebl.transliteration.domain.museum_number import MuseumNumber as ExcavationNumber
 from ebl.corpus.domain.provenance import Provenance as ExcavationSite
+from ebl.fragmentarium.domain.findspot import Findspot
 
 
 @attr.s(auto_attribs=True, frozen=True)
@@ -12,3 +13,4 @@ class Archaeology:
     regular_excavation: bool = True
     excavation_date: Sequence[DateWithNotes] = tuple()
     findspot_id: Optional[int] = None
+    findspot: Optional[Findspot] = None
diff --git a/ebl/fragmentarium/infrastructure/queries.py b/ebl/fragmentarium/infrastructure/queries.py
@@ -329,7 +329,7 @@ def join_findspots() -> List[dict]:
         {
             "$lookup": {
                 "from": FINDSPOTS_COLLECTION,
-                "localField": "archaeology.findspot",
+                "localField": "archaeology.findspotId",
                 "foreignField": "_id",
                 "as": "findspots",
             }