Measurement type - Move to points and image table

.github/workflows/main.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, '3.10', 3.11, 3.12]
+        python-version: [3.9, '3.10', 3.11, 3.12, 3.13]
 
     services:
 

snowexsql/api.py

@@ -420,16 +420,6 @@ def _filter_campaign(cls, qry, value):
             Campaign.name == value
         )
 
-    @classmethod
-    def _filter_measurement_type(cls, qry, value):
-        return qry.join(
-            cls.MODEL.observation
-        ).join(
-            PointObservation.measurement_type
-        ).filter(
-            MeasurementType.name == value
-        )
-
     @classmethod
     def _filter_instrument(cls, qry, value):
         return qry.join(

snowexsql/tables/campaign_observation.py

@@ -5,12 +5,11 @@
 from .campaign import InCampaign
 from .doi import HasDOI
 from .instrument import HasInstrument
-from .measurement_type import HasMeasurementType
 from .observers import HasObserver
 
 
 class CampaignObservation(
-    Base, HasDOI, HasInstrument, HasMeasurementType, HasObserver, InCampaign
+    Base, HasDOI, HasInstrument, HasObserver, InCampaign
 ):
     """
     A campaign observation holds additional information for a point or image.

snowexsql/tables/image_data.py

@@ -3,9 +3,10 @@
 
 from .base import Base
 from .image_observation import HasImageObservation
+from .measurement_type import HasMeasurementType
 
 
-class ImageData(Base, HasImageObservation):
+class ImageData(Base, HasImageObservation, HasMeasurementType):
     """
     Class representing the images table. This table holds all images/rasters
     """

snowexsql/tables/point_data.py

@@ -2,11 +2,14 @@
 from sqlalchemy.ext.hybrid import hybrid_property
 
 from .base import Base
+from .measurement_type import HasMeasurementType
 from .point_observation import HasPointObservation
 from .single_location import SingleLocationData
 
 
-class PointData(Base, SingleLocationData, HasPointObservation):
+class PointData(
+    Base, SingleLocationData, HasPointObservation, HasMeasurementType
+):
     """
     Class representing the points table. This table holds all point data.
     Here a single data entry is a single coordinate pair with a single value

tests/api/test_point_measurements.py

@@ -39,7 +39,7 @@ def setup_method(self, point_data):
     def test_all_types(self):
         result = self.subject.all_types
         assert result == [
-            record.observation.measurement_type.name
+            record.measurement_type.name
             for record in self.db_data
         ]
 
@@ -124,7 +124,7 @@ def test_unknown_instrument(self):
     def test_date_and_measurement_type(self):
         result = self.subject.from_filter(
             date=self.db_data.datetime.date(),
-            type=self.db_data.observation.measurement_type.name,
+            type=self.db_data.measurement_type.name,
         )
         assert len(result) == 1
         assert result.loc[0].value == self.db_data.value

tests/factories/point_data.py

@@ -5,6 +5,7 @@
 
 from snowexsql.tables import PointData
 from .base_factory import BaseFactory
+from .measurement_type import MeasurementTypeFactory
 from .point_observation import PointObservationFactory
 
 
@@ -21,3 +22,4 @@ class Meta:
     elevation = 3148.2
 
     observation = factory.SubFactory(PointObservationFactory)
+    measurement_type = factory.SubFactory(MeasurementTypeFactory)

tests/factories/point_observation.py

@@ -7,7 +7,6 @@
 from .campaign import CampaignFactory
 from .doi import DOIFactory
 from .instrument import InstrumentFactory
-from .measurement_type import MeasurementTypeFactory
 from .observer import ObserverFactory
 
 
@@ -22,5 +21,4 @@ class Meta:
     campaign = factory.SubFactory(CampaignFactory)
     doi = factory.SubFactory(DOIFactory)
     instrument = factory.SubFactory(InstrumentFactory)
-    measurement_type = factory.SubFactory(MeasurementTypeFactory)
     observer = factory.SubFactory(ObserverFactory)

tests/tables/test_point_data.py

@@ -3,7 +3,7 @@
 import pytest
 from geoalchemy2 import WKBElement
 
-from snowexsql.tables import PointData
+from snowexsql.tables import PointData, MeasurementType
 
 
 @pytest.fixture
@@ -48,3 +48,8 @@ def test_elevation_attribute(self):
 
     def test_geom_attribute(self):
         assert isinstance(self.subject.geom, WKBElement)
+
+    def test_has_measurement_type(self):
+        assert self.subject.measurement_type is not None
+        assert isinstance(self.subject.measurement_type, MeasurementType)
+

tests/tables/test_point_observation.py

@@ -3,7 +3,7 @@
 import pytest
 
 from snowexsql.tables import (
-    Campaign, DOI, Instrument, MeasurementType, Observer, PointObservation
+    Campaign, DOI, Instrument, Observer, PointObservation
 )
 
 
@@ -41,10 +41,6 @@ def test_has_doi(self):
         assert self.subject.doi is not None
         assert isinstance(self.subject.doi, DOI)
 
-    def test_has_measurement_type(self):
-        assert self.subject.measurement_type is not None
-        assert isinstance(self.subject.measurement_type, MeasurementType)
-
     def test_has_instrument(self):
         assert self.subject.instrument is not None
         assert isinstance(self.subject.instrument, Instrument)