From 6a9888ea15e29ed5415fc744b0a20d573653d9e4 Mon Sep 17 00:00:00 2001
From: schroeder5 <s.schroeder@fz-juelich.de>
Date: Tue, 30 Jun 2020 18:13:34 +0200
Subject: [PATCH] before next crash: upload changes
---
toardb/stationmeta/fixtures/stationmeta_core.json | 3 ---
toardb/stationmeta/models_core.py | 2 --
toardb/stationmeta/pydantic_toar_testing.py | 2 --
toardb/stationmeta/stationmeta.py | 1 -
toardb/timeseries/fixtures/timeseries.json | 2 +-
5 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/toardb/stationmeta/fixtures/stationmeta_core.json b/toardb/stationmeta/fixtures/stationmeta_core.json
index e4b2349..c819579 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 c4d5420..1f0b0ea 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 b20a1c4..4585aa2 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 0ad7251..0c68dd9 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 a53585c..167f2dd 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",
--
GitLab