adapt test for coordinates

Author: danielfeismann

tests/db/weather/test_weather_models.py

@@ -1,42 +1,56 @@
 from datetime import datetime
 
 import pytest
-from sqlmodel import select
+from sqlalchemy import text, select
 
-from pypsdm.db.weather.models import Coordinate, WeatherValue
+from pypsdm.db.weather.models import WeatherValue, Coordinate
 
 
 @pytest.mark.docker_required
 def test_create_coordinate(db_session):
     """Test creating a coordinate."""
     coordinates = []
-    coord_from_str = Coordinate(id=1, coordinate="POINT(8.645 50.123)")
-    coord_from_xy = Coordinate.from_xy(2, 7.46, 51.5)
-    coordinates: list[Coordinate] = coordinates + [coord_from_str, coord_from_xy]
-    db_session.add_all(coordinates)
+    coord_1 = Coordinate.from_xy(1, 8.645, 50.123)
+    coord_2 = Coordinate.from_xy(2, 7.46, 51.5)
+    coordinates: list[Coordinate] = coordinates + [coord_1, coord_2]
+
+    query = text("""
+        INSERT INTO coordinate (id, coordinate)
+        VALUES (:id, ST_SetSRID(ST_GeomFromWKB(:geom), 4326));
+    """)
+
+    for coord in coordinates:
+        db_session.execute(query, {'id': coord.id, 'geom': coord.coordinate})
     db_session.commit()
 
-    first_coordinate = db_session.get(Coordinate, 1)
+    first_coordinate: Coordinate = db_session.get(Coordinate, 1)
     second_coordinate = db_session.get(Coordinate, 2)
     missing_coordinate = db_session.get(Coordinate, 3)
+
     assert first_coordinate is not None
     assert first_coordinate.longitude == 8.645
     assert first_coordinate.latitude == 50.123
+
     assert second_coordinate is not None
     assert second_coordinate.x == 7.46
     assert second_coordinate.y == 51.5
+
     assert missing_coordinate is None
 
 
 @pytest.mark.docker_required
 def test_create_weather_value(db_session):
     """Test creating a weather value."""
-    # First create a coordinate
     berlin = Coordinate.from_xy(id=1, x=13.405, y=52.52)
-    db_session.add(berlin)
+
+    query = text("""
+        INSERT INTO coordinate (id, coordinate)
+        VALUES (:id, ST_SetSRID(ST_GeomFromWKB(:geom), 4326));
+    """)
+
+    db_session.execute(query, {'id': berlin.id, 'geom': berlin.coordinate})
     db_session.commit()
 
-    # Create a weather value
     now = datetime.now()
     weather = WeatherValue(
         time=now,
@@ -50,7 +64,6 @@ def test_create_weather_value(db_session):
     db_session.add(weather)
     db_session.commit()
 
-    # Retrieve it
     retrieved = db_session.exec(
         select(WeatherValue).where(
             WeatherValue.time == now, WeatherValue.coordinate_id == berlin.id