update Findspot schema

ebl/fragmentarium/application/archaeology_schemas.py

@@ -36,6 +36,11 @@ def create_excavation_plan(self, data, **kwargs) -> ExcavationPlan:
 
 
 class FindspotSchema(Schema):
+    site = fields.Function(
+        lambda findspot: getattr(findspot.site, "long_name", None),
+        lambda value: ExcavationSite.from_name(value),
+        allow_none=True,
+    )
     area = fields.String()
     building = fields.String()
     building_type = NameEnumField(BuildingType, data_key="buildingType")
@@ -44,14 +49,15 @@ class FindspotSchema(Schema):
     plans = fields.Nested(ExcavationPlanSchema, many=True, load_default=tuple())
     room = fields.String()
     context = fields.String()
-    primary_context = fields.Boolean(data_key="primaryContext")
+    primary_context = fields.Boolean(
+        data_key="primaryContext",
+        allow_none=True,
+    )
     notes = fields.String()
-    references = fields.Nested(ReferenceSchema, many=True, load_default=tuple())
 
     @post_load
     def create_findspot(self, data, **kwargs) -> Findspot:
         data["plans"] = tuple(data["plans"])
-        data["references"] = tuple(data["references"])
         return Findspot(**data)
 
 

ebl/fragmentarium/domain/findspot.py

@@ -3,6 +3,7 @@
 from enum import Enum, auto
 from ebl.bibliography.domain.reference import Reference
 from ebl.fragmentarium.domain.iso_date import DateRange
+from ebl.corpus.domain.provenance import Provenance as ExcavationSite
 
 
 class BuildingType(Enum):
@@ -22,6 +23,7 @@ class ExcavationPlan:
 
 @attr.s(auto_attribs=True, frozen=True)
 class Findspot:
+    site: Optional[ExcavationSite] = None
     area: str = ""
     building: str = ""
     building_type: Optional[BuildingType] = None
@@ -32,4 +34,3 @@ class Findspot:
     context: str = ""
     primary_context: Optional[bool] = None
     notes: str = ""
-    references: Sequence[Reference] = tuple()