diff --git a/toardb/stationmeta/fixtures/stationmeta_core.json b/toardb/stationmeta/fixtures/stationmeta_core.json index e4b23491d743d81c561f2248acb89d8a6e3d50e9..c819579fe02f1e61401362070c796af75d24bd18 100644 --- a/toardb/stationmeta/fixtures/stationmeta_core.json +++ b/toardb/stationmeta/fixtures/stationmeta_core.json @@ -10,7 +10,6 @@ "coordinate_validator_id": 1, "type_of_environment": 0, "type_of_area": 0, - "category": "", "timezone": "", "additional_metadata": {} }, @@ -25,7 +24,6 @@ "coordinate_validator_id": 1, "type_of_environment": 0, "type_of_area": 0, - "category": "", "timezone": "", "additional_metadata": {} }, @@ -40,7 +38,6 @@ "coordinate_validator_id": 1, "type_of_environment":0, "type_of_area":0, - "category":"", "timezone":"", "additional_metadata": {} } diff --git a/toardb/stationmeta/models_core.py b/toardb/stationmeta/models_core.py index c4d5420999aa618b64c7a19b04635ab08270dc7d..1f0b0eaa2ade3198b4b3e34eb4fb754cc38783dd 100644 --- a/toardb/stationmeta/models_core.py +++ b/toardb/stationmeta/models_core.py @@ -43,8 +43,6 @@ class StationmetaCore_WithoutCoords(Base): +------------------------------+--------------------------+-----------+----------+----------------------------------------------+ | type_of_area | integer | | not null | | +------------------------------+--------------------------+-----------+----------+----------------------------------------------+ - | category | character varying(128) | | not null | | - +------------------------------+--------------------------+-----------+----------+----------------------------------------------+ | timezone | character varying(64) | | not null | | +------------------------------+--------------------------+-----------+----------+----------------------------------------------+ | additional_metadata | jsonb | | not null | | diff --git a/toardb/stationmeta/pydantic_toar_testing.py b/toardb/stationmeta/pydantic_toar_testing.py index b20a1c4b998df1a77cf8c4f93665f6c0fe810eba..4585aa257366ecd1f3e81e0625e50cd7751090d2 100644 --- a/toardb/stationmeta/pydantic_toar_testing.py +++ b/toardb/stationmeta/pydantic_toar_testing.py @@ -30,7 +30,6 @@ class StationmetaCoreBase(BaseModel): coordinate_validation_date: dt.datetime type_of_environment: int type_of_area: int - category: str timezone: str additional_metadata: Json coordinate_validator_id: int @@ -60,7 +59,6 @@ external_data_toar = { "coordinate_validation_date":"2020-03-11T12:22:18.047974+01:00", "type_of_environment":0, "type_of_area":0, - "category":"", "timezone":"", "coordinate_validator_id": 1, "additional_metadata": {} diff --git a/toardb/stationmeta/stationmeta.py b/toardb/stationmeta/stationmeta.py index 0ad7251e9ae7e206146b9f0c8c1c320564ec0cf5..0c68dd9552ed206f394f4a94654e8d5527dc9a76 100644 --- a/toardb/stationmeta/stationmeta.py +++ b/toardb/stationmeta/stationmeta.py @@ -6,7 +6,6 @@ from typing import List from fastapi import APIRouter, Depends, HTTPException, Body from sqlalchemy.orm import Session, sessionmaker from . import crud, schemas -from sqlalchemy import create_engine from toardb.utils.database import get_db router = APIRouter() diff --git a/toardb/timeseries/fixtures/timeseries.json b/toardb/timeseries/fixtures/timeseries.json index a53585c580bef67e42618e3b34f664f30f3bad00..167f2dd40f607cbf4f02e68b5a4a7a5653a56859 100644 --- a/toardb/timeseries/fixtures/timeseries.json +++ b/toardb/timeseries/fixtures/timeseries.json @@ -9,7 +9,7 @@ "aggregation": 0, "data_start_date": "2003-09-07 15:30:00", "data_end_date": "2016-12-31 14:30:00", - "measurement_method": "UV absorption", + "measurement_method": 0, "sampling_height": 7, "additional_metadata": "{}", "date_added": "2020-05-15 15:30:00",