From c5d83a5c94b1f7e16b593304b3d8e485dd5ccf8c Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Mon, 24 May 2021 00:17:56 +0200
Subject: [PATCH] Refactoring: rename covid19 to flask_covid19
---
.../blueprints/data_rki_cases/rki_model.py | 2 +-
.../data_rki_cases/rki_model_import.py | 32 +++++++--------
.../rki_vaccination_model.py | 6 +--
.../rki_vaccination_model_import.py | 41 +++++++++----------
4 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/src/flask_covid19/blueprints/data_rki_cases/rki_model.py b/src/flask_covid19/blueprints/data_rki_cases/rki_model.py
index 66980e68..b669f9cf 100644
--- a/src/flask_covid19/blueprints/data_rki_cases/rki_model.py
+++ b/src/flask_covid19/blueprints/data_rki_cases/rki_model.py
@@ -73,7 +73,7 @@ class RkiBundesland(BlueprintLocationGroup):
class RkiLandkreis(db.Model):
__tablename__ = 'rki_landkreis'
__table_args__ = (
- db.UniqueConstraint('landkreis', 'id_landkreis', name="uix_rki_landkreis"),
+ db.UniqueConstraint('location', 'id_landkreis', name="uix_rki_landkreis"),
)
def __str__(self):
diff --git a/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py b/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py
index 6335fc1a..7337f2eb 100644
--- a/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py
+++ b/src/flask_covid19/blueprints/data_rki_cases/rki_model_import.py
@@ -4,7 +4,7 @@ from database import db, ITEMS_PER_PAGE
class RkiImport(db.Model):
- __tablename__ = 'rki_cases_import'
+ __tablename__ = 'rki_import'
id = db.Column(db.Integer, primary_key=True)
fid = db.Column(db.String(255), nullable=False)
@@ -31,10 +31,13 @@ class RkiImport(db.Model):
@classmethod
def remove_all(cls):
- for one in cls.get_all():
- db.session.delete(one)
- db.session.commit()
- return None
+ num_rows_deleted = 0
+ try:
+ num_rows_deleted = db.session.query(cls).delete()
+ db.session.commit()
+ except Exception:
+ db.session.rollback()
+ return num_rows_deleted
@classmethod
def get_all_as_page(cls, page: int):
@@ -89,7 +92,7 @@ class RkiImport(db.Model):
class RkiFlat(db.Model):
- __tablename__ = 'rki_cases_import_flat'
+ __tablename__ = 'rki_import_flat'
id = db.Column(db.Integer, primary_key=True)
#
@@ -130,13 +133,10 @@ class RkiFlat(db.Model):
@classmethod
def remove_all(cls):
- for one in cls.get_all():
- db.session.delete(one)
- db.session.commit()
- return None
-
- @classmethod
- def get_all(cls):
- return db.session.query(cls).order_by(
- cls.datum.desc()
- ).all()
+ num_rows_deleted = 0
+ try:
+ num_rows_deleted = db.session.query(cls).delete()
+ db.session.commit()
+ except Exception:
+ db.session.rollback()
+ return num_rows_deleted
diff --git a/src/flask_covid19/blueprints/data_rki_vaccination/rki_vaccination_model.py b/src/flask_covid19/blueprints/data_rki_vaccination/rki_vaccination_model.py
index afe9540b..d354ed41 100644
--- a/src/flask_covid19/blueprints/data_rki_vaccination/rki_vaccination_model.py
+++ b/src/flask_covid19/blueprints/data_rki_vaccination/rki_vaccination_model.py
@@ -4,7 +4,7 @@ from flask_covid19.blueprints.app_all.all_model import BlueprintDateReported
class RkiVaccinationDateReported(BlueprintDateReported):
- __tablename__ = 'rki_vaccination_date_reported'
+ __tablename__ = 'vaccination_date_reported'
__mapper_args__ = {
'concrete': True
}
@@ -13,7 +13,7 @@ class RkiVaccinationDateReported(BlueprintDateReported):
'date_reported_import_str',
'datum',
'year_day_of_year',
- name="uix_rki_vaccination_date_reported"
+ name="uix_vaccination_date_reported"
),
)
@@ -55,7 +55,7 @@ class RkiVaccinationDateReported(BlueprintDateReported):
class RkiVaccinationData(db.Model):
- __tablename__ = 'rki_vaccination'
+ __tablename__ = 'vaccination'
id = db.Column(db.Integer, primary_key=True)
date_reported_id = db.Column(db.Integer, db.ForeignKey('rki_vaccination_date_reported.id'), nullable=False)
diff --git a/src/flask_covid19/blueprints/data_rki_vaccination/rki_vaccination_model_import.py b/src/flask_covid19/blueprints/data_rki_vaccination/rki_vaccination_model_import.py
index 1f4a91b8..df4aced3 100644
--- a/src/flask_covid19/blueprints/data_rki_vaccination/rki_vaccination_model_import.py
+++ b/src/flask_covid19/blueprints/data_rki_vaccination/rki_vaccination_model_import.py
@@ -2,7 +2,7 @@ from database import db, ITEMS_PER_PAGE
class RkiVaccinationImport(db.Model):
- __tablename__ = 'rki_vaccination_import'
+ __tablename__ = 'vaccination_import'
id = db.Column(db.Integer, primary_key=True)
datum = db.Column(db.Date, nullable=False)
@@ -93,30 +93,30 @@ class RkiVaccinationImport(db.Model):
sql_query = """
select
distinct
- rki_vaccination_import.datum
+ vaccination_import.datum
from
- rki_vaccination_import
+ vaccination_import
where
datum
not in (
select
distinct
- rki_vaccination_import.datum
+ vaccination_import.datum
from
- rki_vaccination
+ vaccination
left join
- rki_vaccination_date_reported
+ vaccination_date_reported
on
- rki_vaccination.date_reported_id=rki_vaccination_date_reported.id
+ vaccination.date_reported_id=vaccination_date_reported.id
group by
- rki_vaccination_import.datum
+ vaccination_import.datum
order by
- rki_vaccination_import.datum desc
+ vaccination_import.datum desc
)
group by
- rki_vaccination_import.datum
+ vaccination_import.datum
order by
- rki_vaccination_import.datum desc
+ vaccination_import.datum desc
"""
new_dates = []
for item, in db.session.execute(sql_query):
@@ -125,7 +125,7 @@ class RkiVaccinationImport(db.Model):
class RkiVaccinationFlat(db.Model):
- __tablename__ = 'rki_vaccination_import_flat'
+ __tablename__ = 'vaccination_import_flat'
id = db.Column(db.Integer, primary_key=True)
#
@@ -165,13 +165,10 @@ class RkiVaccinationFlat(db.Model):
@classmethod
def remove_all(cls):
- for one in cls.get_all():
- db.session.delete(one)
- db.session.commit()
- return None
-
- @classmethod
- def get_all(cls):
- return db.session.query(cls).order_by(
- cls.datum.desc()
- ).all()
+ num_rows_deleted = 0
+ try:
+ num_rows_deleted = db.session.query(cls).delete()
+ db.session.commit()
+ except Exception:
+ db.session.rollback()
+ return num_rows_deleted
--
GitLab